Changeset 4432

Timestamp:

04/04/09 22:33:49 (4 years ago)

Author:

gpolo

Message:

coldef is only needed if there are columns to be merged.

Files:

• trunk/umit/merger/sqlitedb.py (modified) (1 diff)

trunk/umit/merger/sqlitedb.py

@@ -258 +258 @@
 
         # Attempt to create new columns
+        coldef = {}
         if new_by_col:
             print "Adding new columns in table '%s'" % tablename
-        # Get the full column definitions for this table
-        res = self._fromcursor.execute(
-                "SELECT sql FROM sqlite_master "
-                "WHERE type='table' and name=?", (tablename, )).fetchone()
-        coldef = column_definitions(res['sql'])
+            # Get the full column definitions for this table
+            res = self._fromcursor.execute(
+                    "SELECT sql FROM sqlite_master "
+                    "WHERE type='table' and name=?", (tablename, )).fetchone()
+            coldef.update(column_definitions(res['sql']))
         for cname, cinfo in new_by_col.iteritems():
             if cinfo['pk']: