Changeset 4426

Timestamp:

04/04/09 15:33:31 (4 years ago)

Author:

gpolo

Message:

Full column merging is supported now.

Location:

branch/merger

Files:

• sqlitedb.py (modified) (5 diffs)
• tests/test_sqlitemerge.py (modified) (1 diff)

branch/merger/sqlitedb.py

@@ -24 +24 @@
 # XXX Missing:
 #   Index merging (read copying)
-#   Proper foreign key merging
+
 VALID_NAME_PATTERN = (
         """
@@ -135 +135 @@
         self._fromcursor = None
         self._tocursor = None
-        self._reference = None # updated when merging tables
 
         self._merge()
@@ -219 +218 @@
                     "not happen.")
             return
-
-        res = new_cursor.execute("pragma foreign_key_list(%s)" % tablename)
-        self._reference = {}
-        for ref in res.fetchall():
-            self._reference[ref['from']] = (ref['table'], ref['to'])
 
         res = old_cursor.execute("pragma table_info(%s)" % tablename)
@@ -252 +246 @@
         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'])
         for cname, cinfo in new_by_col.iteritems():
             if cinfo['pk']:
@@ -265 +264 @@
                 continue
 
-            self._merge_column(tablename, cname, cinfo)
+            self._merge_column(tablename, cname, coldef[cname])
 
 
     def _merge_column(self, tablename, cname, cinfo):
-        reference = self._reference or {}
-
-        cursor = self._tocursor
-        query = "ALTER TABLE %s ADD COLUMN %s %s" % (
-                tablename, cname, cinfo['type'])
-
-        if cinfo['notnull']:
-            query += " NOT NULL"
-        if cinfo['dflt_value']:
-            query += " DEFAULT %s" % cinfo['dflt_value']
-        if cname in reference:
-            query += " REFERENCES %s(%s)" % reference[cname]
-
-        cursor.execute(query)
+        query = "ALTER TABLE %s ADD COLUMN %s %s" % (tablename, cname, cinfo)
+        self._tocursor.execute(query)
 
 

branch/merger/tests/test_sqlitemerge.py

@@ -106 +106 @@
                 "b INTEGER")
 
-        # XXX not fully supported yet
         self._verify_merge(
                 "a INTEGER, b INTEGER CONSTRAINT fk REFERENCES d(id)",