1
=== modified file 'desktopcouch/records/doc/records.txt'
2
--- desktopcouch/records/doc/records.txt	2009-11-11 16:24:22 +0000
3
+++ desktopcouch/records/doc/records.txt	2010-02-25 19:47:14 +0000
4
@@ -19,16 +19,31 @@
5
19
19
6
20
>>> r['c'] = ['d','e','f']
20
>>> r['c'] = ['d','e','f']
7
21
21
9
22
Save the record into the database with put_record:
22
Save the record into the database and update its ID and REV with 
10
23
put_record.  Before you put the record the first time, the ID and REV
11
24
may be unset:
12
23
25
13
26
>>> r.record_id is None
14
27
True
15
28
>>> r.record_revision is None
16
29
True
17
24
>>> record_id = db.put_record(r)
30
>>> record_id = db.put_record(r)
18
25
31
19
32
The record r is ready to be sent again, since put_record has side-effects
20
33
that mutate it.
21
34
22
35
>>> r.record_id is not None
23
36
True
24
37
>>> r.record_revision is not None
25
38
True
26
39
>>> r['g'] = 'h'
27
40
>>> record_id = db.put_record(r)    # HAS SIDE-EFFECT!  Mutates r!
28
41
29
26
Fetch existing records from the database by ID:
42
Fetch existing records from the database by ID:
30
27
43
31
28
>>> fetched = db.get_record(record_id)
44
>>> fetched = db.get_record(record_id)
35
29
>>> print fetched['a']
45
>>> print fetched['g']
36
30
b
46
h
34
31
>>>
37
32
47
38
33
There is no ad-hoc query functionality.
48
There is no ad-hoc query functionality.
39
34
49
40
35
50
41
=== modified file 'desktopcouch/records/server_base.py'
42
--- desktopcouch/records/server_base.py	2010-02-04 23:14:37 +0000
43
+++ desktopcouch/records/server_base.py	2010-02-25 19:47:14 +0000
44
@@ -199,19 +199,10 @@
45
199
            record.record_id = uuid4().hex
199
            record.record_id = uuid4().hex
46
200
        self.db[record.record_id] = record._data
200
        self.db[record.record_id] = record._data
47
201
201
48
202
        # At this point, we've saved new document to the database, by
49
203
        # we do not know the revision number of it.  We need *a*
50
204
        # specific revision now, so that we can attach BLOBs to it.
51
205
52
206
        # This is bad.  We can get the most recent revision, but that
53
207
        # doesn't assure us that what we're attaching records to is
54
208
        # the revision we just sent.
55
209
56
210
        retrieved_document = self.db[record.record_id]
57
211
        for attachment_name in record.list_attachments():
202
        for attachment_name in record.list_attachments():
58
212
            data, content_type = record.attachment_data(attachment_name)
203
            data, content_type = record.attachment_data(attachment_name)
59
213
            self.db.put_attachment(
204
            self.db.put_attachment(
61
214
                retrieved_document, data, attachment_name, content_type)
205
                record._data, data, attachment_name, content_type)
62
215
206
63
216
        return record.record_id
207
        return record.record_id
64
217
208
Status:	Merged
Approved by:	Chad Miller on 2010-02-26
Approved revision:	not available
Merged at revision:	not available
Proposed branch:	lp:~cmiller/desktopcouch/put_record_documented_more
Merge into:	lp:desktopcouch
Diff against target:	63 lines (+20/-14) 2 files modified desktopcouch/records/doc/records.txt (+19/-4) desktopcouch/records/server_base.py (+1/-10)
To merge this branch:	bzr merge lp:~cmiller/desktopcouch/put_record_documented_more
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Eric Casteleijn (community)		2010-02-25	Approve on 2010-02-25
Review via email: mp+20166@code.launchpad.net
1	=== modified file 'desktopcouch/records/doc/records.txt'
2	--- desktopcouch/records/doc/records.txt 2009-11-11 16:24:22 +0000
3	+++ desktopcouch/records/doc/records.txt 2010-02-25 19:47:14 +0000
4	@@ -19,16 +19,31 @@
5	19		19
6	20	>>> r['c'] = ['d','e','f']	20	>>> r['c'] = ['d','e','f']
7	21		21
9	22	Save the record into the database with put_record:	22	Save the record into the database and update its ID and REV with
10			23	put_record. Before you put the record the first time, the ID and REV
11			24	may be unset:
12	23		25
13			26	>>> r.record_id is None
14			27	True
15			28	>>> r.record_revision is None
16			29	True
17	24	>>> record_id = db.put_record(r)	30	>>> record_id = db.put_record(r)
18	25		31
19			32	The record r is ready to be sent again, since put_record has side-effects
20			33	that mutate it.
21			34
22			35	>>> r.record_id is not None
23			36	True
24			37	>>> r.record_revision is not None
25			38	True
26			39	>>> r['g'] = 'h'
27			40	>>> record_id = db.put_record(r) # HAS SIDE-EFFECT! Mutates r!
28			41
29	26	Fetch existing records from the database by ID:	42	Fetch existing records from the database by ID:
30	27		43
31	28	>>> fetched = db.get_record(record_id)	44	>>> fetched = db.get_record(record_id)
35	29	>>> print fetched['a']	45	>>> print fetched['g']
36	30	b	46	h
34	31	>>>
37	32		47
38	33	There is no ad-hoc query functionality.	48	There is no ad-hoc query functionality.
39	34		49
40	35		50
41	=== modified file 'desktopcouch/records/server_base.py'
42	--- desktopcouch/records/server_base.py 2010-02-04 23:14:37 +0000
43	+++ desktopcouch/records/server_base.py 2010-02-25 19:47:14 +0000
44	@@ -199,19 +199,10 @@
45	199	record.record_id = uuid4().hex	199	record.record_id = uuid4().hex
46	200	self.db[record.record_id] = record._data	200	self.db[record.record_id] = record._data
47	201		201
48	202	# At this point, we've saved new document to the database, by
49	203	# we do not know the revision number of it. We need a
50	204	# specific revision now, so that we can attach BLOBs to it.
51	205
52	206	# This is bad. We can get the most recent revision, but that
53	207	# doesn't assure us that what we're attaching records to is
54	208	# the revision we just sent.
55	209
56	210	retrieved_document = self.db[record.record_id]
57	211	for attachment_name in record.list_attachments():	202	for attachment_name in record.list_attachments():
58	212	data, content_type = record.attachment_data(attachment_name)	203	data, content_type = record.attachment_data(attachment_name)
59	213	self.db.put_attachment(	204	self.db.put_attachment(
61	214	retrieved_document, data, attachment_name, content_type)	205	record._data, data, attachment_name, content_type)
62	215		206
63	216	return record.record_id	207	return record.record_id
64	217		208