Mercurial > p > roundup > code
annotate roundup/backends/back_mysql.py @ 1997:8a01cd280aae maint-0.6
*** empty log message ***
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Mon, 02 Feb 2004 21:54:24 +0000 |
| parents | 84b6d5b07626 |
| children | d5d5594c6fb4 |
| rev | line source |
|---|---|
|
1415
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
1 # |
|
1433
8429095241d7
mysql tests will not be run if there is no chance of passing.
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1415
diff
changeset
|
2 # Copyright (c) 2003 Martynas Sklyzmantas, Andrey Lebedev <andrey@micro.lt> |
|
1415
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
3 # |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
4 # This module is free software, and you may redistribute it and/or modify |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
5 # under the same terms as Python, so long as this copyright message and |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
6 # disclaimer are retained in their original form. |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
7 # |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
8 # Mysql backend for roundup |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
9 # |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
10 |
|
1375
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
11 from roundup.backends.rdbms_common import * |
|
1415
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
12 from roundup.backends import rdbms_common |
|
1375
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
13 import MySQLdb |
|
1434
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
14 import os, shutil |
|
1375
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
15 from MySQLdb.constants import ER |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
16 |
|
1434
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
17 class Maintenance: |
|
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
18 """ Database maintenance functions """ |
|
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
19 def db_nuke(self, config): |
|
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
20 """Clear all database contents and drop database itself""" |
|
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
21 db = Database(config, 'admin') |
|
1922
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
22 try: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
23 db.sql_commit() |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
24 db.sql("DROP DATABASE %s" % config.MYSQL_DBNAME) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
25 db.sql("CREATE DATABASE %s" % config.MYSQL_DBNAME) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
26 finally: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
27 db.close() |
|
1434
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
28 if os.path.exists(config.DATABASE): |
|
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
29 shutil.rmtree(config.DATABASE) |
|
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
30 |
|
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
31 def db_exists(self, config): |
|
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
32 """Check if database already exists""" |
|
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
33 # Yes, this is a hack, but we must must open connection without |
|
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
34 # selecting a database to prevent creation of some tables |
|
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
35 config.MYSQL_DATABASE = (config.MYSQL_DBHOST, config.MYSQL_DBUSER, config.MYSQL_DBPASSWORD) |
|
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
36 db = Database(config, 'admin') |
|
1922
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
37 try: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
38 db.conn.select_db(config.MYSQL_DBNAME) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
39 config.MYSQL_DATABASE = (config.MYSQL_DBHOST, config.MYSQL_DBUSER, |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
40 config.MYSQL_DBPASSWORD, config.MYSQL_DBNAME) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
41 db.sql("SHOW TABLES") |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
42 tables = db.sql_fetchall() |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
43 finally: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
44 db.close() |
|
1434
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
45 if tables or os.path.exists(config.DATABASE): |
|
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
46 return 1 |
|
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
47 return 0 |
|
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
48 |
|
1375
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
49 class Database(Database): |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
50 arg = '%s' |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
51 |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
52 def open_connection(self): |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
53 db = getattr(self.config, 'MYSQL_DATABASE') |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
54 try: |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
55 self.conn = MySQLdb.connect(*db) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
56 except MySQLdb.OperationalError, message: |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
57 raise DatabaseError, message |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
58 |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
59 self.cursor = self.conn.cursor() |
|
1415
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
60 # start transaction |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
61 self.sql("SET AUTOCOMMIT=0") |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
62 self.sql("BEGIN") |
|
1375
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
63 try: |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
64 self.database_schema = self.load_dbschema() |
|
1433
8429095241d7
mysql tests will not be run if there is no chance of passing.
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1415
diff
changeset
|
65 except MySQLdb.OperationalError, message: |
|
8429095241d7
mysql tests will not be run if there is no chance of passing.
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1415
diff
changeset
|
66 if message[0] != ER.NO_DB_ERROR: |
|
8429095241d7
mysql tests will not be run if there is no chance of passing.
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1415
diff
changeset
|
67 raise |
|
1375
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
68 except MySQLdb.ProgrammingError, message: |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
69 if message[0] != ER.NO_SUCH_TABLE: |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
70 raise DatabaseError, message |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
71 self.database_schema = {} |
|
1415
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
72 self.sql("CREATE TABLE schema (schema TEXT) TYPE=BDB") |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
73 self.sql("CREATE TABLE ids (name varchar(255), num INT) TYPE=BDB") |
|
1375
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
74 |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
75 def __repr__(self): |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
76 return '<myroundsql 0x%x>'%id(self) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
77 |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
78 def sql_fetchone(self): |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
79 return self.cursor.fetchone() |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
80 |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
81 def sql_fetchall(self): |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
82 return self.cursor.fetchall() |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
83 |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
84 def save_dbschema(self, schema): |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
85 s = repr(self.database_schema) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
86 self.sql('INSERT INTO schema VALUES (%s)', (s,)) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
87 |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
88 def load_dbschema(self): |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
89 self.cursor.execute('SELECT schema FROM schema') |
|
1415
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
90 schema = self.cursor.fetchone() |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
91 if schema: |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
92 return eval(schema[0]) |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
93 return None |
|
1375
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
94 |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
95 def save_journal(self, classname, cols, nodeid, journaldate, |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
96 journaltag, action, params): |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
97 params = repr(params) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
98 entry = (nodeid, journaldate, journaltag, action, params) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
99 |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
100 a = self.arg |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
101 sql = 'insert into %s__journal (%s) values (%s,%s,%s,%s,%s)'%(classname, |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
102 cols, a, a, a, a, a) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
103 if __debug__: |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
104 print >>hyperdb.DEBUG, 'addjournal', (self, sql, entry) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
105 self.cursor.execute(sql, entry) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
106 |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
107 def load_journal(self, classname, cols, nodeid): |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
108 sql = 'select %s from %s__journal where nodeid=%s'%(cols, classname, |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
109 self.arg) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
110 if __debug__: |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
111 print >>hyperdb.DEBUG, 'getjournal', (self, sql, nodeid) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
112 self.cursor.execute(sql, (nodeid,)) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
113 res = [] |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
114 for nodeid, date_stamp, user, action, params in self.cursor.fetchall(): |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
115 params = eval(params) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
116 res.append((nodeid, date.Date(date_stamp), user, action, params)) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
117 return res |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
118 |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
119 def create_class_table(self, spec): |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
120 cols, mls = self.determine_columns(spec.properties.items()) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
121 cols.append('id') |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
122 cols.append('__retired__') |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
123 scols = ',' . join(['`%s` VARCHAR(255)'%x for x in cols]) |
|
1415
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
124 sql = 'CREATE TABLE `_%s` (%s) TYPE=BDB'%(spec.classname, scols) |
|
1375
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
125 if __debug__: |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
126 print >>hyperdb.DEBUG, 'create_class', (self, sql) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
127 self.cursor.execute(sql) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
128 return cols, mls |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
129 |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
130 def create_journal_table(self, spec): |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
131 cols = ',' . join(['`%s` VARCHAR(255)'%x |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
132 for x in 'nodeid date tag action params' . split()]) |
|
1415
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
133 sql = 'CREATE TABLE `%s__journal` (%s) TYPE=BDB'%(spec.classname, cols) |
|
1375
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
134 if __debug__: |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
135 print >>hyperdb.DEBUG, 'create_class', (self, sql) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
136 self.cursor.execute(sql) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
137 |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
138 def create_multilink_table(self, spec, ml): |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
139 sql = '''CREATE TABLE `%s_%s` (linkid VARCHAR(255), |
|
1415
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
140 nodeid VARCHAR(255)) TYPE=BDB'''%(spec.classname, ml) |
|
1375
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
141 if __debug__: |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
142 print >>hyperdb.DEBUG, 'create_class', (self, sql) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
143 self.cursor.execute(sql) |
|
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
144 |
|
1434
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
145 # Static methods |
|
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
146 nuke = Maintenance().db_nuke |
|
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
147 exists = Maintenance().db_exists |
|
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
148 |
|
1415
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
149 class MysqlClass: |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
150 def find(self, **propspec): |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
151 '''Get the ids of nodes in this class which link to the given nodes. |
|
1375
faf93d3fbf2f
added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
152 |
|
1415
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
153 Since MySQL < 4.0.0 does not support unions, so we overrideg this |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
154 method without using this keyword |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
155 |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
156 ''' |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
157 if __debug__: |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
158 print >>hyperdb.DEBUG, 'find', (self, propspec) |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
159 |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
160 # shortcut |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
161 if not propspec: |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
162 return [] |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
163 |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
164 # validate the args |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
165 props = self.getprops() |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
166 propspec = propspec.items() |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
167 for propname, nodeids in propspec: |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
168 # check the prop is OK |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
169 prop = props[propname] |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
170 if not isinstance(prop, Link) and not isinstance(prop, Multilink): |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
171 raise TypeError, "'%s' not a Link/Multilink property"%propname |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
172 |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
173 # first, links |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
174 l = [] |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
175 where = [] |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
176 allvalues = () |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
177 a = self.db.arg |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
178 for prop, values in propspec: |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
179 if not isinstance(props[prop], hyperdb.Link): |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
180 continue |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
181 if type(values) is type(''): |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
182 allvalues += (values,) |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
183 where.append('_%s = %s'%(prop, a)) |
|
1922
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
184 elif values is None: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
185 where.append('_%s is NULL'%prop) |
|
1415
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
186 else: |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
187 allvalues += tuple(values.keys()) |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
188 where.append('_%s in (%s)'%(prop, ','.join([a]*len(values)))) |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
189 tables = [] |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
190 if where: |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
191 self.db.sql('select id as nodeid from _%s where %s' % (self.classname, ' and '.join(where)), allvalues) |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
192 l += [x[0] for x in self.db.sql_fetchall()] |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
193 |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
194 # now multilinks |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
195 for prop, values in propspec: |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
196 vals = () |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
197 if not isinstance(props[prop], hyperdb.Multilink): |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
198 continue |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
199 if type(values) is type(''): |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
200 vals = (values,) |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
201 s = a |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
202 else: |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
203 vals = tuple(values.keys()) |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
204 s = ','.join([a]*len(values)) |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
205 query = 'select nodeid from %s_%s where linkid in (%s)'%( |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
206 self.classname, prop, s) |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
207 self.db.sql(query, vals) |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
208 l += [x[0] for x in self.db.sql_fetchall()] |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
209 if __debug__: |
|
1434
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
210 print >>hyperdb.DEBUG, 'find ... ', l |
|
1415
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
211 |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
212 # Remove duplicated ids |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
213 d = {} |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
214 for k in l: |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
215 d[k] = 1 |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
216 return d.keys() |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
217 |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
218 return l |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
219 |
|
1922
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
220 # we're overriding this method for ONE missing bit of functionality. |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
221 # look for "I can't believe it's not a toy RDBMS" below |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
222 def filter(self, search_matches, filterspec, sort=(None,None), |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
223 group=(None,None)): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
224 ''' Return a list of the ids of the active nodes in this class that |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
225 match the 'filter' spec, sorted by the group spec and then the |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
226 sort spec |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
227 |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
228 "filterspec" is {propname: value(s)} |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
229 "sort" and "group" are (dir, prop) where dir is '+', '-' or None |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
230 and prop is a prop name or None |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
231 "search_matches" is {nodeid: marker} |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
232 |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
233 The filter must match all properties specificed - but if the |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
234 property value to match is a list, any one of the values in the |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
235 list may match for that property to match. |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
236 ''' |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
237 # just don't bother if the full-text search matched diddly |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
238 if search_matches == {}: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
239 return [] |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
240 |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
241 cn = self.classname |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
242 |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
243 timezone = self.db.getUserTimezone() |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
244 |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
245 # figure the WHERE clause from the filterspec |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
246 props = self.getprops() |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
247 frum = ['_'+cn] |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
248 where = [] |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
249 args = [] |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
250 a = self.db.arg |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
251 for k, v in filterspec.items(): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
252 propclass = props[k] |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
253 # now do other where clause stuff |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
254 if isinstance(propclass, Multilink): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
255 tn = '%s_%s'%(cn, k) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
256 if v in ('-1', ['-1']): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
257 # only match rows that have count(linkid)=0 in the |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
258 # corresponding multilink table) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
259 |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
260 # "I can't believe it's not a toy RDBMS" |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
261 # see, even toy RDBMSes like gadfly and sqlite can do |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
262 # sub-selects... |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
263 self.db.sql('select nodeid from %s'%tn) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
264 s = ','.join([x[0] for x in self.db.sql_fetchall()]) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
265 |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
266 where.append('id not in (%s)'%s) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
267 elif isinstance(v, type([])): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
268 frum.append(tn) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
269 s = ','.join([a for x in v]) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
270 where.append('id=%s.nodeid and %s.linkid in (%s)'%(tn,tn,s)) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
271 args = args + v |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
272 else: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
273 frum.append(tn) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
274 where.append('id=%s.nodeid and %s.linkid=%s'%(tn, tn, a)) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
275 args.append(v) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
276 elif k == 'id': |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
277 if isinstance(v, type([])): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
278 s = ','.join([a for x in v]) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
279 where.append('%s in (%s)'%(k, s)) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
280 args = args + v |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
281 else: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
282 where.append('%s=%s'%(k, a)) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
283 args.append(v) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
284 elif isinstance(propclass, String): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
285 if not isinstance(v, type([])): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
286 v = [v] |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
287 |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
288 # Quote the bits in the string that need it and then embed |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
289 # in a "substring" search. Note - need to quote the '%' so |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
290 # they make it through the python layer happily |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
291 v = ['%%'+self.db.sql_stringquote(s)+'%%' for s in v] |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
292 |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
293 # now add to the where clause |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
294 where.append(' or '.join(["_%s LIKE '%s'"%(k, s) for s in v])) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
295 # note: args are embedded in the query string now |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
296 elif isinstance(propclass, Link): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
297 if isinstance(v, type([])): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
298 if '-1' in v: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
299 v = v[:] |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
300 v.remove('-1') |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
301 xtra = ' or _%s is NULL'%k |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
302 else: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
303 xtra = '' |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
304 if v: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
305 s = ','.join([a for x in v]) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
306 where.append('(_%s in (%s)%s)'%(k, s, xtra)) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
307 args = args + v |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
308 else: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
309 where.append('_%s is NULL'%k) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
310 else: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
311 if v == '-1': |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
312 v = None |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
313 where.append('_%s is NULL'%k) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
314 else: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
315 where.append('_%s=%s'%(k, a)) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
316 args.append(v) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
317 elif isinstance(propclass, Date): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
318 if isinstance(v, type([])): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
319 s = ','.join([a for x in v]) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
320 where.append('_%s in (%s)'%(k, s)) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
321 args = args + [date.Date(x).serialise() for x in v] |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
322 else: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
323 try: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
324 # Try to filter on range of dates |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
325 date_rng = Range(v, date.Date, offset=timezone) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
326 if (date_rng.from_value): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
327 where.append('_%s >= %s'%(k, a)) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
328 args.append(date_rng.from_value.serialise()) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
329 if (date_rng.to_value): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
330 where.append('_%s <= %s'%(k, a)) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
331 args.append(date_rng.to_value.serialise()) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
332 except ValueError: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
333 # If range creation fails - ignore that search parameter |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
334 pass |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
335 elif isinstance(propclass, Interval): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
336 if isinstance(v, type([])): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
337 s = ','.join([a for x in v]) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
338 where.append('_%s in (%s)'%(k, s)) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
339 args = args + [date.Interval(x).serialise() for x in v] |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
340 else: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
341 try: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
342 # Try to filter on range of intervals |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
343 date_rng = Range(v, date.Interval) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
344 if (date_rng.from_value): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
345 where.append('_%s >= %s'%(k, a)) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
346 args.append(date_rng.from_value.serialise()) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
347 if (date_rng.to_value): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
348 where.append('_%s <= %s'%(k, a)) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
349 args.append(date_rng.to_value.serialise()) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
350 except ValueError: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
351 # If range creation fails - ignore that search parameter |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
352 pass |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
353 #where.append('_%s=%s'%(k, a)) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
354 #args.append(date.Interval(v).serialise()) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
355 else: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
356 if isinstance(v, type([])): |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
357 s = ','.join([a for x in v]) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
358 where.append('_%s in (%s)'%(k, s)) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
359 args = args + v |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
360 else: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
361 where.append('_%s=%s'%(k, a)) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
362 args.append(v) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
363 |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
364 # don't match retired nodes |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
365 where.append('__retired__ <> 1') |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
366 |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
367 # add results of full text search |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
368 if search_matches is not None: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
369 v = search_matches.keys() |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
370 s = ','.join([a for x in v]) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
371 where.append('id in (%s)'%s) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
372 args = args + v |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
373 |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
374 # "grouping" is just the first-order sorting in the SQL fetch |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
375 # can modify it...) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
376 orderby = [] |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
377 ordercols = [] |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
378 if group[0] is not None and group[1] is not None: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
379 if group[0] != '-': |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
380 orderby.append('_'+group[1]) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
381 ordercols.append('_'+group[1]) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
382 else: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
383 orderby.append('_'+group[1]+' desc') |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
384 ordercols.append('_'+group[1]) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
385 |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
386 # now add in the sorting |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
387 group = '' |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
388 if sort[0] is not None and sort[1] is not None: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
389 direction, colname = sort |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
390 if direction != '-': |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
391 if colname == 'id': |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
392 orderby.append(colname) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
393 else: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
394 orderby.append('_'+colname) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
395 ordercols.append('_'+colname) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
396 else: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
397 if colname == 'id': |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
398 orderby.append(colname+' desc') |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
399 ordercols.append(colname) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
400 else: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
401 orderby.append('_'+colname+' desc') |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
402 ordercols.append('_'+colname) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
403 |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
404 # construct the SQL |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
405 frum = ','.join(frum) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
406 if where: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
407 where = ' where ' + (' and '.join(where)) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
408 else: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
409 where = '' |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
410 cols = ['id'] |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
411 if orderby: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
412 cols = cols + ordercols |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
413 order = ' order by %s'%(','.join(orderby)) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
414 else: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
415 order = '' |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
416 cols = ','.join(cols) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
417 sql = 'select %s from %s %s%s%s'%(cols, frum, where, group, order) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
418 args = tuple(args) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
419 if __debug__: |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
420 print >>hyperdb.DEBUG, 'filter', (self, sql, args) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
421 self.db.cursor.execute(sql, args) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
422 l = self.db.cursor.fetchall() |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
423 |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
424 # return the IDs (the first column) |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
425 return [row[0] for row in l] |
|
84b6d5b07626
testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents:
1434
diff
changeset
|
426 |
|
1415
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
427 class Class(MysqlClass, rdbms_common.Class): |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
428 pass |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
429 class IssueClass(MysqlClass, rdbms_common.IssueClass): |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
430 pass |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
431 class FileClass(MysqlClass, rdbms_common.FileClass): |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
432 pass |
|
6883852e9b15
mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1375
diff
changeset
|
433 |
|
1434
b953750bdc04
trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents:
1433
diff
changeset
|
434 #vim: set et |
