merge from maint-0-7

Author: Richard Jones

roundup/backends/back_mysql.py

@@ -1,4 +1,4 @@
-#$Id: back_mysql.py,v 1.57 2005-02-28 03:32:45 richard Exp $
+#$Id: back_mysql.py,v 1.58 2005-05-02 05:48:59 richard Exp $
 #
 # Copyright (c) 2003 Martynas Sklyzmantas, Andrey Lebedev <[email protected]>
 #
@@ -466,6 +466,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

@@ -1,4 +1,4 @@
-#$Id: back_postgresql.py,v 1.29 2005-02-14 02:48:11 richard Exp $
+#$Id: back_postgresql.py,v 1.30 2005-05-02 05:48:59 richard Exp $
 #
 # Copyright (c) 2003 Martynas Sklyzmantas, Andrey Lebedev <[email protected]>
 #
@@ -212,6 +212,14 @@ 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.cursor.execute('DROP SEQUENCE _%s_ids'%cn)
+            self.cursor.execute('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.41 2005-05-02 01:05:15 richard Exp $
+# $Id: back_sqlite.py,v 1.42 2005-05-02 05:48:59 richard Exp $
 '''Implements a backend for SQLite.
 
 See https://pysqlite.sourceforge.net/ for pysqlite info
@@ -332,8 +332,8 @@ def setid(self, classname, setid):
         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)
+        # set the id counters to 0 (setid adds one) so we start at 1
         for cn in self.classes.keys():
             self.setid(cn, 0)
 

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.153 2005-05-02 01:05:15 richard Exp $
+# $Id: rdbms_common.py,v 1.154 2005-05-02 05:48:59 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -683,7 +683,6 @@ def clear(self):
         for cn in self.classes.keys():
             sql = 'delete from _%s'%cn
             self.sql(sql)
-            self.setid(cn, 1)
 
     #
     # Nodes