Mercurial > p > roundup > code
annotate roundup/backends/rdbms_common.py @ 1751:ab7760caf6ff
Importing wasn't setting None values explicitly when it should have been
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Tue, 26 Aug 2003 00:06:56 +0000 |
| parents | 5ca448ff8052 |
| children | d2801a2b0a77 |
| rev | line source |
|---|---|
|
1751
ab7760caf6ff
Importing wasn't setting None values explicitly when it should have been
Richard Jones <richard@users.sourceforge.net>
parents:
1740
diff
changeset
|
1 # $Id: rdbms_common.py,v 1.59 2003-08-26 00:06:56 richard Exp $ |
|
1244
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
2 ''' Relational database (SQL) backend common code. |
|
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
3 |
|
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
4 Basics: |
|
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
5 |
|
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
6 - map roundup classes to relational tables |
|
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
7 - automatically detect schema changes and modify the table schemas |
|
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
8 appropriately (we store the "database version" of the schema in the |
|
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
9 database itself as the only row of the "schema" table) |
|
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
10 - multilinks (which represent a many-to-many relationship) are handled through |
|
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
11 intermediate tables |
|
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
12 - journals are stored adjunct to the per-class tables |
|
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
13 - table names and columns have "_" prepended so the names can't clash with |
|
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
14 restricted names (like "order") |
|
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
15 - retirement is determined by the __retired__ column being true |
|
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
16 |
|
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
17 Database-specific changes may generally be pushed out to the overridable |
|
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
18 sql_* methods, since everything else should be fairly generic. There's |
|
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
19 probably a bit of work to be done if a database is used that actually |
|
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
20 honors column typing, since the initial databases don't (sqlite stores |
|
1528
96cd422532ef
bye bye gadfly - you served your purpose well [SF#701127]
Richard Jones <richard@users.sourceforge.net>
parents:
1523
diff
changeset
|
21 everything as a string.) |
|
1244
8dd4f736370b
merge from maintenance branch
Richard Jones <richard@users.sourceforge.net>
parents:
1222
diff
changeset
|
22 ''' |
| 1165 | 23 |
| 24 # standard python modules | |
| 25 import sys, os, time, re, errno, weakref, copy | |
| 26 | |
| 27 # roundup modules | |
| 28 from roundup import hyperdb, date, password, roundupdb, security | |
| 29 from roundup.hyperdb import String, Password, Date, Interval, Link, \ | |
|
1417
472c21af7f69
fixed error in indexargs_url (thanks Patrick Ohly)
Richard Jones <richard@users.sourceforge.net>
parents:
1415
diff
changeset
|
30 Multilink, DatabaseError, Boolean, Number, Node |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1304
diff
changeset
|
31 from roundup.backends import locking |
| 1165 | 32 |
| 33 # support | |
| 34 from blobfiles import FileStorage | |
| 35 from roundup.indexer import Indexer | |
|
1467
378081f066cc
registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents:
1442
diff
changeset
|
36 from sessions import Sessions, OneTimeKeys |
|
1499
8ee69708da0c
added support for searching on ranges of dates
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1496
diff
changeset
|
37 from roundup.date import Range |
| 1165 | 38 |
|
1173
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
39 # number of rows to keep in memory |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
40 ROW_CACHE_SIZE = 100 |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
41 |
| 1165 | 42 class Database(FileStorage, hyperdb.Database, roundupdb.Database): |
|
1173
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
43 ''' Wrapper around an SQL database that presents a hyperdb interface. |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
44 |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
45 - some functionality is specific to the actual SQL database, hence |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
46 the sql_* methods that are NotImplemented |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
47 - we keep a cache of the latest ROW_CACHE_SIZE row fetches. |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
48 ''' |
| 1165 | 49 def __init__(self, config, journaltag=None): |
| 50 ''' Open the database and load the schema from it. | |
| 51 ''' | |
| 52 self.config, self.journaltag = config, journaltag | |
| 53 self.dir = config.DATABASE | |
| 54 self.classes = {} | |
| 55 self.indexer = Indexer(self.dir) | |
| 56 self.sessions = Sessions(self.config) | |
|
1467
378081f066cc
registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents:
1442
diff
changeset
|
57 self.otks = OneTimeKeys(self.config) |
| 1165 | 58 self.security = security.Security(self) |
| 59 | |
| 60 # additional transaction support for external files and the like | |
| 61 self.transactions = [] | |
| 62 | |
|
1173
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
63 # keep a cache of the N most recently retrieved rows of any kind |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
64 # (classname, nodeid) = row |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
65 self.cache = {} |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
66 self.cache_lru = [] |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
67 |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1304
diff
changeset
|
68 # database lock |
|
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1304
diff
changeset
|
69 self.lockfile = None |
|
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1304
diff
changeset
|
70 |
| 1165 | 71 # open a connection to the database, creating the "conn" attribute |
| 72 self.open_connection() | |
| 73 | |
|
1181
49aebf5a8691
some speedups, some fixes to the benchmarking
Richard Jones <richard@users.sourceforge.net>
parents:
1176
diff
changeset
|
74 def clearCache(self): |
|
49aebf5a8691
some speedups, some fixes to the benchmarking
Richard Jones <richard@users.sourceforge.net>
parents:
1176
diff
changeset
|
75 self.cache = {} |
|
49aebf5a8691
some speedups, some fixes to the benchmarking
Richard Jones <richard@users.sourceforge.net>
parents:
1176
diff
changeset
|
76 self.cache_lru = [] |
|
49aebf5a8691
some speedups, some fixes to the benchmarking
Richard Jones <richard@users.sourceforge.net>
parents:
1176
diff
changeset
|
77 |
| 1165 | 78 def open_connection(self): |
| 79 ''' Open a connection to the database, creating it if necessary | |
| 80 ''' | |
| 81 raise NotImplemented | |
| 82 | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
83 def sql(self, sql, args=None): |
| 1165 | 84 ''' Execute the sql with the optional args. |
| 85 ''' | |
| 86 if __debug__: | |
| 87 print >>hyperdb.DEBUG, (self, sql, args) | |
| 88 if args: | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
89 self.cursor.execute(sql, args) |
| 1165 | 90 else: |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
91 self.cursor.execute(sql) |
| 1165 | 92 |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
93 def sql_fetchone(self): |
| 1165 | 94 ''' Fetch a single row. If there's nothing to fetch, return None. |
| 95 ''' | |
| 96 raise NotImplemented | |
| 97 | |
|
1170
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
98 def sql_stringquote(self, value): |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
99 ''' Quote the string so it's safe to put in the 'sql quotes' |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
100 ''' |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
101 return re.sub("'", "''", str(value)) |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
102 |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
103 def save_dbschema(self, schema): |
| 1165 | 104 ''' Save the schema definition that the database currently implements |
| 105 ''' | |
| 106 raise NotImplemented | |
| 107 | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
108 def load_dbschema(self): |
| 1165 | 109 ''' Load the schema definition that the database currently implements |
| 110 ''' | |
| 111 raise NotImplemented | |
| 112 | |
| 113 def post_init(self): | |
| 114 ''' Called once the schema initialisation has finished. | |
| 115 | |
| 116 We should now confirm that the schema defined by our "classes" | |
| 117 attribute actually matches the schema in the database. | |
| 118 ''' | |
| 119 # now detect changes in the schema | |
|
1168
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
120 save = 0 |
| 1165 | 121 for classname, spec in self.classes.items(): |
| 122 if self.database_schema.has_key(classname): | |
| 123 dbspec = self.database_schema[classname] | |
|
1168
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
124 if self.update_class(spec, dbspec): |
|
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
125 self.database_schema[classname] = spec.schema() |
|
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
126 save = 1 |
| 1165 | 127 else: |
| 128 self.create_class(spec) | |
| 129 self.database_schema[classname] = spec.schema() | |
|
1168
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
130 save = 1 |
| 1165 | 131 |
| 132 for classname in self.database_schema.keys(): | |
| 133 if not self.classes.has_key(classname): | |
| 134 self.drop_class(classname) | |
| 135 | |
| 136 # update the database version of the schema | |
|
1168
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
137 if save: |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
138 self.sql('delete from schema') |
|
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
139 self.save_dbschema(self.database_schema) |
| 1165 | 140 |
| 141 # reindex the db if necessary | |
| 142 if self.indexer.should_reindex(): | |
| 143 self.reindex() | |
| 144 | |
| 145 # commit | |
| 146 self.conn.commit() | |
| 147 | |
|
1176
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
148 # figure the "curuserid" |
|
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
149 if self.journaltag is None: |
|
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
150 self.curuserid = None |
|
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
151 elif self.journaltag == 'admin': |
|
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
152 # admin user may not exist, but always has ID 1 |
|
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
153 self.curuserid = '1' |
|
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
154 else: |
|
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
155 self.curuserid = self.user.lookup(self.journaltag) |
|
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
156 |
| 1165 | 157 def reindex(self): |
| 158 for klass in self.classes.values(): | |
| 159 for nodeid in klass.list(): | |
| 160 klass.index(nodeid) | |
| 161 self.indexer.save_index() | |
| 162 | |
| 163 def determine_columns(self, properties): | |
| 164 ''' Figure the column names and multilink properties from the spec | |
| 165 | |
| 166 "properties" is a list of (name, prop) where prop may be an | |
| 167 instance of a hyperdb "type" _or_ a string repr of that type. | |
| 168 ''' | |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
169 cols = ['_activity', '_creator', '_creation'] |
| 1165 | 170 mls = [] |
| 171 # add the multilinks separately | |
| 172 for col, prop in properties: | |
| 173 if isinstance(prop, Multilink): | |
| 174 mls.append(col) | |
| 175 elif isinstance(prop, type('')) and prop.find('Multilink') != -1: | |
| 176 mls.append(col) | |
| 177 else: | |
| 178 cols.append('_'+col) | |
| 179 cols.sort() | |
| 180 return cols, mls | |
| 181 | |
|
1479
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
182 def update_class(self, spec, old_spec): |
| 1165 | 183 ''' Determine the differences between the current spec and the |
| 184 database version of the spec, and update where necessary | |
| 185 ''' | |
|
1479
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
186 new_spec = spec |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
187 new_has = new_spec.properties.has_key |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
188 |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
189 new_spec = new_spec.schema() |
|
1515
a516bbb9896b
fixed rdbms table update detection logic [SF#703297]
Richard Jones <richard@users.sourceforge.net>
parents:
1500
diff
changeset
|
190 new_spec[1].sort() |
|
a516bbb9896b
fixed rdbms table update detection logic [SF#703297]
Richard Jones <richard@users.sourceforge.net>
parents:
1500
diff
changeset
|
191 old_spec[1].sort() |
|
1479
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
192 if new_spec == old_spec: |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
193 # no changes |
|
1168
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
194 return 0 |
|
1479
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
195 |
| 1165 | 196 if __debug__: |
| 197 print >>hyperdb.DEBUG, 'update_class FIRING' | |
| 198 | |
| 199 # key property changed? | |
|
1479
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
200 if old_spec[0] != new_spec[0]: |
| 1165 | 201 if __debug__: |
| 202 print >>hyperdb.DEBUG, 'update_class setting keyprop', `spec[0]` | |
| 203 # XXX turn on indexing for the key property | |
| 204 | |
|
1479
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
205 # detect multilinks that have been removed, and drop their table |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
206 old_has = {} |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
207 for name,prop in old_spec[1]: |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
208 old_has[name] = 1 |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
209 if not new_has(name) and isinstance(prop, Multilink): |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
210 # it's a multilink, and it's been removed - drop the old |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
211 # table |
| 1165 | 212 sql = 'drop table %s_%s'%(spec.classname, prop) |
| 213 if __debug__: | |
| 214 print >>hyperdb.DEBUG, 'update_class', (self, sql) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
215 self.cursor.execute(sql) |
|
1479
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
216 continue |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
217 old_has = old_has.has_key |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
218 |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
219 # now figure how we populate the new table |
|
1500
7cd110cee870
Fixed issue w. gadfly and exact column matching when table schemas are updated.
Richard Jones <richard@users.sourceforge.net>
parents:
1499
diff
changeset
|
220 fetch = ['_activity', '_creation', '_creator'] |
|
1479
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
221 properties = spec.getprops() |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
222 for propname,x in new_spec[1]: |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
223 prop = properties[propname] |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
224 if isinstance(prop, Multilink): |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
225 if not old_has(propname): |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
226 # we need to create the new table |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
227 self.create_multilink_table(spec, propname) |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
228 elif old_has(propname): |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
229 # we copy this col over from the old table |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
230 fetch.append('_'+propname) |
| 1165 | 231 |
|
1479
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
232 # select the data out of the old table |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
233 fetch.append('id') |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
234 fetch.append('__retired__') |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
235 fetchcols = ','.join(fetch) |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
236 cn = spec.classname |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
237 sql = 'select %s from _%s'%(fetchcols, cn) |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
238 if __debug__: |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
239 print >>hyperdb.DEBUG, 'update_class', (self, sql) |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
240 self.cursor.execute(sql) |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
241 olddata = self.cursor.fetchall() |
| 1165 | 242 |
|
1479
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
243 # drop the old table |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
244 self.cursor.execute('drop table _%s'%cn) |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
245 |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
246 # create the new table |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
247 self.create_class_table(spec) |
| 1165 | 248 |
|
1479
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
249 if olddata: |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
250 # do the insert |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
251 args = ','.join([self.arg for x in fetch]) |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
252 sql = 'insert into _%s (%s) values (%s)'%(cn, fetchcols, args) |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
253 if __debug__: |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
254 print >>hyperdb.DEBUG, 'update_class', (self, sql, olddata[0]) |
|
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
255 for entry in olddata: |
|
1500
7cd110cee870
Fixed issue w. gadfly and exact column matching when table schemas are updated.
Richard Jones <richard@users.sourceforge.net>
parents:
1499
diff
changeset
|
256 self.cursor.execute(sql, tuple(entry)) |
|
1479
405e91b5be46
fixed rdbms mutation of properties
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
257 |
|
1168
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
258 return 1 |
| 1165 | 259 |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
260 def create_class_table(self, spec): |
| 1165 | 261 ''' create the class table for the given spec |
| 262 ''' | |
| 263 cols, mls = self.determine_columns(spec.properties.items()) | |
| 264 | |
| 265 # add on our special columns | |
| 266 cols.append('id') | |
| 267 cols.append('__retired__') | |
| 268 | |
| 269 # create the base table | |
| 270 scols = ','.join(['%s varchar'%x for x in cols]) | |
| 271 sql = 'create table _%s (%s)'%(spec.classname, scols) | |
| 272 if __debug__: | |
| 273 print >>hyperdb.DEBUG, 'create_class', (self, sql) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
274 self.cursor.execute(sql) |
| 1165 | 275 |
| 276 return cols, mls | |
| 277 | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
278 def create_journal_table(self, spec): |
| 1165 | 279 ''' create the journal table for a class given the spec and |
| 280 already-determined cols | |
| 281 ''' | |
| 282 # journal table | |
| 283 cols = ','.join(['%s varchar'%x | |
| 284 for x in 'nodeid date tag action params'.split()]) | |
| 285 sql = 'create table %s__journal (%s)'%(spec.classname, cols) | |
| 286 if __debug__: | |
| 287 print >>hyperdb.DEBUG, 'create_class', (self, sql) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
288 self.cursor.execute(sql) |
| 1165 | 289 |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
290 def create_multilink_table(self, spec, ml): |
| 1165 | 291 ''' Create a multilink table for the "ml" property of the class |
| 292 given by the spec | |
| 293 ''' | |
| 294 sql = 'create table %s_%s (linkid varchar, nodeid varchar)'%( | |
| 295 spec.classname, ml) | |
| 296 if __debug__: | |
| 297 print >>hyperdb.DEBUG, 'create_class', (self, sql) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
298 self.cursor.execute(sql) |
| 1165 | 299 |
| 300 def create_class(self, spec): | |
| 301 ''' Create a database table according to the given spec. | |
| 302 ''' | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
303 cols, mls = self.create_class_table(spec) |
|
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
304 self.create_journal_table(spec) |
| 1165 | 305 |
| 306 # now create the multilink tables | |
| 307 for ml in mls: | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
308 self.create_multilink_table(spec, ml) |
| 1165 | 309 |
| 310 # ID counter | |
| 311 sql = 'insert into ids (name, num) values (%s,%s)'%(self.arg, self.arg) | |
| 312 vals = (spec.classname, 1) | |
| 313 if __debug__: | |
| 314 print >>hyperdb.DEBUG, 'create_class', (self, sql, vals) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
315 self.cursor.execute(sql, vals) |
| 1165 | 316 |
| 317 def drop_class(self, spec): | |
| 318 ''' Drop the given table from the database. | |
| 319 | |
| 320 Drop the journal and multilink tables too. | |
| 321 ''' | |
| 322 # figure the multilinks | |
| 323 mls = [] | |
| 324 for col, prop in spec.properties.items(): | |
| 325 if isinstance(prop, Multilink): | |
| 326 mls.append(col) | |
| 327 | |
| 328 sql = 'drop table _%s'%spec.classname | |
| 329 if __debug__: | |
| 330 print >>hyperdb.DEBUG, 'drop_class', (self, sql) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
331 self.cursor.execute(sql) |
| 1165 | 332 |
| 333 sql = 'drop table %s__journal'%spec.classname | |
| 334 if __debug__: | |
| 335 print >>hyperdb.DEBUG, 'drop_class', (self, sql) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
336 self.cursor.execute(sql) |
| 1165 | 337 |
| 338 for ml in mls: | |
| 339 sql = 'drop table %s_%s'%(spec.classname, ml) | |
| 340 if __debug__: | |
| 341 print >>hyperdb.DEBUG, 'drop_class', (self, sql) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
342 self.cursor.execute(sql) |
| 1165 | 343 |
| 344 # | |
| 345 # Classes | |
| 346 # | |
| 347 def __getattr__(self, classname): | |
| 348 ''' A convenient way of calling self.getclass(classname). | |
| 349 ''' | |
| 350 if self.classes.has_key(classname): | |
| 351 if __debug__: | |
| 352 print >>hyperdb.DEBUG, '__getattr__', (self, classname) | |
| 353 return self.classes[classname] | |
| 354 raise AttributeError, classname | |
| 355 | |
| 356 def addclass(self, cl): | |
| 357 ''' Add a Class to the hyperdatabase. | |
| 358 ''' | |
| 359 if __debug__: | |
| 360 print >>hyperdb.DEBUG, 'addclass', (self, cl) | |
| 361 cn = cl.classname | |
| 362 if self.classes.has_key(cn): | |
| 363 raise ValueError, cn | |
| 364 self.classes[cn] = cl | |
| 365 | |
| 366 def getclasses(self): | |
| 367 ''' Return a list of the names of all existing classes. | |
| 368 ''' | |
| 369 if __debug__: | |
| 370 print >>hyperdb.DEBUG, 'getclasses', (self,) | |
| 371 l = self.classes.keys() | |
| 372 l.sort() | |
| 373 return l | |
| 374 | |
| 375 def getclass(self, classname): | |
| 376 '''Get the Class object representing a particular class. | |
| 377 | |
| 378 If 'classname' is not a valid class name, a KeyError is raised. | |
| 379 ''' | |
| 380 if __debug__: | |
| 381 print >>hyperdb.DEBUG, 'getclass', (self, classname) | |
| 382 try: | |
| 383 return self.classes[classname] | |
| 384 except KeyError: | |
| 385 raise KeyError, 'There is no class called "%s"'%classname | |
| 386 | |
| 387 def clear(self): | |
| 388 ''' Delete all database contents. | |
| 389 | |
| 390 Note: I don't commit here, which is different behaviour to the | |
| 391 "nuke from orbit" behaviour in the *dbms. | |
| 392 ''' | |
| 393 if __debug__: | |
| 394 print >>hyperdb.DEBUG, 'clear', (self,) | |
| 395 for cn in self.classes.keys(): | |
| 396 sql = 'delete from _%s'%cn | |
| 397 if __debug__: | |
| 398 print >>hyperdb.DEBUG, 'clear', (self, sql) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
399 self.cursor.execute(sql) |
| 1165 | 400 |
| 401 # | |
| 402 # Node IDs | |
| 403 # | |
| 404 def newid(self, classname): | |
| 405 ''' Generate a new id for the given class | |
| 406 ''' | |
| 407 # get the next ID | |
| 408 sql = 'select num from ids where name=%s'%self.arg | |
| 409 if __debug__: | |
| 410 print >>hyperdb.DEBUG, 'newid', (self, sql, classname) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
411 self.cursor.execute(sql, (classname, )) |
|
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
412 newid = self.cursor.fetchone()[0] |
| 1165 | 413 |
| 414 # update the counter | |
| 415 sql = 'update ids set num=%s where name=%s'%(self.arg, self.arg) | |
| 416 vals = (int(newid)+1, classname) | |
| 417 if __debug__: | |
| 418 print >>hyperdb.DEBUG, 'newid', (self, sql, vals) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
419 self.cursor.execute(sql, vals) |
| 1165 | 420 |
| 421 # return as string | |
| 422 return str(newid) | |
| 423 | |
| 424 def setid(self, classname, setid): | |
| 425 ''' Set the id counter: used during import of database | |
| 426 ''' | |
| 427 sql = 'update ids set num=%s where name=%s'%(self.arg, self.arg) | |
|
1171
8784a11f8c2f
fix to setid
Richard Jones <richard@users.sourceforge.net>
parents:
1170
diff
changeset
|
428 vals = (setid, classname) |
| 1165 | 429 if __debug__: |
| 430 print >>hyperdb.DEBUG, 'setid', (self, sql, vals) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
431 self.cursor.execute(sql, vals) |
| 1165 | 432 |
| 433 # | |
| 434 # Nodes | |
| 435 # | |
| 436 def addnode(self, classname, nodeid, node): | |
| 437 ''' Add the specified node to its class's db. | |
| 438 ''' | |
| 439 if __debug__: | |
| 440 print >>hyperdb.DEBUG, 'addnode', (self, classname, nodeid, node) | |
|
1528
96cd422532ef
bye bye gadfly - you served your purpose well [SF#701127]
Richard Jones <richard@users.sourceforge.net>
parents:
1523
diff
changeset
|
441 |
|
96cd422532ef
bye bye gadfly - you served your purpose well [SF#701127]
Richard Jones <richard@users.sourceforge.net>
parents:
1523
diff
changeset
|
442 # determine the column definitions and multilink tables |
| 1165 | 443 cl = self.classes[classname] |
| 444 cols, mls = self.determine_columns(cl.properties.items()) | |
| 445 | |
|
1189
23b8d1e87fe3
import fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1187
diff
changeset
|
446 # we'll be supplied these props if we're doing an import |
|
23b8d1e87fe3
import fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1187
diff
changeset
|
447 if not node.has_key('creator'): |
|
23b8d1e87fe3
import fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1187
diff
changeset
|
448 # add in the "calculated" properties (dupe so we don't affect |
|
23b8d1e87fe3
import fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1187
diff
changeset
|
449 # calling code's node assumptions) |
|
23b8d1e87fe3
import fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1187
diff
changeset
|
450 node = node.copy() |
|
23b8d1e87fe3
import fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1187
diff
changeset
|
451 node['creation'] = node['activity'] = date.Date() |
|
23b8d1e87fe3
import fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1187
diff
changeset
|
452 node['creator'] = self.curuserid |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
453 |
| 1165 | 454 # default the non-multilink columns |
| 455 for col, prop in cl.properties.items(): | |
|
1496
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
456 if not node.has_key(col): |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
457 if isinstance(prop, Multilink): |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
458 node[col] = [] |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
459 else: |
| 1165 | 460 node[col] = None |
| 461 | |
|
1173
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
462 # clear this node out of the cache if it's in there |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
463 key = (classname, nodeid) |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
464 if self.cache.has_key(key): |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
465 del self.cache[key] |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
466 self.cache_lru.remove(key) |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
467 |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
468 # make the node data safe for the DB |
| 1165 | 469 node = self.serialise(classname, node) |
| 470 | |
| 471 # make sure the ordering is correct for column name -> column value | |
| 472 vals = tuple([node[col[1:]] for col in cols]) + (nodeid, 0) | |
| 473 s = ','.join([self.arg for x in cols]) + ',%s,%s'%(self.arg, self.arg) | |
| 474 cols = ','.join(cols) + ',id,__retired__' | |
| 475 | |
| 476 # perform the inserts | |
| 477 sql = 'insert into _%s (%s) values (%s)'%(classname, cols, s) | |
| 478 if __debug__: | |
| 479 print >>hyperdb.DEBUG, 'addnode', (self, sql, vals) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
480 self.cursor.execute(sql, vals) |
| 1165 | 481 |
| 482 # insert the multilink rows | |
| 483 for col in mls: | |
| 484 t = '%s_%s'%(classname, col) | |
| 485 for entry in node[col]: | |
| 486 sql = 'insert into %s (linkid, nodeid) values (%s,%s)'%(t, | |
| 487 self.arg, self.arg) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
488 self.sql(sql, (entry, nodeid)) |
| 1165 | 489 |
| 490 # make sure we do the commit-time extra stuff for this node | |
| 491 self.transactions.append((self.doSaveNode, (classname, nodeid, node))) | |
| 492 | |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
493 def setnode(self, classname, nodeid, values, multilink_changes): |
| 1165 | 494 ''' Change the specified node. |
| 495 ''' | |
| 496 if __debug__: | |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
497 print >>hyperdb.DEBUG, 'setnode', (self, classname, nodeid, values) |
|
1173
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
498 |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
499 # clear this node out of the cache if it's in there |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
500 key = (classname, nodeid) |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
501 if self.cache.has_key(key): |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
502 del self.cache[key] |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
503 self.cache_lru.remove(key) |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
504 |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
505 # add the special props |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
506 values = values.copy() |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
507 values['activity'] = date.Date() |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
508 |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
509 # make db-friendly |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
510 values = self.serialise(classname, values) |
| 1165 | 511 |
| 512 cl = self.classes[classname] | |
| 513 cols = [] | |
| 514 mls = [] | |
| 515 # add the multilinks separately | |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
516 props = cl.getprops() |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
517 for col in values.keys(): |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
518 prop = props[col] |
| 1165 | 519 if isinstance(prop, Multilink): |
| 520 mls.append(col) | |
| 521 else: | |
| 522 cols.append('_'+col) | |
| 523 cols.sort() | |
| 524 | |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
525 # if there's any updates to regular columns, do them |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
526 if cols: |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
527 # make sure the ordering is correct for column name -> column value |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
528 sqlvals = tuple([values[col[1:]] for col in cols]) + (nodeid,) |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
529 s = ','.join(['%s=%s'%(x, self.arg) for x in cols]) |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
530 cols = ','.join(cols) |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
531 |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
532 # perform the update |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
533 sql = 'update _%s set %s where id=%s'%(classname, s, self.arg) |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
534 if __debug__: |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
535 print >>hyperdb.DEBUG, 'setnode', (self, sql, sqlvals) |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
536 self.cursor.execute(sql, sqlvals) |
| 1165 | 537 |
| 538 # now the fun bit, updating the multilinks ;) | |
| 539 for col, (add, remove) in multilink_changes.items(): | |
| 540 tn = '%s_%s'%(classname, col) | |
| 541 if add: | |
| 542 sql = 'insert into %s (nodeid, linkid) values (%s,%s)'%(tn, | |
| 543 self.arg, self.arg) | |
| 544 for addid in add: | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
545 self.sql(sql, (nodeid, addid)) |
| 1165 | 546 if remove: |
| 547 sql = 'delete from %s where nodeid=%s and linkid=%s'%(tn, | |
| 548 self.arg, self.arg) | |
| 549 for removeid in remove: | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
550 self.sql(sql, (nodeid, removeid)) |
| 1165 | 551 |
| 552 # make sure we do the commit-time extra stuff for this node | |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
553 self.transactions.append((self.doSaveNode, (classname, nodeid, values))) |
| 1165 | 554 |
| 555 def getnode(self, classname, nodeid): | |
| 556 ''' Get a node from the database. | |
| 557 ''' | |
| 558 if __debug__: | |
| 559 print >>hyperdb.DEBUG, 'getnode', (self, classname, nodeid) | |
|
1173
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
560 |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
561 # see if we have this node cached |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
562 key = (classname, nodeid) |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
563 if self.cache.has_key(key): |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
564 # push us back to the top of the LRU |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
565 self.cache_lru.remove(key) |
|
1185
3b0735ef8207
fix to LRU cache
Richard Jones <richard@users.sourceforge.net>
parents:
1183
diff
changeset
|
566 self.cache_lru.insert(0, key) |
|
1173
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
567 # return the cached information |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
568 return self.cache[key] |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
569 |
| 1165 | 570 # figure the columns we're fetching |
| 571 cl = self.classes[classname] | |
| 572 cols, mls = self.determine_columns(cl.properties.items()) | |
| 573 scols = ','.join(cols) | |
| 574 | |
| 575 # perform the basic property fetch | |
| 576 sql = 'select %s from _%s where id=%s'%(scols, classname, self.arg) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
577 self.sql(sql, (nodeid,)) |
| 1165 | 578 |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
579 values = self.sql_fetchone() |
| 1165 | 580 if values is None: |
| 581 raise IndexError, 'no such %s node %s'%(classname, nodeid) | |
| 582 | |
| 583 # make up the node | |
| 584 node = {} | |
| 585 for col in range(len(cols)): | |
| 586 node[cols[col][1:]] = values[col] | |
| 587 | |
| 588 # now the multilinks | |
| 589 for col in mls: | |
| 590 # get the link ids | |
| 591 sql = 'select linkid from %s_%s where nodeid=%s'%(classname, col, | |
| 592 self.arg) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
593 self.cursor.execute(sql, (nodeid,)) |
| 1165 | 594 # extract the first column from the result |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
595 node[col] = [x[0] for x in self.cursor.fetchall()] |
| 1165 | 596 |
|
1173
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
597 # un-dbificate the node data |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
598 node = self.unserialise(classname, node) |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
599 |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
600 # save off in the cache |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
601 key = (classname, nodeid) |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
602 self.cache[key] = node |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
603 # update the LRU |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
604 self.cache_lru.insert(0, key) |
|
1185
3b0735ef8207
fix to LRU cache
Richard Jones <richard@users.sourceforge.net>
parents:
1183
diff
changeset
|
605 if len(self.cache_lru) > ROW_CACHE_SIZE: |
|
3b0735ef8207
fix to LRU cache
Richard Jones <richard@users.sourceforge.net>
parents:
1183
diff
changeset
|
606 del self.cache[self.cache_lru.pop()] |
|
1173
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
607 |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
608 return node |
| 1165 | 609 |
| 610 def destroynode(self, classname, nodeid): | |
| 611 '''Remove a node from the database. Called exclusively by the | |
| 612 destroy() method on Class. | |
| 613 ''' | |
| 614 if __debug__: | |
| 615 print >>hyperdb.DEBUG, 'destroynode', (self, classname, nodeid) | |
| 616 | |
| 617 # make sure the node exists | |
| 618 if not self.hasnode(classname, nodeid): | |
| 619 raise IndexError, '%s has no node %s'%(classname, nodeid) | |
| 620 | |
|
1173
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
621 # see if we have this node cached |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
622 if self.cache.has_key((classname, nodeid)): |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
623 del self.cache[(classname, nodeid)] |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
624 |
| 1165 | 625 # see if there's any obvious commit actions that we should get rid of |
| 626 for entry in self.transactions[:]: | |
| 627 if entry[1][:2] == (classname, nodeid): | |
| 628 self.transactions.remove(entry) | |
| 629 | |
| 630 # now do the SQL | |
| 631 sql = 'delete from _%s where id=%s'%(classname, self.arg) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
632 self.sql(sql, (nodeid,)) |
| 1165 | 633 |
| 634 # remove from multilnks | |
| 635 cl = self.getclass(classname) | |
| 636 x, mls = self.determine_columns(cl.properties.items()) | |
| 637 for col in mls: | |
| 638 # get the link ids | |
| 639 sql = 'delete from %s_%s where nodeid=%s'%(classname, col, self.arg) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
640 self.cursor.execute(sql, (nodeid,)) |
| 1165 | 641 |
| 642 # remove journal entries | |
| 643 sql = 'delete from %s__journal where nodeid=%s'%(classname, self.arg) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
644 self.sql(sql, (nodeid,)) |
| 1165 | 645 |
| 646 def serialise(self, classname, node): | |
| 647 '''Copy the node contents, converting non-marshallable data into | |
| 648 marshallable data. | |
| 649 ''' | |
| 650 if __debug__: | |
| 651 print >>hyperdb.DEBUG, 'serialise', classname, node | |
| 652 properties = self.getclass(classname).getprops() | |
| 653 d = {} | |
| 654 for k, v in node.items(): | |
| 655 # if the property doesn't exist, or is the "retired" flag then | |
| 656 # it won't be in the properties dict | |
| 657 if not properties.has_key(k): | |
| 658 d[k] = v | |
| 659 continue | |
| 660 | |
| 661 # get the property spec | |
| 662 prop = properties[k] | |
| 663 | |
|
1252
209a47ede743
allow blank passwords again [SF#619714]
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
664 if isinstance(prop, Password) and v is not None: |
| 1165 | 665 d[k] = str(v) |
| 666 elif isinstance(prop, Date) and v is not None: | |
| 667 d[k] = v.serialise() | |
| 668 elif isinstance(prop, Interval) and v is not None: | |
| 669 d[k] = v.serialise() | |
| 670 else: | |
| 671 d[k] = v | |
| 672 return d | |
| 673 | |
| 674 def unserialise(self, classname, node): | |
| 675 '''Decode the marshalled node data | |
| 676 ''' | |
| 677 if __debug__: | |
| 678 print >>hyperdb.DEBUG, 'unserialise', classname, node | |
| 679 properties = self.getclass(classname).getprops() | |
| 680 d = {} | |
| 681 for k, v in node.items(): | |
| 682 # if the property doesn't exist, or is the "retired" flag then | |
| 683 # it won't be in the properties dict | |
| 684 if not properties.has_key(k): | |
| 685 d[k] = v | |
| 686 continue | |
| 687 | |
| 688 # get the property spec | |
| 689 prop = properties[k] | |
| 690 | |
| 691 if isinstance(prop, Date) and v is not None: | |
| 692 d[k] = date.Date(v) | |
| 693 elif isinstance(prop, Interval) and v is not None: | |
| 694 d[k] = date.Interval(v) | |
|
1252
209a47ede743
allow blank passwords again [SF#619714]
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
695 elif isinstance(prop, Password) and v is not None: |
| 1165 | 696 p = password.Password() |
| 697 p.unpack(v) | |
| 698 d[k] = p | |
|
1415
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1409
diff
changeset
|
699 elif (isinstance(prop, Boolean) or isinstance(prop, Number)) and v is not None: |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1409
diff
changeset
|
700 d[k]=float(v) |
| 1165 | 701 else: |
| 702 d[k] = v | |
| 703 return d | |
| 704 | |
| 705 def hasnode(self, classname, nodeid): | |
| 706 ''' Determine if the database has a given node. | |
| 707 ''' | |
| 708 sql = 'select count(*) from _%s where id=%s'%(classname, self.arg) | |
| 709 if __debug__: | |
| 710 print >>hyperdb.DEBUG, 'hasnode', (self, sql, nodeid) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
711 self.cursor.execute(sql, (nodeid,)) |
|
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
712 return int(self.cursor.fetchone()[0]) |
| 1165 | 713 |
| 714 def countnodes(self, classname): | |
| 715 ''' Count the number of nodes that exist for a particular Class. | |
| 716 ''' | |
| 717 sql = 'select count(*) from _%s'%classname | |
| 718 if __debug__: | |
| 719 print >>hyperdb.DEBUG, 'countnodes', (self, sql) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
720 self.cursor.execute(sql) |
|
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
721 return self.cursor.fetchone()[0] |
| 1165 | 722 |
| 723 def addjournal(self, classname, nodeid, action, params, creator=None, | |
| 724 creation=None): | |
| 725 ''' Journal the Action | |
| 726 'action' may be: | |
| 727 | |
| 728 'create' or 'set' -- 'params' is a dictionary of property values | |
| 729 'link' or 'unlink' -- 'params' is (classname, nodeid, propname) | |
| 730 'retire' -- 'params' is None | |
| 731 ''' | |
| 732 # serialise the parameters now if necessary | |
| 733 if isinstance(params, type({})): | |
| 734 if action in ('set', 'create'): | |
| 735 params = self.serialise(classname, params) | |
| 736 | |
| 737 # handle supply of the special journalling parameters (usually | |
| 738 # supplied on importing an existing database) | |
| 739 if creator: | |
| 740 journaltag = creator | |
| 741 else: | |
|
1176
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
742 journaltag = self.curuserid |
| 1165 | 743 if creation: |
| 744 journaldate = creation.serialise() | |
| 745 else: | |
| 746 journaldate = date.Date().serialise() | |
| 747 | |
| 748 # create the journal entry | |
| 749 cols = ','.join('nodeid date tag action params'.split()) | |
| 750 | |
| 751 if __debug__: | |
| 752 print >>hyperdb.DEBUG, 'addjournal', (nodeid, journaldate, | |
| 753 journaltag, action, params) | |
| 754 | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
755 self.save_journal(classname, cols, nodeid, journaldate, |
| 1165 | 756 journaltag, action, params) |
| 757 | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
758 def save_journal(self, classname, cols, nodeid, journaldate, |
| 1165 | 759 journaltag, action, params): |
| 760 ''' Save the journal entry to the database | |
| 761 ''' | |
| 762 raise NotImplemented | |
| 763 | |
| 764 def getjournal(self, classname, nodeid): | |
| 765 ''' get the journal for id | |
| 766 ''' | |
| 767 # make sure the node exists | |
| 768 if not self.hasnode(classname, nodeid): | |
| 769 raise IndexError, '%s has no node %s'%(classname, nodeid) | |
| 770 | |
| 771 cols = ','.join('nodeid date tag action params'.split()) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
772 return self.load_journal(classname, cols, nodeid) |
| 1165 | 773 |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
774 def load_journal(self, classname, cols, nodeid): |
| 1165 | 775 ''' Load the journal from the database |
| 776 ''' | |
| 777 raise NotImplemented | |
| 778 | |
| 779 def pack(self, pack_before): | |
| 780 ''' Delete all journal entries except "create" before 'pack_before'. | |
| 781 ''' | |
| 782 # get a 'yyyymmddhhmmss' version of the date | |
| 783 date_stamp = pack_before.serialise() | |
| 784 | |
| 785 # do the delete | |
| 786 for classname in self.classes.keys(): | |
| 787 sql = "delete from %s__journal where date<%s and "\ | |
| 788 "action<>'create'"%(classname, self.arg) | |
| 789 if __debug__: | |
| 790 print >>hyperdb.DEBUG, 'pack', (self, sql, date_stamp) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
791 self.cursor.execute(sql, (date_stamp,)) |
| 1165 | 792 |
| 793 def sql_commit(self): | |
| 794 ''' Actually commit to the database. | |
| 795 ''' | |
| 796 self.conn.commit() | |
| 797 | |
| 798 def commit(self): | |
| 799 ''' Commit the current transactions. | |
| 800 | |
| 801 Save all data changed since the database was opened or since the | |
| 802 last commit() or rollback(). | |
| 803 ''' | |
| 804 if __debug__: | |
| 805 print >>hyperdb.DEBUG, 'commit', (self,) | |
| 806 | |
| 807 # commit the database | |
| 808 self.sql_commit() | |
| 809 | |
| 810 # now, do all the other transaction stuff | |
| 811 reindex = {} | |
| 812 for method, args in self.transactions: | |
| 813 reindex[method(*args)] = 1 | |
| 814 | |
| 815 # reindex the nodes that request it | |
| 816 for classname, nodeid in filter(None, reindex.keys()): | |
| 817 print >>hyperdb.DEBUG, 'commit.reindex', (classname, nodeid) | |
| 818 self.getclass(classname).index(nodeid) | |
| 819 | |
| 820 # save the indexer state | |
| 821 self.indexer.save_index() | |
| 822 | |
| 823 # clear out the transactions | |
| 824 self.transactions = [] | |
| 825 | |
| 826 def rollback(self): | |
| 827 ''' Reverse all actions from the current transaction. | |
| 828 | |
| 829 Undo all the changes made since the database was opened or the last | |
| 830 commit() or rollback() was performed. | |
| 831 ''' | |
| 832 if __debug__: | |
| 833 print >>hyperdb.DEBUG, 'rollback', (self,) | |
| 834 | |
| 835 # roll back | |
| 836 self.conn.rollback() | |
| 837 | |
| 838 # roll back "other" transaction stuff | |
| 839 for method, args in self.transactions: | |
| 840 # delete temporary files | |
| 841 if method == self.doStoreFile: | |
| 842 self.rollbackStoreFile(*args) | |
| 843 self.transactions = [] | |
| 844 | |
|
1492
2fc7d4a8c9e7
fixed sqlite rollback/caching bug [SF#689383]
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
845 # clear the cache |
|
2fc7d4a8c9e7
fixed sqlite rollback/caching bug [SF#689383]
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
846 self.clearCache() |
|
2fc7d4a8c9e7
fixed sqlite rollback/caching bug [SF#689383]
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
847 |
| 1165 | 848 def doSaveNode(self, classname, nodeid, node): |
| 849 ''' dummy that just generates a reindex event | |
| 850 ''' | |
| 851 # return the classname, nodeid so we reindex this content | |
| 852 return (classname, nodeid) | |
| 853 | |
| 854 def close(self): | |
| 855 ''' Close off the connection. | |
| 856 ''' | |
| 857 self.conn.close() | |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1304
diff
changeset
|
858 if self.lockfile is not None: |
|
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1304
diff
changeset
|
859 locking.release_lock(self.lockfile) |
|
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1304
diff
changeset
|
860 if self.lockfile is not None: |
|
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1304
diff
changeset
|
861 self.lockfile.close() |
|
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1304
diff
changeset
|
862 self.lockfile = None |
| 1165 | 863 |
| 864 # | |
| 865 # The base Class class | |
| 866 # | |
| 867 class Class(hyperdb.Class): | |
| 868 ''' The handle to a particular class of nodes in a hyperdatabase. | |
| 869 | |
| 870 All methods except __repr__ and getnode must be implemented by a | |
| 871 concrete backend Class. | |
| 872 ''' | |
| 873 | |
| 874 def __init__(self, db, classname, **properties): | |
| 875 '''Create a new class with a given name and property specification. | |
| 876 | |
| 877 'classname' must not collide with the name of an existing class, | |
| 878 or a ValueError is raised. The keyword arguments in 'properties' | |
| 879 must map names to property objects, or a TypeError is raised. | |
| 880 ''' | |
| 881 if (properties.has_key('creation') or properties.has_key('activity') | |
| 882 or properties.has_key('creator')): | |
| 883 raise ValueError, '"creation", "activity" and "creator" are '\ | |
| 884 'reserved' | |
| 885 | |
| 886 self.classname = classname | |
| 887 self.properties = properties | |
| 888 self.db = weakref.proxy(db) # use a weak ref to avoid circularity | |
| 889 self.key = '' | |
| 890 | |
| 891 # should we journal changes (default yes) | |
| 892 self.do_journal = 1 | |
| 893 | |
| 894 # do the db-related init stuff | |
| 895 db.addclass(self) | |
| 896 | |
|
1519
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
897 self.auditors = {'create': [], 'set': [], 'retire': [], 'restore': []} |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
898 self.reactors = {'create': [], 'set': [], 'retire': [], 'restore': []} |
| 1165 | 899 |
| 900 def schema(self): | |
| 901 ''' A dumpable version of the schema that we can store in the | |
| 902 database | |
| 903 ''' | |
| 904 return (self.key, [(x, repr(y)) for x,y in self.properties.items()]) | |
| 905 | |
| 906 def enableJournalling(self): | |
| 907 '''Turn journalling on for this class | |
| 908 ''' | |
| 909 self.do_journal = 1 | |
| 910 | |
| 911 def disableJournalling(self): | |
| 912 '''Turn journalling off for this class | |
| 913 ''' | |
| 914 self.do_journal = 0 | |
| 915 | |
| 916 # Editing nodes: | |
| 917 def create(self, **propvalues): | |
| 918 ''' Create a new node of this class and return its id. | |
| 919 | |
| 920 The keyword arguments in 'propvalues' map property names to values. | |
| 921 | |
| 922 The values of arguments must be acceptable for the types of their | |
| 923 corresponding properties or a TypeError is raised. | |
| 924 | |
| 925 If this class has a key property, it must be present and its value | |
| 926 must not collide with other key strings or a ValueError is raised. | |
| 927 | |
| 928 Any other properties on this class that are missing from the | |
| 929 'propvalues' dictionary are set to None. | |
| 930 | |
| 931 If an id in a link or multilink property does not refer to a valid | |
| 932 node, an IndexError is raised. | |
| 933 ''' | |
|
1431
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
934 self.fireAuditors('create', None, propvalues) |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
935 newid = self.create_inner(**propvalues) |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
936 self.fireReactors('create', newid, None) |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
937 return newid |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
938 |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
939 def create_inner(self, **propvalues): |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
940 ''' Called by create, in-between the audit and react calls. |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
941 ''' |
| 1165 | 942 if propvalues.has_key('id'): |
| 943 raise KeyError, '"id" is reserved' | |
| 944 | |
| 945 if self.db.journaltag is None: | |
| 946 raise DatabaseError, 'Database open read-only' | |
| 947 | |
| 948 if propvalues.has_key('creation') or propvalues.has_key('activity'): | |
| 949 raise KeyError, '"creation" and "activity" are reserved' | |
| 950 | |
| 951 # new node's id | |
| 952 newid = self.db.newid(self.classname) | |
| 953 | |
| 954 # validate propvalues | |
| 955 num_re = re.compile('^\d+$') | |
| 956 for key, value in propvalues.items(): | |
| 957 if key == self.key: | |
| 958 try: | |
| 959 self.lookup(value) | |
| 960 except KeyError: | |
| 961 pass | |
| 962 else: | |
| 963 raise ValueError, 'node with key "%s" exists'%value | |
| 964 | |
| 965 # try to handle this property | |
| 966 try: | |
| 967 prop = self.properties[key] | |
| 968 except KeyError: | |
| 969 raise KeyError, '"%s" has no property "%s"'%(self.classname, | |
| 970 key) | |
| 971 | |
| 972 if value is not None and isinstance(prop, Link): | |
| 973 if type(value) != type(''): | |
| 974 raise ValueError, 'link value must be String' | |
| 975 link_class = self.properties[key].classname | |
| 976 # if it isn't a number, it's a key | |
| 977 if not num_re.match(value): | |
| 978 try: | |
| 979 value = self.db.classes[link_class].lookup(value) | |
| 980 except (TypeError, KeyError): | |
| 981 raise IndexError, 'new property "%s": %s not a %s'%( | |
| 982 key, value, link_class) | |
| 983 elif not self.db.getclass(link_class).hasnode(value): | |
| 984 raise IndexError, '%s has no node %s'%(link_class, value) | |
| 985 | |
| 986 # save off the value | |
| 987 propvalues[key] = value | |
| 988 | |
| 989 # register the link with the newly linked node | |
| 990 if self.do_journal and self.properties[key].do_journal: | |
| 991 self.db.addjournal(link_class, value, 'link', | |
| 992 (self.classname, newid, key)) | |
| 993 | |
| 994 elif isinstance(prop, Multilink): | |
| 995 if type(value) != type([]): | |
| 996 raise TypeError, 'new property "%s" not a list of ids'%key | |
| 997 | |
| 998 # clean up and validate the list of links | |
| 999 link_class = self.properties[key].classname | |
| 1000 l = [] | |
| 1001 for entry in value: | |
| 1002 if type(entry) != type(''): | |
| 1003 raise ValueError, '"%s" multilink value (%r) '\ | |
| 1004 'must contain Strings'%(key, value) | |
| 1005 # if it isn't a number, it's a key | |
| 1006 if not num_re.match(entry): | |
| 1007 try: | |
| 1008 entry = self.db.classes[link_class].lookup(entry) | |
| 1009 except (TypeError, KeyError): | |
| 1010 raise IndexError, 'new property "%s": %s not a %s'%( | |
| 1011 key, entry, self.properties[key].classname) | |
| 1012 l.append(entry) | |
| 1013 value = l | |
| 1014 propvalues[key] = value | |
| 1015 | |
| 1016 # handle additions | |
| 1017 for nodeid in value: | |
| 1018 if not self.db.getclass(link_class).hasnode(nodeid): | |
| 1019 raise IndexError, '%s has no node %s'%(link_class, | |
| 1020 nodeid) | |
| 1021 # register the link with the newly linked node | |
| 1022 if self.do_journal and self.properties[key].do_journal: | |
| 1023 self.db.addjournal(link_class, nodeid, 'link', | |
| 1024 (self.classname, newid, key)) | |
| 1025 | |
| 1026 elif isinstance(prop, String): | |
|
1383
f19dde90e473
applied unicode patch
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1365
diff
changeset
|
1027 if type(value) != type('') and type(value) != type(u''): |
| 1165 | 1028 raise TypeError, 'new property "%s" not a string'%key |
| 1029 | |
| 1030 elif isinstance(prop, Password): | |
| 1031 if not isinstance(value, password.Password): | |
| 1032 raise TypeError, 'new property "%s" not a Password'%key | |
| 1033 | |
| 1034 elif isinstance(prop, Date): | |
| 1035 if value is not None and not isinstance(value, date.Date): | |
| 1036 raise TypeError, 'new property "%s" not a Date'%key | |
| 1037 | |
| 1038 elif isinstance(prop, Interval): | |
| 1039 if value is not None and not isinstance(value, date.Interval): | |
| 1040 raise TypeError, 'new property "%s" not an Interval'%key | |
| 1041 | |
| 1042 elif value is not None and isinstance(prop, Number): | |
| 1043 try: | |
| 1044 float(value) | |
| 1045 except ValueError: | |
| 1046 raise TypeError, 'new property "%s" not numeric'%key | |
| 1047 | |
| 1048 elif value is not None and isinstance(prop, Boolean): | |
| 1049 try: | |
| 1050 int(value) | |
| 1051 except ValueError: | |
| 1052 raise TypeError, 'new property "%s" not boolean'%key | |
| 1053 | |
| 1054 # make sure there's data where there needs to be | |
| 1055 for key, prop in self.properties.items(): | |
| 1056 if propvalues.has_key(key): | |
| 1057 continue | |
| 1058 if key == self.key: | |
| 1059 raise ValueError, 'key property "%s" is required'%key | |
| 1060 if isinstance(prop, Multilink): | |
| 1061 propvalues[key] = [] | |
| 1062 else: | |
| 1063 propvalues[key] = None | |
| 1064 | |
| 1065 # done | |
| 1066 self.db.addnode(self.classname, newid, propvalues) | |
| 1067 if self.do_journal: | |
|
1304
61ad556cfc8d
working toward 0.5.2 release
Richard Jones <richard@users.sourceforge.net>
parents:
1295
diff
changeset
|
1068 self.db.addjournal(self.classname, newid, 'create', {}) |
| 1165 | 1069 |
| 1070 return newid | |
| 1071 | |
| 1072 def export_list(self, propnames, nodeid): | |
| 1073 ''' Export a node - generate a list of CSV-able data in the order | |
| 1074 specified by propnames for the given node. | |
| 1075 ''' | |
| 1076 properties = self.getprops() | |
| 1077 l = [] | |
| 1078 for prop in propnames: | |
| 1079 proptype = properties[prop] | |
| 1080 value = self.get(nodeid, prop) | |
| 1081 # "marshal" data where needed | |
| 1082 if value is None: | |
| 1083 pass | |
| 1084 elif isinstance(proptype, hyperdb.Date): | |
| 1085 value = value.get_tuple() | |
| 1086 elif isinstance(proptype, hyperdb.Interval): | |
| 1087 value = value.get_tuple() | |
| 1088 elif isinstance(proptype, hyperdb.Password): | |
| 1089 value = str(value) | |
| 1090 l.append(repr(value)) | |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1091 l.append(self.is_retired(nodeid)) |
| 1165 | 1092 return l |
| 1093 | |
| 1094 def import_list(self, propnames, proplist): | |
| 1095 ''' Import a node - all information including "id" is present and | |
| 1096 should not be sanity checked. Triggers are not triggered. The | |
| 1097 journal should be initialised using the "creator" and "created" | |
| 1098 information. | |
| 1099 | |
| 1100 Return the nodeid of the node imported. | |
| 1101 ''' | |
| 1102 if self.db.journaltag is None: | |
| 1103 raise DatabaseError, 'Database open read-only' | |
| 1104 properties = self.getprops() | |
| 1105 | |
| 1106 # make the new node's property map | |
| 1107 d = {} | |
|
1496
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
1108 retire = 0 |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
1109 newid = None |
| 1165 | 1110 for i in range(len(propnames)): |
| 1111 # Use eval to reverse the repr() used to output the CSV | |
| 1112 value = eval(proplist[i]) | |
| 1113 | |
| 1114 # Figure the property for this column | |
| 1115 propname = propnames[i] | |
| 1116 | |
| 1117 # "unmarshal" where necessary | |
| 1118 if propname == 'id': | |
| 1119 newid = value | |
| 1120 continue | |
|
1496
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
1121 elif propname == 'is retired': |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
1122 # is the item retired? |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
1123 if int(value): |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
1124 retire = 1 |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
1125 continue |
|
1751
ab7760caf6ff
Importing wasn't setting None values explicitly when it should have been
Richard Jones <richard@users.sourceforge.net>
parents:
1740
diff
changeset
|
1126 elif value is None: |
|
ab7760caf6ff
Importing wasn't setting None values explicitly when it should have been
Richard Jones <richard@users.sourceforge.net>
parents:
1740
diff
changeset
|
1127 d[propname] = None |
|
ab7760caf6ff
Importing wasn't setting None values explicitly when it should have been
Richard Jones <richard@users.sourceforge.net>
parents:
1740
diff
changeset
|
1128 continue |
|
1496
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
1129 |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
1130 prop = properties[propname] |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
1131 if value is None: |
| 1165 | 1132 # don't set Nones |
| 1133 continue | |
| 1134 elif isinstance(prop, hyperdb.Date): | |
| 1135 value = date.Date(value) | |
| 1136 elif isinstance(prop, hyperdb.Interval): | |
| 1137 value = date.Interval(value) | |
| 1138 elif isinstance(prop, hyperdb.Password): | |
| 1139 pwd = password.Password() | |
| 1140 pwd.unpack(value) | |
| 1141 value = pwd | |
| 1142 d[propname] = value | |
| 1143 | |
|
1496
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
1144 # get a new id if necessary |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
1145 if newid is None: |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
1146 newid = self.db.newid(self.classname) |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
1147 |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1148 # retire? |
|
1496
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1492
diff
changeset
|
1149 if retire: |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1150 # use the arg for __retired__ to cope with any odd database type |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1151 # conversion (hello, sqlite) |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1152 sql = 'update _%s set __retired__=%s where id=%s'%(self.classname, |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1153 self.db.arg, self.db.arg) |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1154 if __debug__: |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1155 print >>hyperdb.DEBUG, 'retire', (self, sql, newid) |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1156 self.db.cursor.execute(sql, (1, newid)) |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1157 |
|
1187
84e40c9bcd99
import fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1185
diff
changeset
|
1158 # add the node and journal |
|
84e40c9bcd99
import fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1185
diff
changeset
|
1159 self.db.addnode(self.classname, newid, d) |
|
84e40c9bcd99
import fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1185
diff
changeset
|
1160 |
| 1165 | 1161 # extract the extraneous journalling gumpf and nuke it |
| 1162 if d.has_key('creator'): | |
| 1163 creator = d['creator'] | |
| 1164 del d['creator'] | |
|
1187
84e40c9bcd99
import fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1185
diff
changeset
|
1165 else: |
|
84e40c9bcd99
import fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1185
diff
changeset
|
1166 creator = None |
| 1165 | 1167 if d.has_key('creation'): |
| 1168 creation = d['creation'] | |
| 1169 del d['creation'] | |
|
1187
84e40c9bcd99
import fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1185
diff
changeset
|
1170 else: |
|
84e40c9bcd99
import fixes
Richard Jones <richard@users.sourceforge.net>
parents:
1185
diff
changeset
|
1171 creation = None |
| 1165 | 1172 if d.has_key('activity'): |
| 1173 del d['activity'] | |
|
1304
61ad556cfc8d
working toward 0.5.2 release
Richard Jones <richard@users.sourceforge.net>
parents:
1295
diff
changeset
|
1174 self.db.addjournal(self.classname, newid, 'create', {}, creator, |
| 1165 | 1175 creation) |
| 1176 return newid | |
| 1177 | |
| 1178 _marker = [] | |
| 1179 def get(self, nodeid, propname, default=_marker, cache=1): | |
| 1180 '''Get the value of a property on an existing node of this class. | |
| 1181 | |
| 1182 'nodeid' must be the id of an existing node of this class or an | |
| 1183 IndexError is raised. 'propname' must be the name of a property | |
| 1184 of this class or a KeyError is raised. | |
| 1185 | |
| 1186 'cache' indicates whether the transaction cache should be queried | |
| 1187 for the node. If the node has been modified and you need to | |
| 1188 determine what its values prior to modification are, you need to | |
| 1189 set cache=0. | |
| 1190 ''' | |
| 1191 if propname == 'id': | |
| 1192 return nodeid | |
| 1193 | |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1194 # get the node's dict |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1195 d = self.db.getnode(self.classname, nodeid) |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1196 |
| 1165 | 1197 if propname == 'creation': |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1198 if d.has_key('creation'): |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1199 return d['creation'] |
| 1165 | 1200 else: |
| 1201 return date.Date() | |
| 1202 if propname == 'activity': | |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1203 if d.has_key('activity'): |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1204 return d['activity'] |
| 1165 | 1205 else: |
| 1206 return date.Date() | |
| 1207 if propname == 'creator': | |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1208 if d.has_key('creator'): |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1209 return d['creator'] |
| 1165 | 1210 else: |
|
1176
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
1211 return self.db.curuserid |
| 1165 | 1212 |
| 1213 # get the property (raises KeyErorr if invalid) | |
| 1214 prop = self.properties[propname] | |
| 1215 | |
| 1216 if not d.has_key(propname): | |
| 1217 if default is self._marker: | |
| 1218 if isinstance(prop, Multilink): | |
| 1219 return [] | |
| 1220 else: | |
| 1221 return None | |
| 1222 else: | |
| 1223 return default | |
| 1224 | |
| 1225 # don't pass our list to other code | |
| 1226 if isinstance(prop, Multilink): | |
| 1227 return d[propname][:] | |
| 1228 | |
| 1229 return d[propname] | |
| 1230 | |
| 1231 def getnode(self, nodeid, cache=1): | |
| 1232 ''' Return a convenience wrapper for the node. | |
| 1233 | |
| 1234 'nodeid' must be the id of an existing node of this class or an | |
| 1235 IndexError is raised. | |
| 1236 | |
| 1237 'cache' indicates whether the transaction cache should be queried | |
| 1238 for the node. If the node has been modified and you need to | |
| 1239 determine what its values prior to modification are, you need to | |
| 1240 set cache=0. | |
| 1241 ''' | |
| 1242 return Node(self, nodeid, cache=cache) | |
| 1243 | |
| 1244 def set(self, nodeid, **propvalues): | |
| 1245 '''Modify a property on an existing node of this class. | |
| 1246 | |
| 1247 'nodeid' must be the id of an existing node of this class or an | |
| 1248 IndexError is raised. | |
| 1249 | |
| 1250 Each key in 'propvalues' must be the name of a property of this | |
| 1251 class or a KeyError is raised. | |
| 1252 | |
| 1253 All values in 'propvalues' must be acceptable types for their | |
| 1254 corresponding properties or a TypeError is raised. | |
| 1255 | |
| 1256 If the value of the key property is set, it must not collide with | |
| 1257 other key strings or a ValueError is raised. | |
| 1258 | |
| 1259 If the value of a Link or Multilink property contains an invalid | |
| 1260 node id, a ValueError is raised. | |
| 1261 ''' | |
| 1262 if not propvalues: | |
| 1263 return propvalues | |
| 1264 | |
| 1265 if propvalues.has_key('creation') or propvalues.has_key('activity'): | |
| 1266 raise KeyError, '"creation" and "activity" are reserved' | |
| 1267 | |
| 1268 if propvalues.has_key('id'): | |
| 1269 raise KeyError, '"id" is reserved' | |
| 1270 | |
| 1271 if self.db.journaltag is None: | |
| 1272 raise DatabaseError, 'Database open read-only' | |
| 1273 | |
| 1274 self.fireAuditors('set', nodeid, propvalues) | |
| 1275 # Take a copy of the node dict so that the subsequent set | |
| 1276 # operation doesn't modify the oldvalues structure. | |
| 1277 # XXX used to try the cache here first | |
| 1278 oldvalues = copy.deepcopy(self.db.getnode(self.classname, nodeid)) | |
| 1279 | |
| 1280 node = self.db.getnode(self.classname, nodeid) | |
| 1281 if self.is_retired(nodeid): | |
| 1282 raise IndexError, 'Requested item is retired' | |
| 1283 num_re = re.compile('^\d+$') | |
| 1284 | |
| 1285 # if the journal value is to be different, store it in here | |
| 1286 journalvalues = {} | |
| 1287 | |
| 1288 # remember the add/remove stuff for multilinks, making it easier | |
| 1289 # for the Database layer to do its stuff | |
| 1290 multilink_changes = {} | |
| 1291 | |
| 1292 for propname, value in propvalues.items(): | |
| 1293 # check to make sure we're not duplicating an existing key | |
| 1294 if propname == self.key and node[propname] != value: | |
| 1295 try: | |
| 1296 self.lookup(value) | |
| 1297 except KeyError: | |
| 1298 pass | |
| 1299 else: | |
| 1300 raise ValueError, 'node with key "%s" exists'%value | |
| 1301 | |
| 1302 # this will raise the KeyError if the property isn't valid | |
| 1303 # ... we don't use getprops() here because we only care about | |
| 1304 # the writeable properties. | |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1305 try: |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1306 prop = self.properties[propname] |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1307 except KeyError: |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1308 raise KeyError, '"%s" has no property named "%s"'%( |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1309 self.classname, propname) |
| 1165 | 1310 |
| 1311 # if the value's the same as the existing value, no sense in | |
| 1312 # doing anything | |
|
1304
61ad556cfc8d
working toward 0.5.2 release
Richard Jones <richard@users.sourceforge.net>
parents:
1295
diff
changeset
|
1313 current = node.get(propname, None) |
|
61ad556cfc8d
working toward 0.5.2 release
Richard Jones <richard@users.sourceforge.net>
parents:
1295
diff
changeset
|
1314 if value == current: |
| 1165 | 1315 del propvalues[propname] |
| 1316 continue | |
|
1304
61ad556cfc8d
working toward 0.5.2 release
Richard Jones <richard@users.sourceforge.net>
parents:
1295
diff
changeset
|
1317 journalvalues[propname] = current |
| 1165 | 1318 |
| 1319 # do stuff based on the prop type | |
| 1320 if isinstance(prop, Link): | |
| 1321 link_class = prop.classname | |
| 1322 # if it isn't a number, it's a key | |
| 1323 if value is not None and not isinstance(value, type('')): | |
| 1324 raise ValueError, 'property "%s" link value be a string'%( | |
| 1325 propname) | |
| 1326 if isinstance(value, type('')) and not num_re.match(value): | |
| 1327 try: | |
| 1328 value = self.db.classes[link_class].lookup(value) | |
| 1329 except (TypeError, KeyError): | |
| 1330 raise IndexError, 'new property "%s": %s not a %s'%( | |
| 1331 propname, value, prop.classname) | |
| 1332 | |
| 1333 if (value is not None and | |
| 1334 not self.db.getclass(link_class).hasnode(value)): | |
| 1335 raise IndexError, '%s has no node %s'%(link_class, value) | |
| 1336 | |
| 1337 if self.do_journal and prop.do_journal: | |
| 1338 # register the unlink with the old linked node | |
| 1339 if node[propname] is not None: | |
| 1340 self.db.addjournal(link_class, node[propname], 'unlink', | |
| 1341 (self.classname, nodeid, propname)) | |
| 1342 | |
| 1343 # register the link with the newly linked node | |
| 1344 if value is not None: | |
| 1345 self.db.addjournal(link_class, value, 'link', | |
| 1346 (self.classname, nodeid, propname)) | |
| 1347 | |
| 1348 elif isinstance(prop, Multilink): | |
| 1349 if type(value) != type([]): | |
| 1350 raise TypeError, 'new property "%s" not a list of'\ | |
| 1351 ' ids'%propname | |
| 1352 link_class = self.properties[propname].classname | |
| 1353 l = [] | |
| 1354 for entry in value: | |
| 1355 # if it isn't a number, it's a key | |
| 1356 if type(entry) != type(''): | |
| 1357 raise ValueError, 'new property "%s" link value ' \ | |
| 1358 'must be a string'%propname | |
| 1359 if not num_re.match(entry): | |
| 1360 try: | |
| 1361 entry = self.db.classes[link_class].lookup(entry) | |
| 1362 except (TypeError, KeyError): | |
| 1363 raise IndexError, 'new property "%s": %s not a %s'%( | |
| 1364 propname, entry, | |
| 1365 self.properties[propname].classname) | |
| 1366 l.append(entry) | |
| 1367 value = l | |
| 1368 propvalues[propname] = value | |
| 1369 | |
| 1370 # figure the journal entry for this property | |
| 1371 add = [] | |
| 1372 remove = [] | |
| 1373 | |
| 1374 # handle removals | |
| 1375 if node.has_key(propname): | |
| 1376 l = node[propname] | |
| 1377 else: | |
| 1378 l = [] | |
| 1379 for id in l[:]: | |
| 1380 if id in value: | |
| 1381 continue | |
| 1382 # register the unlink with the old linked node | |
| 1383 if self.do_journal and self.properties[propname].do_journal: | |
| 1384 self.db.addjournal(link_class, id, 'unlink', | |
| 1385 (self.classname, nodeid, propname)) | |
| 1386 l.remove(id) | |
| 1387 remove.append(id) | |
| 1388 | |
| 1389 # handle additions | |
| 1390 for id in value: | |
| 1391 if not self.db.getclass(link_class).hasnode(id): | |
| 1392 raise IndexError, '%s has no node %s'%(link_class, id) | |
| 1393 if id in l: | |
| 1394 continue | |
| 1395 # register the link with the newly linked node | |
| 1396 if self.do_journal and self.properties[propname].do_journal: | |
| 1397 self.db.addjournal(link_class, id, 'link', | |
| 1398 (self.classname, nodeid, propname)) | |
| 1399 l.append(id) | |
| 1400 add.append(id) | |
| 1401 | |
| 1402 # figure the journal entry | |
| 1403 l = [] | |
| 1404 if add: | |
| 1405 l.append(('+', add)) | |
| 1406 if remove: | |
| 1407 l.append(('-', remove)) | |
| 1408 multilink_changes[propname] = (add, remove) | |
| 1409 if l: | |
| 1410 journalvalues[propname] = tuple(l) | |
| 1411 | |
| 1412 elif isinstance(prop, String): | |
|
1383
f19dde90e473
applied unicode patch
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1365
diff
changeset
|
1413 if value is not None and type(value) != type('') and type(value) != type(u''): |
| 1165 | 1414 raise TypeError, 'new property "%s" not a string'%propname |
| 1415 | |
| 1416 elif isinstance(prop, Password): | |
| 1417 if not isinstance(value, password.Password): | |
| 1418 raise TypeError, 'new property "%s" not a Password'%propname | |
| 1419 propvalues[propname] = value | |
| 1420 | |
| 1421 elif value is not None and isinstance(prop, Date): | |
| 1422 if not isinstance(value, date.Date): | |
| 1423 raise TypeError, 'new property "%s" not a Date'% propname | |
| 1424 propvalues[propname] = value | |
| 1425 | |
| 1426 elif value is not None and isinstance(prop, Interval): | |
| 1427 if not isinstance(value, date.Interval): | |
| 1428 raise TypeError, 'new property "%s" not an '\ | |
| 1429 'Interval'%propname | |
| 1430 propvalues[propname] = value | |
| 1431 | |
| 1432 elif value is not None and isinstance(prop, Number): | |
| 1433 try: | |
| 1434 float(value) | |
| 1435 except ValueError: | |
| 1436 raise TypeError, 'new property "%s" not numeric'%propname | |
| 1437 | |
| 1438 elif value is not None and isinstance(prop, Boolean): | |
| 1439 try: | |
| 1440 int(value) | |
| 1441 except ValueError: | |
| 1442 raise TypeError, 'new property "%s" not boolean'%propname | |
| 1443 | |
| 1444 # nothing to do? | |
| 1445 if not propvalues: | |
| 1446 return propvalues | |
| 1447 | |
| 1448 # do the set, and journal it | |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1449 self.db.setnode(self.classname, nodeid, propvalues, multilink_changes) |
| 1165 | 1450 |
| 1451 if self.do_journal: | |
|
1304
61ad556cfc8d
working toward 0.5.2 release
Richard Jones <richard@users.sourceforge.net>
parents:
1295
diff
changeset
|
1452 self.db.addjournal(self.classname, nodeid, 'set', journalvalues) |
| 1165 | 1453 |
| 1454 self.fireReactors('set', nodeid, oldvalues) | |
| 1455 | |
| 1456 return propvalues | |
| 1457 | |
| 1458 def retire(self, nodeid): | |
| 1459 '''Retire a node. | |
| 1460 | |
| 1461 The properties on the node remain available from the get() method, | |
| 1462 and the node's id is never reused. | |
| 1463 | |
| 1464 Retired nodes are not returned by the find(), list(), or lookup() | |
| 1465 methods, and other nodes may reuse the values of their key properties. | |
| 1466 ''' | |
| 1467 if self.db.journaltag is None: | |
| 1468 raise DatabaseError, 'Database open read-only' | |
| 1469 | |
|
1345
618aa9c37d65
fire auditors and reactors in rdbms retire (thanks Sheila King)
Richard Jones <richard@users.sourceforge.net>
parents:
1333
diff
changeset
|
1470 self.fireAuditors('retire', nodeid, None) |
|
618aa9c37d65
fire auditors and reactors in rdbms retire (thanks Sheila King)
Richard Jones <richard@users.sourceforge.net>
parents:
1333
diff
changeset
|
1471 |
|
1222
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1472 # use the arg for __retired__ to cope with any odd database type |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1473 # conversion (hello, sqlite) |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1474 sql = 'update _%s set __retired__=%s where id=%s'%(self.classname, |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1475 self.db.arg, self.db.arg) |
| 1165 | 1476 if __debug__: |
| 1477 print >>hyperdb.DEBUG, 'retire', (self, sql, nodeid) | |
|
1222
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1478 self.db.cursor.execute(sql, (1, nodeid)) |
|
1519
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1479 if self.do_journal: |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1480 self.db.addjournal(self.classname, nodeid, 'retired', None) |
| 1165 | 1481 |
|
1345
618aa9c37d65
fire auditors and reactors in rdbms retire (thanks Sheila King)
Richard Jones <richard@users.sourceforge.net>
parents:
1333
diff
changeset
|
1482 self.fireReactors('retire', nodeid, None) |
|
618aa9c37d65
fire auditors and reactors in rdbms retire (thanks Sheila King)
Richard Jones <richard@users.sourceforge.net>
parents:
1333
diff
changeset
|
1483 |
|
1519
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1484 def restore(self, nodeid): |
|
1740
5ca448ff8052
don't have RDBMS backends list retired nodes [SF#767319]
Richard Jones <richard@users.sourceforge.net>
parents:
1719
diff
changeset
|
1485 '''Restore a retired node. |
|
1519
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1486 |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1487 Make node available for all operations like it was before retirement. |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1488 ''' |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1489 if self.db.journaltag is None: |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1490 raise DatabaseError, 'Database open read-only' |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1491 |
|
1523
63aa7be52d2c
checked to make sure that the restored item doesn't clash...
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1519
diff
changeset
|
1492 node = self.db.getnode(self.classname, nodeid) |
|
63aa7be52d2c
checked to make sure that the restored item doesn't clash...
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1519
diff
changeset
|
1493 # check if key property was overrided |
|
63aa7be52d2c
checked to make sure that the restored item doesn't clash...
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1519
diff
changeset
|
1494 key = self.getkey() |
|
63aa7be52d2c
checked to make sure that the restored item doesn't clash...
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1519
diff
changeset
|
1495 try: |
|
63aa7be52d2c
checked to make sure that the restored item doesn't clash...
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1519
diff
changeset
|
1496 id = self.lookup(node[key]) |
|
63aa7be52d2c
checked to make sure that the restored item doesn't clash...
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1519
diff
changeset
|
1497 except KeyError: |
|
63aa7be52d2c
checked to make sure that the restored item doesn't clash...
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1519
diff
changeset
|
1498 pass |
|
63aa7be52d2c
checked to make sure that the restored item doesn't clash...
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1519
diff
changeset
|
1499 else: |
|
63aa7be52d2c
checked to make sure that the restored item doesn't clash...
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1519
diff
changeset
|
1500 raise KeyError, "Key property (%s) of retired node clashes with \ |
|
63aa7be52d2c
checked to make sure that the restored item doesn't clash...
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1519
diff
changeset
|
1501 existing one (%s)" % (key, node[key]) |
|
63aa7be52d2c
checked to make sure that the restored item doesn't clash...
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1519
diff
changeset
|
1502 |
|
1519
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1503 self.fireAuditors('restore', nodeid, None) |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1504 # use the arg for __retired__ to cope with any odd database type |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1505 # conversion (hello, sqlite) |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1506 sql = 'update _%s set __retired__=%s where id=%s'%(self.classname, |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1507 self.db.arg, self.db.arg) |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1508 if __debug__: |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1509 print >>hyperdb.DEBUG, 'restore', (self, sql, nodeid) |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1510 self.db.cursor.execute(sql, (0, nodeid)) |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1511 if self.do_journal: |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1512 self.db.addjournal(self.classname, nodeid, 'restored', None) |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1513 |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1514 self.fireReactors('restore', nodeid, None) |
|
6fede2aa6a12
added ability to restore retired nodes
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1515
diff
changeset
|
1515 |
| 1165 | 1516 def is_retired(self, nodeid): |
| 1517 '''Return true if the node is rerired | |
| 1518 ''' | |
| 1519 sql = 'select __retired__ from _%s where id=%s'%(self.classname, | |
| 1520 self.db.arg) | |
| 1521 if __debug__: | |
| 1522 print >>hyperdb.DEBUG, 'is_retired', (self, sql, nodeid) | |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
1523 self.db.cursor.execute(sql, (nodeid,)) |
|
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
1524 return int(self.db.sql_fetchone()[0]) |
| 1165 | 1525 |
| 1526 def destroy(self, nodeid): | |
| 1527 '''Destroy a node. | |
| 1528 | |
| 1529 WARNING: this method should never be used except in extremely rare | |
| 1530 situations where there could never be links to the node being | |
| 1531 deleted | |
| 1532 WARNING: use retire() instead | |
| 1533 WARNING: the properties of this node will not be available ever again | |
| 1534 WARNING: really, use retire() instead | |
| 1535 | |
| 1536 Well, I think that's enough warnings. This method exists mostly to | |
| 1537 support the session storage of the cgi interface. | |
| 1538 | |
| 1539 The node is completely removed from the hyperdb, including all journal | |
| 1540 entries. It will no longer be available, and will generally break code | |
| 1541 if there are any references to the node. | |
| 1542 ''' | |
| 1543 if self.db.journaltag is None: | |
| 1544 raise DatabaseError, 'Database open read-only' | |
| 1545 self.db.destroynode(self.classname, nodeid) | |
| 1546 | |
| 1547 def history(self, nodeid): | |
| 1548 '''Retrieve the journal of edits on a particular node. | |
| 1549 | |
| 1550 'nodeid' must be the id of an existing node of this class or an | |
| 1551 IndexError is raised. | |
| 1552 | |
| 1553 The returned list contains tuples of the form | |
| 1554 | |
|
1409
8dc60d87ab42
Fixed a backlog of bug reports, and worked on python 2.3 compatibility:
Richard Jones <richard@users.sourceforge.net>
parents:
1383
diff
changeset
|
1555 (nodeid, date, tag, action, params) |
| 1165 | 1556 |
| 1557 'date' is a Timestamp object specifying the time of the change and | |
| 1558 'tag' is the journaltag specified when the database was opened. | |
| 1559 ''' | |
| 1560 if not self.do_journal: | |
| 1561 raise ValueError, 'Journalling is disabled for this class' | |
| 1562 return self.db.getjournal(self.classname, nodeid) | |
| 1563 | |
| 1564 # Locating nodes: | |
| 1565 def hasnode(self, nodeid): | |
| 1566 '''Determine if the given nodeid actually exists | |
| 1567 ''' | |
| 1568 return self.db.hasnode(self.classname, nodeid) | |
| 1569 | |
| 1570 def setkey(self, propname): | |
| 1571 '''Select a String property of this class to be the key property. | |
| 1572 | |
| 1573 'propname' must be the name of a String property of this class or | |
| 1574 None, or a TypeError is raised. The values of the key property on | |
| 1575 all existing nodes must be unique or a ValueError is raised. | |
| 1576 ''' | |
| 1577 # XXX create an index on the key prop column | |
| 1578 prop = self.getprops()[propname] | |
| 1579 if not isinstance(prop, String): | |
| 1580 raise TypeError, 'key properties must be String' | |
| 1581 self.key = propname | |
| 1582 | |
| 1583 def getkey(self): | |
| 1584 '''Return the name of the key property for this class or None.''' | |
| 1585 return self.key | |
| 1586 | |
| 1587 def labelprop(self, default_to_id=0): | |
| 1588 ''' Return the property name for a label for the given node. | |
| 1589 | |
| 1590 This method attempts to generate a consistent label for the node. | |
| 1591 It tries the following in order: | |
| 1592 1. key property | |
| 1593 2. "name" property | |
| 1594 3. "title" property | |
| 1595 4. first property from the sorted property name list | |
| 1596 ''' | |
| 1597 k = self.getkey() | |
| 1598 if k: | |
| 1599 return k | |
| 1600 props = self.getprops() | |
| 1601 if props.has_key('name'): | |
| 1602 return 'name' | |
| 1603 elif props.has_key('title'): | |
| 1604 return 'title' | |
| 1605 if default_to_id: | |
| 1606 return 'id' | |
| 1607 props = props.keys() | |
| 1608 props.sort() | |
| 1609 return props[0] | |
| 1610 | |
| 1611 def lookup(self, keyvalue): | |
| 1612 '''Locate a particular node by its key property and return its id. | |
| 1613 | |
| 1614 If this class has no key property, a TypeError is raised. If the | |
| 1615 'keyvalue' matches one of the values for the key property among | |
| 1616 the nodes in this class, the matching node's id is returned; | |
| 1617 otherwise a KeyError is raised. | |
| 1618 ''' | |
| 1619 if not self.key: | |
| 1620 raise TypeError, 'No key property set for class %s'%self.classname | |
| 1621 | |
|
1222
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1622 # use the arg to handle any odd database type conversion (hello, |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1623 # sqlite) |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1624 sql = "select id from _%s where _%s=%s and __retired__ <> %s"%( |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1625 self.classname, self.key, self.db.arg, self.db.arg) |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1626 self.db.sql(sql, (keyvalue, 1)) |
| 1165 | 1627 |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1628 # see if there was a result that's not retired |
|
1203
735adcbfc665
fix to SQL lookup() and retirement
Richard Jones <richard@users.sourceforge.net>
parents:
1195
diff
changeset
|
1629 row = self.db.sql_fetchone() |
|
735adcbfc665
fix to SQL lookup() and retirement
Richard Jones <richard@users.sourceforge.net>
parents:
1195
diff
changeset
|
1630 if not row: |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1631 raise KeyError, 'No key (%s) value "%s" for "%s"'%(self.key, |
|
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1632 keyvalue, self.classname) |
| 1165 | 1633 |
| 1634 # return the id | |
|
1203
735adcbfc665
fix to SQL lookup() and retirement
Richard Jones <richard@users.sourceforge.net>
parents:
1195
diff
changeset
|
1635 return row[0] |
| 1165 | 1636 |
| 1637 def find(self, **propspec): | |
| 1638 '''Get the ids of nodes in this class which link to the given nodes. | |
| 1639 | |
|
1222
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1640 'propspec' consists of keyword args propname=nodeid or |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1641 propname={nodeid:1, } |
| 1165 | 1642 'propname' must be the name of a property in this class, or a |
| 1643 KeyError is raised. That property must be a Link or Multilink | |
| 1644 property, or a TypeError is raised. | |
| 1645 | |
| 1646 Any node in this class whose 'propname' property links to any of the | |
| 1647 nodeids will be returned. Used by the full text indexing, which knows | |
| 1648 that "foo" occurs in msg1, msg3 and file7, so we have hits on these | |
| 1649 issues: | |
| 1650 | |
| 1651 db.issue.find(messages={'1':1,'3':1}, files={'7':1}) | |
| 1652 ''' | |
| 1653 if __debug__: | |
| 1654 print >>hyperdb.DEBUG, 'find', (self, propspec) | |
|
1222
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1655 |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1656 # shortcut |
| 1165 | 1657 if not propspec: |
| 1658 return [] | |
|
1222
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1659 |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1660 # validate the args |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1661 props = self.getprops() |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1662 propspec = propspec.items() |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1663 for propname, nodeids in propspec: |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1664 # check the prop is OK |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1665 prop = props[propname] |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1666 if not isinstance(prop, Link) and not isinstance(prop, Multilink): |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1667 raise TypeError, "'%s' not a Link/Multilink property"%propname |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1668 |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1669 # first, links |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1670 where = [] |
| 1165 | 1671 allvalues = () |
|
1222
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1672 a = self.db.arg |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1673 for prop, values in propspec: |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1674 if not isinstance(props[prop], hyperdb.Link): |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1675 continue |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1676 if type(values) is type(''): |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1677 allvalues += (values,) |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1678 where.append('_%s = %s'%(prop, a)) |
|
1563
e2a8ce4d2317
Class.find() may now find unset Links [SF#700620]
Richard Jones <richard@users.sourceforge.net>
parents:
1557
diff
changeset
|
1679 elif values is None: |
|
e2a8ce4d2317
Class.find() may now find unset Links [SF#700620]
Richard Jones <richard@users.sourceforge.net>
parents:
1557
diff
changeset
|
1680 where.append('_%s is NULL'%prop) |
|
1222
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1681 else: |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1682 allvalues += tuple(values.keys()) |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1683 where.append('_%s in (%s)'%(prop, ','.join([a]*len(values)))) |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1684 tables = [] |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1685 if where: |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1686 tables.append('select id as nodeid from _%s where %s'%( |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1687 self.classname, ' and '.join(where))) |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1688 |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1689 # now multilinks |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1690 for prop, values in propspec: |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1691 if not isinstance(props[prop], hyperdb.Multilink): |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1692 continue |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1693 if type(values) is type(''): |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1694 allvalues += (values,) |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1695 s = a |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1696 else: |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1697 allvalues += tuple(values.keys()) |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1698 s = ','.join([a]*len(values)) |
| 1165 | 1699 tables.append('select nodeid from %s_%s where linkid in (%s)'%( |
|
1222
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1700 self.classname, prop, s)) |
|
bc3bc3248dd1
added Class.find() unit test, fixed implementations
Richard Jones <richard@users.sourceforge.net>
parents:
1212
diff
changeset
|
1701 sql = '\nunion\n'.join(tables) |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
1702 self.db.sql(sql, allvalues) |
|
1195
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1703 l = [x[0] for x in self.db.sql_fetchall()] |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1704 if __debug__: |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1705 print >>hyperdb.DEBUG, 'find ... ', l |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1706 return l |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1707 |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1708 def stringFind(self, **requirements): |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1709 '''Locate a particular node by matching a set of its String |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1710 properties in a caseless search. |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1711 |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1712 If the property is not a String property, a TypeError is raised. |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1713 |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1714 The return is a list of the id of all nodes that match. |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1715 ''' |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1716 where = [] |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1717 args = [] |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1718 for propname in requirements.keys(): |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1719 prop = self.properties[propname] |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1720 if isinstance(not prop, String): |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1721 raise TypeError, "'%s' not a String property"%propname |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1722 where.append(propname) |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1723 args.append(requirements[propname].lower()) |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1724 |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1725 # generate the where clause |
|
1549
a53a7e197360
fixed rdbms email address lookup (case insensitivity)
Richard Jones <richard@users.sourceforge.net>
parents:
1539
diff
changeset
|
1726 s = ' and '.join(['lower(_%s)=%s'%(col, self.db.arg) for col in where]) |
|
1195
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1727 sql = 'select id from _%s where %s'%(self.classname, s) |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1728 self.db.sql(sql, tuple(args)) |
|
e0032f4ab334
added missing stringFind to sql backends
Richard Jones <richard@users.sourceforge.net>
parents:
1189
diff
changeset
|
1729 l = [x[0] for x in self.db.sql_fetchall()] |
| 1165 | 1730 if __debug__: |
| 1731 print >>hyperdb.DEBUG, 'find ... ', l | |
| 1732 return l | |
| 1733 | |
| 1734 def list(self): | |
| 1735 ''' Return a list of the ids of the active nodes in this class. | |
| 1736 ''' | |
|
1484
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1479
diff
changeset
|
1737 return self.getnodeids(retired=0) |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1479
diff
changeset
|
1738 |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1479
diff
changeset
|
1739 def getnodeids(self, retired=None): |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1479
diff
changeset
|
1740 ''' Retrieve all the ids of the nodes for a particular Class. |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1479
diff
changeset
|
1741 |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1479
diff
changeset
|
1742 Set retired=None to get all nodes. Otherwise it'll get all the |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1479
diff
changeset
|
1743 retired or non-retired nodes, depending on the flag. |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1479
diff
changeset
|
1744 ''' |
|
1707
3d627e34f18e
sqlite backend now passes all tests under 2.3.
Anthony Baxter <anthonybaxter@users.sourceforge.net>
parents:
1599
diff
changeset
|
1745 # flip the sense of the 'retired' flag if we don't want all of them |
|
1484
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1479
diff
changeset
|
1746 if retired is not None: |
|
1719
eeb167fb8faf
*** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
1707
diff
changeset
|
1747 if retired: |
|
eeb167fb8faf
*** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
1707
diff
changeset
|
1748 args = (0, ) |
|
eeb167fb8faf
*** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
1707
diff
changeset
|
1749 else: |
|
eeb167fb8faf
*** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
1707
diff
changeset
|
1750 args = (1, ) |
|
1539
800b5896e14a
fixed rdbms export - getnodeids in particular with NULL values
Richard Jones <richard@users.sourceforge.net>
parents:
1528
diff
changeset
|
1751 sql = 'select id from _%s where __retired__ <> %s'%(self.classname, |
|
800b5896e14a
fixed rdbms export - getnodeids in particular with NULL values
Richard Jones <richard@users.sourceforge.net>
parents:
1528
diff
changeset
|
1752 self.db.arg) |
|
800b5896e14a
fixed rdbms export - getnodeids in particular with NULL values
Richard Jones <richard@users.sourceforge.net>
parents:
1528
diff
changeset
|
1753 else: |
|
800b5896e14a
fixed rdbms export - getnodeids in particular with NULL values
Richard Jones <richard@users.sourceforge.net>
parents:
1528
diff
changeset
|
1754 args = () |
|
800b5896e14a
fixed rdbms export - getnodeids in particular with NULL values
Richard Jones <richard@users.sourceforge.net>
parents:
1528
diff
changeset
|
1755 sql = 'select id from _%s'%self.classname |
|
1484
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1479
diff
changeset
|
1756 if __debug__: |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1479
diff
changeset
|
1757 print >>hyperdb.DEBUG, 'getnodeids', (self, sql, retired) |
|
1539
800b5896e14a
fixed rdbms export - getnodeids in particular with NULL values
Richard Jones <richard@users.sourceforge.net>
parents:
1528
diff
changeset
|
1758 self.db.cursor.execute(sql, args) |
|
800b5896e14a
fixed rdbms export - getnodeids in particular with NULL values
Richard Jones <richard@users.sourceforge.net>
parents:
1528
diff
changeset
|
1759 ids = [x[0] for x in self.db.cursor.fetchall()] |
|
800b5896e14a
fixed rdbms export - getnodeids in particular with NULL values
Richard Jones <richard@users.sourceforge.net>
parents:
1528
diff
changeset
|
1760 return ids |
| 1165 | 1761 |
|
1249
6c24a86a12ae
Fixes for SourceForge tracker bugs.
Richard Jones <richard@users.sourceforge.net>
parents:
1244
diff
changeset
|
1762 def filter(self, search_matches, filterspec, sort=(None,None), |
|
6c24a86a12ae
Fixes for SourceForge tracker bugs.
Richard Jones <richard@users.sourceforge.net>
parents:
1244
diff
changeset
|
1763 group=(None,None)): |
| 1165 | 1764 ''' Return a list of the ids of the active nodes in this class that |
| 1765 match the 'filter' spec, sorted by the group spec and then the | |
| 1766 sort spec | |
| 1767 | |
| 1768 "filterspec" is {propname: value(s)} | |
| 1769 "sort" and "group" are (dir, prop) where dir is '+', '-' or None | |
| 1770 and prop is a prop name or None | |
| 1771 "search_matches" is {nodeid: marker} | |
|
1170
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1772 |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1773 The filter must match all properties specificed - but if the |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1774 property value to match is a list, any one of the values in the |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1775 list may match for that property to match. |
| 1165 | 1776 ''' |
|
1205
0df08772f166
fix to SQL filtering
Richard Jones <richard@users.sourceforge.net>
parents:
1203
diff
changeset
|
1777 # just don't bother if the full-text search matched diddly |
|
0df08772f166
fix to SQL filtering
Richard Jones <richard@users.sourceforge.net>
parents:
1203
diff
changeset
|
1778 if search_matches == {}: |
|
0df08772f166
fix to SQL filtering
Richard Jones <richard@users.sourceforge.net>
parents:
1203
diff
changeset
|
1779 return [] |
|
0df08772f166
fix to SQL filtering
Richard Jones <richard@users.sourceforge.net>
parents:
1203
diff
changeset
|
1780 |
| 1165 | 1781 cn = self.classname |
| 1782 | |
|
1499
8ee69708da0c
added support for searching on ranges of dates
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1496
diff
changeset
|
1783 timezone = self.db.getUserTimezone() |
|
8ee69708da0c
added support for searching on ranges of dates
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1496
diff
changeset
|
1784 |
| 1165 | 1785 # figure the WHERE clause from the filterspec |
| 1786 props = self.getprops() | |
| 1787 frum = ['_'+cn] | |
| 1788 where = [] | |
| 1789 args = [] | |
|
1168
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
1790 a = self.db.arg |
| 1165 | 1791 for k, v in filterspec.items(): |
| 1792 propclass = props[k] | |
|
1170
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1793 # now do other where clause stuff |
| 1165 | 1794 if isinstance(propclass, Multilink): |
| 1795 tn = '%s_%s'%(cn, k) | |
|
1556
9e89f5394f6c
handle myriad of argument types to filter()
Richard Jones <richard@users.sourceforge.net>
parents:
1555
diff
changeset
|
1796 if v in ('-1', ['-1']): |
|
9e89f5394f6c
handle myriad of argument types to filter()
Richard Jones <richard@users.sourceforge.net>
parents:
1555
diff
changeset
|
1797 # only match rows that have count(linkid)=0 in the |
|
9e89f5394f6c
handle myriad of argument types to filter()
Richard Jones <richard@users.sourceforge.net>
parents:
1555
diff
changeset
|
1798 # corresponding multilink table) |
|
9e89f5394f6c
handle myriad of argument types to filter()
Richard Jones <richard@users.sourceforge.net>
parents:
1555
diff
changeset
|
1799 where.append('id not in (select nodeid from %s)'%tn) |
|
9e89f5394f6c
handle myriad of argument types to filter()
Richard Jones <richard@users.sourceforge.net>
parents:
1555
diff
changeset
|
1800 elif isinstance(v, type([])): |
|
1555
948c7764d46c
implemented ability to search for multilink properties with no value (not in mk)
Richard Jones <richard@users.sourceforge.net>
parents:
1549
diff
changeset
|
1801 frum.append(tn) |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1802 s = ','.join([a for x in v]) |
| 1165 | 1803 where.append('id=%s.nodeid and %s.linkid in (%s)'%(tn,tn,s)) |
| 1804 args = args + v | |
| 1805 else: | |
|
1555
948c7764d46c
implemented ability to search for multilink properties with no value (not in mk)
Richard Jones <richard@users.sourceforge.net>
parents:
1549
diff
changeset
|
1806 frum.append(tn) |
|
948c7764d46c
implemented ability to search for multilink properties with no value (not in mk)
Richard Jones <richard@users.sourceforge.net>
parents:
1549
diff
changeset
|
1807 where.append('id=%s.nodeid and %s.linkid=%s'%(tn, tn, a)) |
| 1165 | 1808 args.append(v) |
|
1365
4884fb0860f9
fixed rdbms searching by ID [SF#666615]
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
1809 elif k == 'id': |
|
4884fb0860f9
fixed rdbms searching by ID [SF#666615]
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
1810 if isinstance(v, type([])): |
|
4884fb0860f9
fixed rdbms searching by ID [SF#666615]
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
1811 s = ','.join([a for x in v]) |
|
4884fb0860f9
fixed rdbms searching by ID [SF#666615]
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
1812 where.append('%s in (%s)'%(k, s)) |
|
4884fb0860f9
fixed rdbms searching by ID [SF#666615]
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
1813 args = args + v |
|
4884fb0860f9
fixed rdbms searching by ID [SF#666615]
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
1814 else: |
|
4884fb0860f9
fixed rdbms searching by ID [SF#666615]
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
1815 where.append('%s=%s'%(k, a)) |
|
4884fb0860f9
fixed rdbms searching by ID [SF#666615]
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
1816 args.append(v) |
|
1170
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1817 elif isinstance(propclass, String): |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1818 if not isinstance(v, type([])): |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1819 v = [v] |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1820 |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1821 # Quote the bits in the string that need it and then embed |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1822 # in a "substring" search. Note - need to quote the '%' so |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1823 # they make it through the python layer happily |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1824 v = ['%%'+self.db.sql_stringquote(s)+'%%' for s in v] |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1825 |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1826 # now add to the where clause |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1827 where.append(' or '.join(["_%s LIKE '%s'"%(k, s) for s in v])) |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1828 # note: args are embedded in the query string now |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1829 elif isinstance(propclass, Link): |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1830 if isinstance(v, type([])): |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1831 if '-1' in v: |
|
1578
ba13c04814f0
don't modify filterspec passed in (bad Richard)
Richard Jones <richard@users.sourceforge.net>
parents:
1563
diff
changeset
|
1832 v = v[:] |
|
1170
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1833 v.remove('-1') |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1834 xtra = ' or _%s is NULL'%k |
|
1173
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
1835 else: |
|
58f1a2c174ed
simple LRU cache for SQL databases
Richard Jones <richard@users.sourceforge.net>
parents:
1172
diff
changeset
|
1836 xtra = '' |
|
1295
9c3459cb8ab6
work-around for sqlite bug
Richard Jones <richard@users.sourceforge.net>
parents:
1252
diff
changeset
|
1837 if v: |
|
9c3459cb8ab6
work-around for sqlite bug
Richard Jones <richard@users.sourceforge.net>
parents:
1252
diff
changeset
|
1838 s = ','.join([a for x in v]) |
|
9c3459cb8ab6
work-around for sqlite bug
Richard Jones <richard@users.sourceforge.net>
parents:
1252
diff
changeset
|
1839 where.append('(_%s in (%s)%s)'%(k, s, xtra)) |
|
9c3459cb8ab6
work-around for sqlite bug
Richard Jones <richard@users.sourceforge.net>
parents:
1252
diff
changeset
|
1840 args = args + v |
|
9c3459cb8ab6
work-around for sqlite bug
Richard Jones <richard@users.sourceforge.net>
parents:
1252
diff
changeset
|
1841 else: |
|
9c3459cb8ab6
work-around for sqlite bug
Richard Jones <richard@users.sourceforge.net>
parents:
1252
diff
changeset
|
1842 where.append('_%s is NULL'%k) |
|
1170
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1843 else: |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1844 if v == '-1': |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1845 v = None |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1846 where.append('_%s is NULL'%k) |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1847 else: |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1848 where.append('_%s=%s'%(k, a)) |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1849 args.append(v) |
|
1351
d1bfb479e527
fixed searching on date / interval fields [SF#658157]
Richard Jones <richard@users.sourceforge.net>
parents:
1345
diff
changeset
|
1850 elif isinstance(propclass, Date): |
|
d1bfb479e527
fixed searching on date / interval fields [SF#658157]
Richard Jones <richard@users.sourceforge.net>
parents:
1345
diff
changeset
|
1851 if isinstance(v, type([])): |
|
d1bfb479e527
fixed searching on date / interval fields [SF#658157]
Richard Jones <richard@users.sourceforge.net>
parents:
1345
diff
changeset
|
1852 s = ','.join([a for x in v]) |
|
d1bfb479e527
fixed searching on date / interval fields [SF#658157]
Richard Jones <richard@users.sourceforge.net>
parents:
1345
diff
changeset
|
1853 where.append('_%s in (%s)'%(k, s)) |
|
d1bfb479e527
fixed searching on date / interval fields [SF#658157]
Richard Jones <richard@users.sourceforge.net>
parents:
1345
diff
changeset
|
1854 args = args + [date.Date(x).serialise() for x in v] |
|
d1bfb479e527
fixed searching on date / interval fields [SF#658157]
Richard Jones <richard@users.sourceforge.net>
parents:
1345
diff
changeset
|
1855 else: |
|
1499
8ee69708da0c
added support for searching on ranges of dates
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1496
diff
changeset
|
1856 try: |
|
8ee69708da0c
added support for searching on ranges of dates
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1496
diff
changeset
|
1857 # Try to filter on range of dates |
|
8ee69708da0c
added support for searching on ranges of dates
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1496
diff
changeset
|
1858 date_rng = Range(v, date.Date, offset=timezone) |
|
8ee69708da0c
added support for searching on ranges of dates
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1496
diff
changeset
|
1859 if (date_rng.from_value): |
|
1599
cc96bf971b33
extended date syntax to make range searches even more useful
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1596
diff
changeset
|
1860 where.append('_%s >= %s'%(k, a)) |
|
1499
8ee69708da0c
added support for searching on ranges of dates
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1496
diff
changeset
|
1861 args.append(date_rng.from_value.serialise()) |
|
8ee69708da0c
added support for searching on ranges of dates
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1496
diff
changeset
|
1862 if (date_rng.to_value): |
|
1599
cc96bf971b33
extended date syntax to make range searches even more useful
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1596
diff
changeset
|
1863 where.append('_%s <= %s'%(k, a)) |
|
1499
8ee69708da0c
added support for searching on ranges of dates
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1496
diff
changeset
|
1864 args.append(date_rng.to_value.serialise()) |
|
8ee69708da0c
added support for searching on ranges of dates
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1496
diff
changeset
|
1865 except ValueError: |
|
8ee69708da0c
added support for searching on ranges of dates
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1496
diff
changeset
|
1866 # If range creation fails - ignore that search parameter |
|
8ee69708da0c
added support for searching on ranges of dates
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1496
diff
changeset
|
1867 pass |
|
1351
d1bfb479e527
fixed searching on date / interval fields [SF#658157]
Richard Jones <richard@users.sourceforge.net>
parents:
1345
diff
changeset
|
1868 elif isinstance(propclass, Interval): |
|
d1bfb479e527
fixed searching on date / interval fields [SF#658157]
Richard Jones <richard@users.sourceforge.net>
parents:
1345
diff
changeset
|
1869 if isinstance(v, type([])): |
|
d1bfb479e527
fixed searching on date / interval fields [SF#658157]
Richard Jones <richard@users.sourceforge.net>
parents:
1345
diff
changeset
|
1870 s = ','.join([a for x in v]) |
|
d1bfb479e527
fixed searching on date / interval fields [SF#658157]
Richard Jones <richard@users.sourceforge.net>
parents:
1345
diff
changeset
|
1871 where.append('_%s in (%s)'%(k, s)) |
|
d1bfb479e527
fixed searching on date / interval fields [SF#658157]
Richard Jones <richard@users.sourceforge.net>
parents:
1345
diff
changeset
|
1872 args = args + [date.Interval(x).serialise() for x in v] |
|
d1bfb479e527
fixed searching on date / interval fields [SF#658157]
Richard Jones <richard@users.sourceforge.net>
parents:
1345
diff
changeset
|
1873 else: |
|
1596
33a0d94c7658
searching on ranges of intervals is implemented
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1578
diff
changeset
|
1874 try: |
|
33a0d94c7658
searching on ranges of intervals is implemented
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1578
diff
changeset
|
1875 # Try to filter on range of intervals |
|
33a0d94c7658
searching on ranges of intervals is implemented
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1578
diff
changeset
|
1876 date_rng = Range(v, date.Interval) |
|
33a0d94c7658
searching on ranges of intervals is implemented
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1578
diff
changeset
|
1877 if (date_rng.from_value): |
|
1599
cc96bf971b33
extended date syntax to make range searches even more useful
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1596
diff
changeset
|
1878 where.append('_%s >= %s'%(k, a)) |
|
1596
33a0d94c7658
searching on ranges of intervals is implemented
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1578
diff
changeset
|
1879 args.append(date_rng.from_value.serialise()) |
|
33a0d94c7658
searching on ranges of intervals is implemented
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1578
diff
changeset
|
1880 if (date_rng.to_value): |
|
1599
cc96bf971b33
extended date syntax to make range searches even more useful
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1596
diff
changeset
|
1881 where.append('_%s <= %s'%(k, a)) |
|
1596
33a0d94c7658
searching on ranges of intervals is implemented
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1578
diff
changeset
|
1882 args.append(date_rng.to_value.serialise()) |
|
33a0d94c7658
searching on ranges of intervals is implemented
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1578
diff
changeset
|
1883 except ValueError: |
|
33a0d94c7658
searching on ranges of intervals is implemented
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1578
diff
changeset
|
1884 # If range creation fails - ignore that search parameter |
|
33a0d94c7658
searching on ranges of intervals is implemented
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1578
diff
changeset
|
1885 pass |
|
33a0d94c7658
searching on ranges of intervals is implemented
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1578
diff
changeset
|
1886 #where.append('_%s=%s'%(k, a)) |
|
33a0d94c7658
searching on ranges of intervals is implemented
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1578
diff
changeset
|
1887 #args.append(date.Interval(v).serialise()) |
| 1165 | 1888 else: |
| 1889 if isinstance(v, type([])): | |
|
1168
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
1890 s = ','.join([a for x in v]) |
| 1165 | 1891 where.append('_%s in (%s)'%(k, s)) |
| 1892 args = args + v | |
| 1893 else: | |
|
1168
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
1894 where.append('_%s=%s'%(k, a)) |
| 1165 | 1895 args.append(v) |
| 1896 | |
|
1740
5ca448ff8052
don't have RDBMS backends list retired nodes [SF#767319]
Richard Jones <richard@users.sourceforge.net>
parents:
1719
diff
changeset
|
1897 # don't match retired nodes |
|
5ca448ff8052
don't have RDBMS backends list retired nodes [SF#767319]
Richard Jones <richard@users.sourceforge.net>
parents:
1719
diff
changeset
|
1898 where.append('__retired__ <> 1') |
|
5ca448ff8052
don't have RDBMS backends list retired nodes [SF#767319]
Richard Jones <richard@users.sourceforge.net>
parents:
1719
diff
changeset
|
1899 |
| 1165 | 1900 # add results of full text search |
| 1901 if search_matches is not None: | |
| 1902 v = search_matches.keys() | |
|
1168
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
1903 s = ','.join([a for x in v]) |
| 1165 | 1904 where.append('id in (%s)'%s) |
| 1905 args = args + v | |
| 1906 | |
|
1170
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1907 # "grouping" is just the first-order sorting in the SQL fetch |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1908 # can modify it...) |
| 1165 | 1909 orderby = [] |
| 1910 ordercols = [] | |
|
1170
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1911 if group[0] is not None and group[1] is not None: |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1912 if group[0] != '-': |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1913 orderby.append('_'+group[1]) |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1914 ordercols.append('_'+group[1]) |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1915 else: |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1916 orderby.append('_'+group[1]+' desc') |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1917 ordercols.append('_'+group[1]) |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1918 |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1919 # now add in the sorting |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1920 group = '' |
| 1165 | 1921 if sort[0] is not None and sort[1] is not None: |
|
1168
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
1922 direction, colname = sort |
|
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
1923 if direction != '-': |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1924 if colname == 'id': |
|
1170
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1925 orderby.append(colname) |
|
1168
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
1926 else: |
|
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
1927 orderby.append('_'+colname) |
|
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
1928 ordercols.append('_'+colname) |
| 1165 | 1929 else: |
|
1174
8e318dfaf479
Verify contents of tracker module when the tracker is opened
Richard Jones <richard@users.sourceforge.net>
parents:
1173
diff
changeset
|
1930 if colname == 'id': |
|
1170
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1931 orderby.append(colname+' desc') |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1932 ordercols.append(colname) |
|
1168
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
1933 else: |
|
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
1934 orderby.append('_'+colname+' desc') |
|
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
1935 ordercols.append('_'+colname) |
| 1165 | 1936 |
| 1937 # construct the SQL | |
| 1938 frum = ','.join(frum) | |
|
1170
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1939 if where: |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1940 where = ' where ' + (' and '.join(where)) |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1941 else: |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1942 where = '' |
| 1165 | 1943 cols = ['id'] |
| 1944 if orderby: | |
| 1945 cols = cols + ordercols | |
| 1946 order = ' order by %s'%(','.join(orderby)) | |
| 1947 else: | |
| 1948 order = '' | |
| 1949 cols = ','.join(cols) | |
|
1170
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1950 sql = 'select %s from %s %s%s%s'%(cols, frum, where, group, order) |
| 1165 | 1951 args = tuple(args) |
| 1952 if __debug__: | |
|
1168
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
1953 print >>hyperdb.DEBUG, 'filter', (self, sql, args) |
|
1183
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
1954 self.db.cursor.execute(sql, args) |
|
08a13a84ed43
Some speedups - both of the SQL backends can handle using only one cursor.
Richard Jones <richard@users.sourceforge.net>
parents:
1181
diff
changeset
|
1955 l = self.db.cursor.fetchall() |
| 1165 | 1956 |
|
1170
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1957 # return the IDs (the first column) |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1958 # XXX The filter(None, l) bit is sqlite-specific... if there's _NO_ |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1959 # XXX matches to a fetch, it returns NULL instead of nothing!?! |
|
af104fa52746
Added some words to the installation doc about choosing backends.
Richard Jones <richard@users.sourceforge.net>
parents:
1168
diff
changeset
|
1960 return filter(None, [row[0] for row in l]) |
|
1168
94620e088e3a
fixes to the rdbms backends
Richard Jones <richard@users.sourceforge.net>
parents:
1165
diff
changeset
|
1961 |
| 1165 | 1962 def count(self): |
| 1963 '''Get the number of nodes in this class. | |
| 1964 | |
| 1965 If the returned integer is 'numnodes', the ids of all the nodes | |
| 1966 in this class run from 1 to numnodes, and numnodes+1 will be the | |
| 1967 id of the next node to be created in this class. | |
| 1968 ''' | |
| 1969 return self.db.countnodes(self.classname) | |
| 1970 | |
| 1971 # Manipulating properties: | |
| 1972 def getprops(self, protected=1): | |
| 1973 '''Return a dictionary mapping property names to property objects. | |
| 1974 If the "protected" flag is true, we include protected properties - | |
| 1975 those which may not be modified. | |
| 1976 ''' | |
| 1977 d = self.properties.copy() | |
| 1978 if protected: | |
| 1979 d['id'] = String() | |
| 1980 d['creation'] = hyperdb.Date() | |
| 1981 d['activity'] = hyperdb.Date() | |
|
1176
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
1982 d['creator'] = hyperdb.Link('user') |
| 1165 | 1983 return d |
| 1984 | |
| 1985 def addprop(self, **properties): | |
| 1986 '''Add properties to this class. | |
| 1987 | |
| 1988 The keyword arguments in 'properties' must map names to property | |
| 1989 objects, or a TypeError is raised. None of the keys in 'properties' | |
| 1990 may collide with the names of existing properties, or a ValueError | |
| 1991 is raised before any properties have been added. | |
| 1992 ''' | |
| 1993 for key in properties.keys(): | |
| 1994 if self.properties.has_key(key): | |
| 1995 raise ValueError, key | |
| 1996 self.properties.update(properties) | |
| 1997 | |
| 1998 def index(self, nodeid): | |
| 1999 '''Add (or refresh) the node to search indexes | |
| 2000 ''' | |
| 2001 # find all the String properties that have indexme | |
| 2002 for prop, propclass in self.getprops().items(): | |
| 2003 if isinstance(propclass, String) and propclass.indexme: | |
| 2004 try: | |
| 2005 value = str(self.get(nodeid, prop)) | |
| 2006 except IndexError: | |
| 2007 # node no longer exists - entry should be removed | |
| 2008 self.db.indexer.purge_entry((self.classname, nodeid, prop)) | |
| 2009 else: | |
| 2010 # and index them under (classname, nodeid, property) | |
| 2011 self.db.indexer.add_text((self.classname, nodeid, prop), | |
| 2012 value) | |
| 2013 | |
| 2014 | |
| 2015 # | |
| 2016 # Detector interface | |
| 2017 # | |
| 2018 def audit(self, event, detector): | |
| 2019 '''Register a detector | |
| 2020 ''' | |
| 2021 l = self.auditors[event] | |
| 2022 if detector not in l: | |
| 2023 self.auditors[event].append(detector) | |
| 2024 | |
| 2025 def fireAuditors(self, action, nodeid, newvalues): | |
| 2026 '''Fire all registered auditors. | |
| 2027 ''' | |
| 2028 for audit in self.auditors[action]: | |
| 2029 audit(self.db, self, nodeid, newvalues) | |
| 2030 | |
| 2031 def react(self, event, detector): | |
| 2032 '''Register a detector | |
| 2033 ''' | |
| 2034 l = self.reactors[event] | |
| 2035 if detector not in l: | |
| 2036 self.reactors[event].append(detector) | |
| 2037 | |
| 2038 def fireReactors(self, action, nodeid, oldvalues): | |
| 2039 '''Fire all registered reactors. | |
| 2040 ''' | |
| 2041 for react in self.reactors[action]: | |
| 2042 react(self.db, self, nodeid, oldvalues) | |
| 2043 | |
|
1442
b42fa71754c9
don't attempt to create FileClass items if no content is supplied
Richard Jones <richard@users.sourceforge.net>
parents:
1431
diff
changeset
|
2044 class FileClass(Class, hyperdb.FileClass): |
| 1165 | 2045 '''This class defines a large chunk of data. To support this, it has a |
| 2046 mandatory String property "content" which is typically saved off | |
| 2047 externally to the hyperdb. | |
| 2048 | |
| 2049 The default MIME type of this data is defined by the | |
| 2050 "default_mime_type" class attribute, which may be overridden by each | |
| 2051 node if the class defines a "type" String property. | |
| 2052 ''' | |
| 2053 default_mime_type = 'text/plain' | |
| 2054 | |
| 2055 def create(self, **propvalues): | |
| 2056 ''' snaffle the file propvalue and store in a file | |
| 2057 ''' | |
|
1431
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
2058 # we need to fire the auditors now, or the content property won't |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
2059 # be in propvalues for the auditors to play with |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
2060 self.fireAuditors('create', None, propvalues) |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
2061 |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
2062 # now remove the content property so it's not stored in the db |
| 1165 | 2063 content = propvalues['content'] |
| 2064 del propvalues['content'] | |
|
1431
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
2065 |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
2066 # do the database create |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
2067 newid = Class.create_inner(self, **propvalues) |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
2068 |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
2069 # fire reactors |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
2070 self.fireReactors('create', newid, None) |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
2071 |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
2072 # store off the content as a file |
| 1165 | 2073 self.db.storefile(self.classname, newid, None, content) |
| 2074 return newid | |
| 2075 | |
| 2076 def import_list(self, propnames, proplist): | |
| 2077 ''' Trap the "content" property... | |
| 2078 ''' | |
| 2079 # dupe this list so we don't affect others | |
| 2080 propnames = propnames[:] | |
| 2081 | |
| 2082 # extract the "content" property from the proplist | |
| 2083 i = propnames.index('content') | |
| 2084 content = eval(proplist[i]) | |
| 2085 del propnames[i] | |
| 2086 del proplist[i] | |
| 2087 | |
| 2088 # do the normal import | |
| 2089 newid = Class.import_list(self, propnames, proplist) | |
| 2090 | |
| 2091 # save off the "content" file | |
| 2092 self.db.storefile(self.classname, newid, None, content) | |
| 2093 return newid | |
| 2094 | |
| 2095 _marker = [] | |
| 2096 def get(self, nodeid, propname, default=_marker, cache=1): | |
| 2097 ''' trap the content propname and get it from the file | |
| 2098 ''' | |
| 2099 poss_msg = 'Possibly a access right configuration problem.' | |
| 2100 if propname == 'content': | |
| 2101 try: | |
| 2102 return self.db.getfile(self.classname, nodeid, None) | |
| 2103 except IOError, (strerror): | |
| 2104 # BUG: by catching this we donot see an error in the log. | |
| 2105 return 'ERROR reading file: %s%s\n%s\n%s'%( | |
| 2106 self.classname, nodeid, poss_msg, strerror) | |
| 2107 if default is not self._marker: | |
| 2108 return Class.get(self, nodeid, propname, default, cache=cache) | |
| 2109 else: | |
| 2110 return Class.get(self, nodeid, propname, cache=cache) | |
| 2111 | |
| 2112 def getprops(self, protected=1): | |
| 2113 ''' In addition to the actual properties on the node, these methods | |
| 2114 provide the "content" property. If the "protected" flag is true, | |
| 2115 we include protected properties - those which may not be | |
| 2116 modified. | |
| 2117 ''' | |
| 2118 d = Class.getprops(self, protected=protected).copy() | |
| 2119 d['content'] = hyperdb.String() | |
| 2120 return d | |
| 2121 | |
| 2122 def index(self, nodeid): | |
| 2123 ''' Index the node in the search index. | |
| 2124 | |
| 2125 We want to index the content in addition to the normal String | |
| 2126 property indexing. | |
| 2127 ''' | |
| 2128 # perform normal indexing | |
| 2129 Class.index(self, nodeid) | |
| 2130 | |
| 2131 # get the content to index | |
| 2132 content = self.get(nodeid, 'content') | |
| 2133 | |
| 2134 # figure the mime type | |
| 2135 if self.properties.has_key('type'): | |
| 2136 mime_type = self.get(nodeid, 'type') | |
| 2137 else: | |
| 2138 mime_type = self.default_mime_type | |
| 2139 | |
| 2140 # and index! | |
| 2141 self.db.indexer.add_text((self.classname, nodeid, 'content'), content, | |
| 2142 mime_type) | |
| 2143 | |
| 2144 # XXX deviation from spec - was called ItemClass | |
| 2145 class IssueClass(Class, roundupdb.IssueClass): | |
| 2146 # Overridden methods: | |
| 2147 def __init__(self, db, classname, **properties): | |
| 2148 '''The newly-created class automatically includes the "messages", | |
| 2149 "files", "nosy", and "superseder" properties. If the 'properties' | |
| 2150 dictionary attempts to specify any of these properties or a | |
| 2151 "creation" or "activity" property, a ValueError is raised. | |
| 2152 ''' | |
| 2153 if not properties.has_key('title'): | |
| 2154 properties['title'] = hyperdb.String(indexme='yes') | |
| 2155 if not properties.has_key('messages'): | |
| 2156 properties['messages'] = hyperdb.Multilink("msg") | |
| 2157 if not properties.has_key('files'): | |
| 2158 properties['files'] = hyperdb.Multilink("file") | |
| 2159 if not properties.has_key('nosy'): | |
| 2160 # note: journalling is turned off as it really just wastes | |
| 2161 # space. this behaviour may be overridden in an instance | |
| 2162 properties['nosy'] = hyperdb.Multilink("user", do_journal="no") | |
| 2163 if not properties.has_key('superseder'): | |
| 2164 properties['superseder'] = hyperdb.Multilink(classname) | |
| 2165 Class.__init__(self, db, classname, **properties) | |
| 2166 |