Mercurial > p > roundup > code

annotate roundup/backends/back_mysql.py @ 2165:e52da2b47edd maint-0.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make rdbms serialise() less trusting
author Richard Jones <richard@users.sourceforge.net>
date Wed, 31 Mar 2004 01:13:22 +0000
parents d5d5594c6fb4
children ffd14fa75bec
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
2074
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
11 from roundup import hyperdb
1375
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
12 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
13 from roundup.backends import rdbms_common
1375
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
14 import MySQLdb
1434
b953750bdc04 trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1433
diff changeset
15 import os, shutil
1375
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
16 from MySQLdb.constants import ER
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
17
2074
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
18 def db_nuke(config):
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
19 """Clear all database contents and drop database itself"""
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
20 if db_exists(config):
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
21 conn = MySQLdb.connect(config.MYSQL_DBHOST, config.MYSQL_DBUSER,
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
22 config.MYSQL_DBPASSWORD)
1922
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
23 try:
2074
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
24 conn.select_db(config.MYSQL_DBNAME)
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
25 except:
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
26 # no, it doesn't exist
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
27 pass
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
28 else:
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
29 cursor = conn.cursor()
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
30 cursor.execute("SHOW TABLES")
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
31 tables = cursor.fetchall()
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
32 for table in tables:
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
33 if __debug__:
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
34 print >>hyperdb.DEBUG, 'DROP TABLE %s'%table[0]
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
35 cursor.execute("DROP TABLE %s"%table[0])
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
36 if __debug__:
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
37 print >>hyperdb.DEBUG, "DROP DATABASE %s"%config.MYSQL_DBNAME
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
38 cursor.execute("DROP DATABASE %s"%config.MYSQL_DBNAME)
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
39 conn.commit()
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
40 conn.close()
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
41
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
42 if os.path.exists(config.DATABASE):
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
43 shutil.rmtree(config.DATABASE)
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
44
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
45 def db_create(config):
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
46 """Create the database."""
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
47 conn = MySQLdb.connect(config.MYSQL_DBHOST, config.MYSQL_DBUSER,
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
48 config.MYSQL_DBPASSWORD)
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
49 cursor = conn.cursor()
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
50 if __debug__:
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
51 print >>hyperdb.DEBUG, "CREATE DATABASE %s"%config.MYSQL_DBNAME
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
52 cursor.execute("CREATE DATABASE %s"%config.MYSQL_DBNAME)
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
53 conn.commit()
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
54 conn.close()
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
55
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
56 def db_exists(config):
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
57 """Check if database already exists."""
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
58 conn = MySQLdb.connect(config.MYSQL_DBHOST, config.MYSQL_DBUSER,
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
59 config.MYSQL_DBPASSWORD)
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
60 # tables = None
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
61 try:
1922
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
62 try:
2074
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
63 conn.select_db(config.MYSQL_DBNAME)
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
64 # cursor = conn.cursor()
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
65 # cursor.execute("SHOW TABLES")
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
66 # tables = cursor.fetchall()
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
67 # if __debug__:
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
68 # print >>hyperdb.DEBUG, "tables %s"%(tables,)
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
69 except MySQLdb.OperationalError:
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
70 if __debug__:
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
71 print >>hyperdb.DEBUG, "no database '%s'"%config.MYSQL_DBNAME
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
72 return 0
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
73 finally:
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
74 conn.close()
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
75 if __debug__:
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
76 print >>hyperdb.DEBUG, "database '%s' exists"%config.MYSQL_DBNAME
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
77 return 1
1434
b953750bdc04 trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1433
diff changeset
78
1375
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
79 class Database(Database):
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
80 arg = '%s'
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
81
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
82 def open_connection(self):
2074
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
83 # make sure the database actually exists
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
84 if not db_exists(self.config):
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
85 db_create(self.config)
d5d5594c6fb4 fix mysql unit tests for recent MySQL releases
Richard Jones <richard@users.sourceforge.net>
parents: 1922
diff changeset
86
1375
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
87 db = getattr(self.config, 'MYSQL_DATABASE')
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
88 try:
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
89 self.conn = MySQLdb.connect(*db)
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
90 except MySQLdb.OperationalError, message:
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
91 raise DatabaseError, message
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
92
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
93 self.cursor = self.conn.cursor()
1415
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
94 # start transaction
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
95 self.sql("SET AUTOCOMMIT=0")
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
96 self.sql("BEGIN")
1375
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
97 try:
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
98 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
99 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
100 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
101 raise
1375
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
102 except MySQLdb.ProgrammingError, message:
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
103 if message[0] != ER.NO_SUCH_TABLE:
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
104 raise DatabaseError, message
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
105 self.database_schema = {}
1415
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
106 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
107 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
108
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
109 def __repr__(self):
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
110 return '<myroundsql 0x%x>'%id(self)
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
111
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
112 def sql_fetchone(self):
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
113 return self.cursor.fetchone()
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
114
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
115 def sql_fetchall(self):
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
116 return self.cursor.fetchall()
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
117
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
118 def save_dbschema(self, schema):
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
119 s = repr(self.database_schema)
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
120 self.sql('INSERT INTO schema VALUES (%s)', (s,))
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
121
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
122 def load_dbschema(self):
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
123 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
124 schema = self.cursor.fetchone()
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
125 if schema:
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
126 return eval(schema[0])
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
127 return None
1375
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
128
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
129 def save_journal(self, classname, cols, nodeid, journaldate,
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
130 journaltag, action, params):
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
131 params = repr(params)
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
132 entry = (nodeid, journaldate, journaltag, action, params)
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
133
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
134 a = self.arg
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
135 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
136 cols, a, a, a, a, a)
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
137 if __debug__:
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
138 print >>hyperdb.DEBUG, 'addjournal', (self, sql, entry)
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
139 self.cursor.execute(sql, entry)
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
140
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
141 def load_journal(self, classname, cols, nodeid):
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
142 sql = 'select %s from %s__journal where nodeid=%s'%(cols, classname,
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
143 self.arg)
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
144 if __debug__:
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
145 print >>hyperdb.DEBUG, 'getjournal', (self, sql, nodeid)
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
146 self.cursor.execute(sql, (nodeid,))
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
147 res = []
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
148 for nodeid, date_stamp, user, action, params in self.cursor.fetchall():
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
149 params = eval(params)
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
150 res.append((nodeid, date.Date(date_stamp), user, action, params))
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
151 return res
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
152
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
153 def create_class_table(self, spec):
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
154 cols, mls = self.determine_columns(spec.properties.items())
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
155 cols.append('id')
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
156 cols.append('__retired__')
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
157 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
158 sql = 'CREATE TABLE `_%s` (%s) TYPE=BDB'%(spec.classname, scols)
1375
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
159 if __debug__:
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
160 print >>hyperdb.DEBUG, 'create_class', (self, sql)
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
161 self.cursor.execute(sql)
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
162 return cols, mls
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
163
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
164 def create_journal_table(self, spec):
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
165 cols = ',' . join(['`%s` VARCHAR(255)'%x
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
166 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
167 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
168 if __debug__:
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
169 print >>hyperdb.DEBUG, 'create_class', (self, sql)
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
170 self.cursor.execute(sql)
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
171
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
172 def create_multilink_table(self, spec, ml):
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
173 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
174 nodeid VARCHAR(255)) TYPE=BDB'''%(spec.classname, ml)
1375
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
175 if __debug__:
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
176 print >>hyperdb.DEBUG, 'create_class', (self, sql)
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
177 self.cursor.execute(sql)
faf93d3fbf2f added mysql backend
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
178
1434
b953750bdc04 trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1433
diff changeset
179
1415
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
180 class MysqlClass:
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
181 def find(self, **propspec):
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
182 '''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
183
1415
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
184 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
185 method without using this keyword
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
186
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
187 '''
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
188 if __debug__:
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
189 print >>hyperdb.DEBUG, 'find', (self, propspec)
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
190
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
191 # shortcut
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
192 if not propspec:
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
193 return []
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
194
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
195 # validate the args
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
196 props = self.getprops()
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
197 propspec = propspec.items()
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
198 for propname, nodeids in propspec:
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
199 # check the prop is OK
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
200 prop = props[propname]
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
201 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
202 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
203
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
204 # first, links
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
205 l = []
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
206 where = []
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
207 allvalues = ()
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
208 a = self.db.arg
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
209 for prop, values in propspec:
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
210 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
211 continue
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
212 if type(values) is type(''):
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
213 allvalues += (values,)
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
214 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
215 elif values is None:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
216 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
217 else:
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
218 allvalues += tuple(values.keys())
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
219 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
220 tables = []
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
221 if where:
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
222 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
223 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
224
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
225 # now multilinks
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
226 for prop, values in propspec:
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
227 vals = ()
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
228 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
229 continue
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
230 if type(values) is type(''):
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
231 vals = (values,)
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
232 s = a
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
233 else:
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
234 vals = tuple(values.keys())
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
235 s = ','.join([a]*len(values))
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
236 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
237 self.classname, prop, s)
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
238 self.db.sql(query, vals)
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
239 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
240 if __debug__:
1434
b953750bdc04 trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1433
diff changeset
241 print >>hyperdb.DEBUG, 'find ... ', l
1415
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
242
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
243 # Remove duplicated ids
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
244 d = {}
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
245 for k in l:
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
246 d[k] = 1
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
247 return d.keys()
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
248
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
249 return l
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
250
1922
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
251 # 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
252 # 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
253 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
254 group=(None,None)):
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
255 ''' 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
256 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
257 sort spec
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
258
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
259 "filterspec" is {propname: value(s)}
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
260 "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
261 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
262 "search_matches" is {nodeid: marker}
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
263
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
264 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
265 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
266 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
267 '''
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
268 # 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
269 if search_matches == {}:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
270 return []
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
271
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
272 cn = self.classname
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
273
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
274 timezone = self.db.getUserTimezone()
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
275
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
276 # 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
277 props = self.getprops()
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
278 frum = ['_'+cn]
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
279 where = []
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
280 args = []
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
281 a = self.db.arg
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
282 for k, v in filterspec.items():
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
283 propclass = props[k]
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
284 # now do other where clause stuff
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
285 if isinstance(propclass, Multilink):
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
286 tn = '%s_%s'%(cn, k)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
287 if v in ('-1', ['-1']):
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
288 # 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
289 # corresponding multilink table)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
290
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
291 # "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
292 # 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
293 # sub-selects...
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
294 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
295 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
296
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
297 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
298 elif isinstance(v, type([])):
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
299 frum.append(tn)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
300 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
301 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
302 args = args + v
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
303 else:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
304 frum.append(tn)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
305 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
306 args.append(v)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
307 elif k == 'id':
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
308 if isinstance(v, type([])):
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
309 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
310 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
311 args = args + v
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
312 else:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
313 where.append('%s=%s'%(k, a))
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
314 args.append(v)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
315 elif isinstance(propclass, String):
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
316 if not isinstance(v, type([])):
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
317 v = [v]
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
318
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
319 # 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
320 # 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
321 # 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
322 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
323
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
324 # now add to the where clause
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
325 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
326 # 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
327 elif isinstance(propclass, Link):
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
328 if isinstance(v, type([])):
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
329 if '-1' in v:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
330 v = v[:]
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
331 v.remove('-1')
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
332 xtra = ' or _%s is NULL'%k
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
333 else:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
334 xtra = ''
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
335 if v:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
336 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
337 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
338 args = args + v
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
339 else:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
340 where.append('_%s is NULL'%k)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
341 else:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
342 if v == '-1':
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
343 v = None
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
344 where.append('_%s is NULL'%k)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
345 else:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
346 where.append('_%s=%s'%(k, a))
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
347 args.append(v)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
348 elif isinstance(propclass, Date):
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
349 if isinstance(v, type([])):
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
350 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
351 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
352 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
353 else:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
354 try:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
355 # 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
356 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
357 if (date_rng.from_value):
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
358 where.append('_%s >= %s'%(k, a))
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
359 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
360 if (date_rng.to_value):
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(date_rng.to_value.serialise())
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
363 except ValueError:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
364 # 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
365 pass
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
366 elif isinstance(propclass, Interval):
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
367 if isinstance(v, type([])):
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
368 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
369 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
370 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
371 else:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
372 try:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
373 # 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
374 date_rng = Range(v, date.Interval)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
375 if (date_rng.from_value):
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
376 where.append('_%s >= %s'%(k, a))
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
377 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
378 if (date_rng.to_value):
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
379 where.append('_%s <= %s'%(k, a))
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
380 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
381 except ValueError:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
382 # 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
383 pass
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
384 #where.append('_%s=%s'%(k, a))
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
385 #args.append(date.Interval(v).serialise())
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
386 else:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
387 if isinstance(v, type([])):
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
388 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
389 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
390 args = args + v
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
391 else:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
392 where.append('_%s=%s'%(k, a))
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
393 args.append(v)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
394
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
395 # don't match retired nodes
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
396 where.append('__retired__ <> 1')
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
397
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
398 # add results of full text search
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
399 if search_matches is not None:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
400 v = search_matches.keys()
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
401 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
402 where.append('id in (%s)'%s)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
403 args = args + v
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
404
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
405 # "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
406 # can modify it...)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
407 orderby = []
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
408 ordercols = []
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
409 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
410 if group[0] != '-':
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
411 orderby.append('_'+group[1])
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
412 ordercols.append('_'+group[1])
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
413 else:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
414 orderby.append('_'+group[1]+' desc')
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
415 ordercols.append('_'+group[1])
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
416
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
417 # now add in the sorting
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
418 group = ''
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
419 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
420 direction, colname = sort
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
421 if direction != '-':
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
422 if colname == 'id':
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
423 orderby.append(colname)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
424 else:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
425 orderby.append('_'+colname)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
426 ordercols.append('_'+colname)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
427 else:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
428 if colname == 'id':
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
429 orderby.append(colname+' desc')
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
430 ordercols.append(colname)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
431 else:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
432 orderby.append('_'+colname+' desc')
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
433 ordercols.append('_'+colname)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
434
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
435 # construct the SQL
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
436 frum = ','.join(frum)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
437 if where:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
438 where = ' where ' + (' and '.join(where))
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
439 else:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
440 where = ''
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
441 cols = ['id']
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
442 if orderby:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
443 cols = cols + ordercols
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
444 order = ' order by %s'%(','.join(orderby))
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
445 else:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
446 order = ''
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
447 cols = ','.join(cols)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
448 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
449 args = tuple(args)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
450 if __debug__:
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
451 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
452 self.db.cursor.execute(sql, args)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
453 l = self.db.cursor.fetchall()
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
454
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
455 # return the IDs (the first column)
84b6d5b07626 testing fixes for mysql, backported from HEAD
Richard Jones <richard@users.sourceforge.net>
parents: 1434
diff changeset
456 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
457
1415
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
458 class Class(MysqlClass, rdbms_common.Class):
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
459 pass
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
460 class IssueClass(MysqlClass, rdbms_common.IssueClass):
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
461 pass
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
462 class FileClass(MysqlClass, rdbms_common.FileClass):
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
463 pass
6883852e9b15 mysql backend passes all tests (at last!)
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1375
diff changeset
464
1434
b953750bdc04 trackers on mysql can be initialised
Andrey Lebedev <kedder@users.sourceforge.net>
parents: 1433
diff changeset
465 #vim: set et
Roundup Issue Tracker: http://roundup-tracker.org/