merge from maint-0-7

Author: Richard Jones

CHANGES.txt

@@ -151,7 +151,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)
@@ -163,6 +163,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_sqlite.py

@@ -1,4 +1,4 @@
-# $Id: back_sqlite.py,v 1.40 2005-02-14 04:37:24 richard Exp $
+# $Id: back_sqlite.py,v 1.41 2005-05-02 01:05:15 richard Exp $
 '''Implements a backend for SQLite.
 
 See https://pysqlite.sourceforge.net/ for pysqlite info
@@ -325,12 +325,18 @@ 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):
+        # set the id counters to 0 (setid adds one) so we start at 1
+        rdbms_common.Database.clear(self)
+        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.152 2005-04-28 00:21:42 richard Exp $
+# $Id: rdbms_common.py,v 1.153 2005-05-02 01:05:15 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -683,7 +683,7 @@ def clear(self):
         for cn in self.classes.keys():
             sql = 'delete from _%s'%cn
             self.sql(sql)
-        self.setid(cn, 1)
+            self.setid(cn, 1)
 
     #
     # Nodes