Changeset 4406

Timestamp:

03/28/09 22:38:19 (4 years ago)

Author:

gpolo

Message:

Added merging of columns that do not reference other columns.

Files:

• branch/merger/sqlitedb.py (modified) (2 diffs)

branch/merger/sqlitedb.py

@@ -77 +77 @@
             res = old_cursor.execute("pragma table_info(%s)" % name)
             old_table_info = res.fetchall()
+            old_by_col = {}
+            for col in old_table_info:
+                colname = col.pop('name')
+                old_by_col[colname] = col
 
-            for col_info in old_table_info:
-                name = col_info.pop('name')
-
-                if name not in new_by_col:
+            for cname, cinfo in old_by_col.iteritems():
+                if cname not in new_by_col:
                     # sqlite can't handle deletion of columns, this merge
                     # can't be done.
@@ -87 +89 @@
                             "contains a column named '%s' which no longer "
                             "exists in the new table, sqlite can't handle "
-                            "this." % (name, col_info['name']))
-                elif col_info != new_by_col[name]:
+                            "this." % (name, cname))
+                elif cinfo != new_by_col[cname]:
                     # sqlite also can't handle changes in column type and
                     # others
                     raise Exception("The table '%s' in the old database "
                             "differs in the column named '%s'. (%r != %r)" % (
-                                col_info, new_by_col[name]))
+                                name, cname, cinfo, new_by_col[cname]))
 
-                del new_by_col[name]
+                del new_by_col[cname]
 
             # Attempt to create new columns
-            print
+            # XXX not checking if they reference other columns yet.
             for cname, cinfo in new_by_col.iteritems():
-                print cname, cinfo, "<<<"
-                # XXX ToDo
+                if cinfo['pk']:
+                    # sqlite doesn't allow creating new columns as primary key
+                    raise Exception("The table '%s' in the new database "
+                            "has a new column named '%s' which is a primary "
+                            "key, but sqlite can't handle this." % (
+                                name, cname))
+
+                query = "ALTER TABLE %s ADD COLUMN %s %s" % (
+                        name, cname, cinfo['type'])
+                if cinfo['notnull']:
+                    query += " NOT NULL"
+                if cinfo['dflt_value']:
+                    query += " DEFAULT %s" % cinfo['dflt_value']
+                old_cursor.execute(query)
 
             # XXX check for triggers here