merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -13,6 +13,8 @@ Fixed:
 - mailgw can override the MAIL_DEFAULT_CLASS
 - handle Py2.3+ datetime objects as Date specs (sf bug 971300)
 - use row locking in MySQL newid() (sf bug 1034211)
+- add sanity check for sort and group on same property (sf bug 1033477)
+- extend OTK and session table value cols to TEXT (sf bug 1031271)
 
 
 2004-07-21 0.7.6

roundup/backends/back_mysql.py

@@ -170,14 +170,14 @@ def open_connection(self):
     def create_version_2_tables(self):
         # OTK store
         self.cursor.execute('''CREATE TABLE otks (otk_key VARCHAR(255),
-            otk_value VARCHAR(255), otk_time FLOAT(20))
+            otk_value TEXT, otk_time FLOAT(20))
             TYPE=%s'''%self.mysql_backend)
         self.cursor.execute('CREATE INDEX otks_key_idx ON otks(otk_key)')
 
         # Sessions store
         self.cursor.execute('''CREATE TABLE sessions (
             session_key VARCHAR(255), session_time FLOAT(20),
-            session_value VARCHAR(255)) TYPE=%s'''%self.mysql_backend)
+            session_value TEXT) TYPE=%s'''%self.mysql_backend)
         self.cursor.execute('''CREATE INDEX sessions_key_idx ON
             sessions(session_key)''')
 
@@ -688,6 +688,10 @@ def filter(self, search_matches, filterspec, sort=(None,None),
             where.append('_%s.id in (%s)'%(cn, s))
             args = args + v
 
+        # sanity check: sorting *and* grouping on the same property?
+        if group[1] == sort[1]:
+            sort = (None, None)
+
         # "grouping" is just the first-order sorting in the SQL fetch
         orderby = []
         ordercols = []

roundup/backends/back_postgresql.py

@@ -122,13 +122,13 @@ def open_connection(self):
     def create_version_2_tables(self):
         # OTK store
         self.cursor.execute('''CREATE TABLE otks (otk_key VARCHAR(255),
-            otk_value VARCHAR(255), otk_time REAL)''')
+            otk_value TEXT, otk_time REAL)''')
         self.cursor.execute('CREATE INDEX otks_key_idx ON otks(otk_key)')
 
         # Sessions store
         self.cursor.execute('''CREATE TABLE sessions (
             session_key VARCHAR(255), session_time REAL,
-            session_value VARCHAR(255))''')
+            session_value TEXT)''')
         self.cursor.execute('''CREATE INDEX sessions_key_idx ON
             sessions(session_key)''')
 

roundup/backends/back_sqlite.py

@@ -1,4 +1,4 @@
-# $Id: back_sqlite.py,v 1.27.2.1 2004-05-10 00:15:59 richard Exp $
+# $Id: back_sqlite.py,v 1.27.2.2 2004-10-07 06:33:57 richard Exp $
 '''Implements a backend for SQLite.
 
 See https://pysqlite.sourceforge.net/ for pysqlite info
@@ -106,6 +106,10 @@ def add_new_columns_v2(self):
                 # we've updated - don't try again
                 tables[classname] = spec.schema()
 
+    def fix_version_3_tables(self):
+        # NOOP - no restriction on column length here
+        pass
+
     def update_class(self, spec, old_spec, force=0, adding_v2=0):
         ''' Determine the differences between the current spec and the
             database version of the spec, and update where necessary.

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.98.2.19 2004-07-20 23:27:02 richard Exp $
+# $Id: rdbms_common.py,v 1.98.2.20 2004-10-07 06:33:57 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -196,7 +196,7 @@ def post_init(self):
 
     # update this number when we need to make changes to the SQL structure
     # of the backen database
-    current_db_version = 3
+    current_db_version = 4
     def upgrade_db(self):
         ''' Update the SQL database to reflect changes in the backend code.
 
@@ -222,9 +222,18 @@ def upgrade_db(self):
         if version < 3:
             self.fix_version_2_tables()
 
+        if version < 4:
+            self.fix_version_3_tables()
+
         self.database_schema['version'] = self.current_db_version
         return 1
 
+    def fix_version_3_tables(self):
+        # drop the shorter VARCHAR OTK column and add a new TEXT one
+        for name in ('otk', 'session'):
+            self.sql('ALTER TABLE %ss DROP %s_value'%(name, name))
+            self.sql('ALTER TABLE %ss ADD %s_value TEXT'%(name, name))
+
     def fix_version_2_tables(self):
         '''Default (used by sqlite): NOOP'''
         pass
@@ -2211,6 +2220,10 @@ def filter(self, search_matches, filterspec, sort=(None,None),
             where.append('_%s.id in (%s)'%(cn, s))
             args = args + v
 
+        # sanity check: sorting *and* grouping on the same property?
+        if group[1] == sort[1]:
+            sort = (None, None)
+
         # "grouping" is just the first-order sorting in the SQL fetch
         orderby = []
         ordercols = []