Changeset 30

Timestamp:

03/12/07 17:39:50

Author:

fumanchu

Message:

Changed add_primary to set_primary; it now drops first (since MySQL cannot drop and add in separate statements).

Files:

• trunk/geniusql/objects.py (modified) (2 diffs)
• trunk/geniusql/providers/mysql.py (modified) (1 diff)
• trunk/geniusql/providers/sqlite.py (modified) (1 diff)
• trunk/geniusql/test/zoo_fixture.py (modified) (1 diff)

trunk/geniusql/objects.py

@@ -296 +296 @@
-        return i
-    
-
-
+
+
+
+
+
+
+
-        pk = [column.qname for column in self.itervalues() if column.key]
-        if pk:
@@ -549 +554 @@
-    def discover(self, tablename, conn=None):
-        """Attach a new Table from the underlying DB to self (and return it).
+        
+        tablename: the database's name for the table. This may be different
+        from the schema's key for the table.
-        
-        Table objects (and their Column and Index subobjects) will be

trunk/geniusql/providers/mysql.py

@@ -185 +185 @@
-        """Remove any PRIMARY KEY for this Table."""
-        self.schema.db.execute('ALTER TABLE %s DROP PRIMARY KEY;' % self.qname)
+    
+    def set_primary(self):
+        """Set the PRIMARY KEY for this Table."""
+        pk = [column.qname for column in self.itervalues() if column.key]
+        if pk:
+            # For MySQL, we MUST do this in a single statement.
+            self.schema.db.execute("ALTER TABLE %s DROP PRIMARY KEY, "
+                                   "ADD PRIMARY KEY (%s);" %
+                                   (self.qname, ", ".join(pk)))
+        else:
+            self.drop_primary()
-
-

trunk/geniusql/providers/sqlite.py

@@ -423 +423 @@
-        return {idkeys[0]: new_id}
-    
-add
+set
-        """Assert the PRIMARY KEY for this Table, using its Column.key values."""
-
-
-
-
+
+
-    
-    def drop_primary(self):
-        """Remove any PRIMARY KEY for this Table."""
+        pk_cols = [col for col in self.itervalues() if col.key]
-        self._start_temp()
-self.itervalues()
+pk_cols
-            col.key = False
-        self._finish_temp()
+        for col in pk_cols:
+            col.key = True
-
-

trunk/geniusql/test/zoo_fixture.py

@@ -607 +607 @@
-        # Drop and re-add the PK on, oh, how about the Animal table?
-        Animal = schema['Animal']
-
-
-
-
+
+
+
-        if schema.db.pks_must_be_indexed:
-            self.assertEqual(len(Animal.indices), 2)