Fixed issue with gadfly and exact column matching when table schemas are

updated.

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1577 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/roundup/backends/back_gadfly.py b/roundup/backends/back_gadfly.py
index f4661dbe58f434c3558d28c3d52929320da10618..31bbfa508197860c43357a712e33304cd3b75af7 100644 (file)
--- a/roundup/backends/back_gadfly.py
+++ b/roundup/backends/back_gadfly.py
@@ -1,4 +1,4 @@
-# $Id: back_gadfly.py,v 1.32 2003-01-12 23:53:20 richard Exp $
+# $Id: back_gadfly.py,v 1.33 2003-03-09 21:37:37 richard Exp $
 ''' Gadlfy relational database hypderb backend.
 
 About Gadfly
@@ -144,6 +144,95 @@ class Database(rdbms_common.Database):
             res.append((nodeid, date.Date(date_stamp), user, action, params))
         return res
 
+    def update_class(self, spec, old_spec):
+        ''' Determine the differences between the current spec and the
+            database version of the spec, and update where necessary
+
+            GADFLY requires a commit after the table drop!
+        '''
+        new_spec = spec
+        new_has = new_spec.properties.has_key
+
+        new_spec = new_spec.schema()
+        if new_spec == old_spec:
+            # no changes
+            return 0
+
+        if __debug__:
+            print >>hyperdb.DEBUG, 'update_class FIRING'
+
+        # key property changed?
+        if old_spec[0] != new_spec[0]:
+            if __debug__:
+                print >>hyperdb.DEBUG, 'update_class setting keyprop', `spec[0]`
+            # XXX turn on indexing for the key property
+
+        # detect multilinks that have been removed, and drop their table
+        old_has = {}
+        for name,prop in old_spec[1]:
+            old_has[name] = 1
+            if not new_has(name) and isinstance(prop, Multilink):
+                # it's a multilink, and it's been removed - drop the old
+                # table
+                sql = 'drop table %s_%s'%(spec.classname, prop)
+                if __debug__:
+                    print >>hyperdb.DEBUG, 'update_class', (self, sql)
+                self.cursor.execute(sql)
+                continue
+        old_has = old_has.has_key
+
+        # now figure how we populate the new table
+        fetch = ['_activity', '_creation', '_creator']
+        properties = spec.getprops()
+        for propname,x in new_spec[1]:
+            prop = properties[propname]
+            if isinstance(prop, Multilink):
+                if not old_has(propname):
+                    # we need to create the new table
+                    self.create_multilink_table(spec, propname)
+            elif old_has(propname):
+                # we copy this col over from the old table
+                fetch.append('_'+propname)
+
+        # select the data out of the old table
+        fetch.append('id')
+        fetch.append('__retired__')
+        fetchcols = ','.join(fetch)
+        cn = spec.classname
+        sql = 'select %s from _%s'%(fetchcols, cn)
+        if __debug__:
+            print >>hyperdb.DEBUG, 'update_class', (self, sql)
+        self.cursor.execute(sql)
+        olddata = self.cursor.fetchall()
+
+        # drop the old table
+        self.cursor.execute('drop table _%s'%cn)
+
+        # GADFLY requires a commit here, or the table spec screws up
+        self.conn.commit()
+
+        # create the new table
+        cols, mls = self.create_class_table(spec)
+
+        # figure the new columns
+        extra = 0
+        for col in cols:
+            if col not in fetch:
+                fetch.append(col)
+                extra += 1
+
+        if olddata:
+            # do the insert
+            fetchcols = ','.join(fetch)
+            args = ','.join([self.arg for x in fetch])
+            sql = 'insert into _%s (%s) values (%s)'%(cn, fetchcols, args)
+            if __debug__:
+                print >>hyperdb.DEBUG, 'update_class', (self, sql, olddata[0])
+            for entry in olddata:
+                self.cursor.execute(sql, tuple(entry) + (None,)*extra)
+
+        return 1
+
 class GadflyClass:
     def filter(self, search_matches, filterspec, sort=(None,None),
             group=(None,None)):

diff --git a/roundup/backends/rdbms_common.py b/roundup/backends/rdbms_common.py
index ce6455c02838bed48e505207fcffa315fc49817c..3a9f37d4a81fd78a0492bfb2d7486ed08b14c709 100644 (file)
--- a/roundup/backends/rdbms_common.py
+++ b/roundup/backends/rdbms_common.py
@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.41 2003-03-08 20:41:45 kedder Exp $
+# $Id: rdbms_common.py,v 1.42 2003-03-09 21:37:38 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -215,7 +215,7 @@ class Database(FileStorage, hyperdb.Database, roundupdb.Database):
         old_has = old_has.has_key
 
         # now figure how we populate the new table
-        fetch = []      # fetch these from the old table
+        fetch = ['_activity', '_creation', '_creator']
         properties = spec.getprops()
         for propname,x in new_spec[1]:
             prop = properties[propname]
@@ -251,7 +251,7 @@ class Database(FileStorage, hyperdb.Database, roundupdb.Database):
             if __debug__:
                 print >>hyperdb.DEBUG, 'update_class', (self, sql, olddata[0])
             for entry in olddata:
-                self.cursor.execute(sql, *entry)
+                self.cursor.execute(sql, tuple(entry))
 
         return 1