merge from maint-0-7

Author: Richard Jones

CHANGES.txt

@@ -145,7 +145,7 @@ Fixed:
 - relaxed URL designator syntax to allow issue[0]*1 (sf bug 1054523)
 
 
-2004-??-?? 0.7.12
+2005-05-02 0.7.12
 Fixed:
 - handle capitalisation of class names in text hyperlinking (sf bug
   1101043)
@@ -157,6 +157,7 @@ Fixed:
 - hack to fix some anydbm export problems (sf bug 1081454)
 - ignore AutoReply messages (sf patch 1085051)
 - fix ZRoundup syntax error (sf bug 1122335)
+- fix RDBMS clear() so it resets all class itemid counters
 
 
 2005-01-06 0.7.11

roundup/backends/back_mysql.py

@@ -465,6 +465,13 @@ def setid(self, classname, setid):
         vals = (int(setid)+1, classname)
         self.sql(sql, vals)
 
+    def clear(self):
+        rdbms_common.Database.clear(self)
+
+        # set the id counters to 0 (setid adds one) so we start at 1
+        for cn in self.classes.keys():
+            self.setid(cn, 0)
+
     def create_class(self, spec):
         rdbms_common.Database.create_class(self, spec)
         sql = 'insert into ids (name, num) values (%s, %s)'

roundup/backends/back_postgresql.py

@@ -211,6 +211,15 @@ def setid(self, classname, setid):
         sql = "select setval('_%s_ids', %s) from dual"%(classname, int(setid))
         self.sql(sql)
 
+    def clear(self):
+        rdbms_common.Database.clear(self)
+
+        # reset the sequences
+        for cn in self.classes.keys():
+            self.sql('DROP SEQUENCE _%s_ids'%cn)
+            self.sql('CREATE SEQUENCE _%s_ids'%cn)
+
+
 
 class Class(rdbms_common.Class):
     pass

roundup/backends/back_sqlite.py

@@ -1,4 +1,4 @@
-# $Id: back_sqlite.py,v 1.36.2.4 2005-02-14 04:37:37 richard Exp $
+# $Id: back_sqlite.py,v 1.36.2.5 2005-05-02 05:47:53 richard Exp $
 '''Implements a backend for SQLite.
 
 See https://pysqlite.sourceforge.net/ for pysqlite info
@@ -325,12 +325,19 @@ def newid(self, classname):
     def setid(self, classname, setid):
         ''' Set the id counter: used during import of database
 
-        We add one to make it behave like the seqeunces in postgres.
+        We add one to make it behave like the sequences in postgres.
         '''
         sql = 'update ids set num=%s where name=%s'%(self.arg, self.arg)
         vals = (int(setid)+1, classname)
         self.sql(sql, vals)
 
+    def clear(self):
+        rdbms_common.Database.clear(self)
+
+        # set the id counters to 0 (setid adds one) so we start at 1
+        for cn in self.classes.keys():
+            self.setid(cn, 0)
+
     def create_class(self, spec):
         rdbms_common.Database.create_class(self, spec)
         sql = 'insert into ids (name, num) values (%s, %s)'

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.142.2.7 2005-03-03 22:12:36 richard Exp $
+# $Id: rdbms_common.py,v 1.142.2.8 2005-05-02 05:47:53 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -673,7 +673,6 @@ def clear(self):
         for cn in self.classes.keys():
             sql = 'delete from _%s'%cn
             self.sql(sql)
-        self.setid(cn, 1)
 
     #
     # Nodes