Changeset 3

Timestamp:

02/12/07 02:43:10

Author:

fumanchu

Message:

More implementations of _grab_new_ids.

Files:

• trunk/geniusql/providers/mysql.py (modified) (1 diff)
• trunk/geniusql/providers/psycopg.py (modified) (1 diff)
• trunk/geniusql/providers/pypgsql.py (modified) (2 diffs)
• trunk/geniusql/providers/sqlite.py (modified) (1 diff)

trunk/geniusql/providers/mysql.py

@@ -465 +465 @@
-        return res.fetch_row(0, 0), res.describe()
-    
+    def _grab_new_ids(self, table, idkeys, conn):
+        return {idkeys[0]: conn.insert_id()}
+    
-    def create_database(self):
-        self.lock("Creating database. Transactions not allowed.")

trunk/geniusql/providers/psycopg.py

@@ -417 +417 @@
-        return data, coldefs
-    
+    def _grab_new_ids(self, table, idkeys, conn):
+        newids = {}
+        for idkey in idkeys:
+            col = table[idkey]
+            seq = col.sequence_name
+            data, _ = self.fetch("SELECT last_value FROM %s;" % seq, conn)
+            newids[idkey] = data[0][0]
+        return newids
+    
-    def create_database(self):
-        self.lock("Creating database. Transactions not allowed.")

trunk/geniusql/providers/pypgsql.py

@@ -383 +383 @@
-        return data, columns
-    
+    def _grab_new_ids(self, table, idkeys, conn):
+        """Insert a row using the table's SERIAL field."""
+        newids = {}
+        for idkey in idkeys:
+            col = table[idkey]
+            seq = col.sequence_name
+            data, _ = self.fetch("SELECT last_value FROM %s;" % seq, conn)
+            newids[idkey] = data[0][0]
+        return newids
+    
-    def create_database(self):
-        self.lock("Creating database. Transactions not allowed.")
@@ -415 +425 @@
-        c.finish()
-        return v
-
-
-
-
-
-
-
-
-
-
-
+

trunk/geniusql/providers/sqlite.py

@@ -612 +612 @@
-                         % column.sequence_name)
-            column.sequence_name = None
+    
+    def _grab_new_ids(self, table, idkeys, conn):
+        if _lastrowid_support:
+            new_id = conn.lastrowid
+        else:
+            new_id = conn.sqlite_last_insert_rowid()
+        return {idkeys[0]: new_id}
-    
-    def col_def(self, column):