Changeset 360

Timestamp:

12/18/06 06:21:04

Author:

fumanchu

Message:

MUCH work done on the firebird store. Now passes all tests but threading, transactions, and precision (and autosource, but only because FB has no bool type).

Files:

• trunk/storage/storefirebird.py (modified) (6 diffs)

trunk/storage/storefirebird.py

@@ -3 +3 @@
-
-import dejavu
+from dejavu import logic
-from dejavu.storage import db
-
@@ -11 +12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    """Return the SQL typename of a DB column."""
-    
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        if 1 <= bytes <= 32765:
-            return "VARCHAR(%s)" % bytes
-        return "BLOB"
-    
-ls, key
+ol
-        return "INTEGER"
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    sql_name_max_length = 63
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    def _get_conn(self):
@@ -74 +299 @@
-                conn = self.connection()
-            if isinstance(query, unicode):
-toAdapter
+adaptertosql
-            self.log(query)
-            cur = conn.cursor()
-            cur.execute(query)
-            conn.commit()
-##            conn.close()
-        except Exception, x:
-            x.args += (query,)
@@ -87 +311 @@
-    
-    def fetch(self, query, conn=None):
-
-
-
-
-
-
+
+
+
+
+
-        """
-        try:
@@ -98 +321 @@
-                conn = self.connection()
-            if isinstance(query, unicode):
-toAdapter
+adaptertosql
-            self.log(query)
-            cur = conn.cursor()
-            cur.execute(query)
+            
-            data = cur.fetchall()
-            desc = cur.description
@@ -112 +336 @@
-        return data, desc
-    
+    #                               Schemas                               #
+    
+    def create_database(self):
+        self.lock("Creating database. Transactions not allowed.")
+        try:
+            # Firebird DB 'names' are actually filesystem paths.
+            sql = ("CREATE DATABASE %s USER '%s' PASSWORD '%s';"
+                   % (self.qname, self.user, self.password))
+            
+            # Use the kinterbasdb helper methods for cleaner create and drop.
+            # We also use dialect 3 *always* to help with quoted identifiers.
+            conn = kinterbasdb.create_database(sql, 3)
+            conn.close()
+            
+            self.clear()
+        finally:
+            self.unlock()
+    
+    def drop_database(self):
+        self.lock("Dropping database. Transactions not allowed.")
+        try:
+            # Must shut down all connections to avoid
+            # "being accessed by other users" error.
+            self.connection.shutdown()
+            
+            if os.path.exists(self.qname):
+                c = self._get_conn()
+                c.drop_database()
+            
+            self.clear()
+        finally:
+            self.unlock()
+    
+    #                            Transactions                             #
+    
+    def start(self):
+        """Start a transaction. Not needed if self.implicit_trans is True."""
+        conn = self.get_transaction(new=True)
+        conn.begin()
+    
+    def rollback(self):
+        """Roll back the current transaction, if any."""
+        key = self.transaction_key()
+        try:
+            conn = self.transactions.pop(key)
+        except KeyError:
+            pass
+        else:
+            conn.rollback()
+    
+    def commit(self):
+        """Commit the current transaction, if any."""
+        key = self.transaction_key()
+        try:
+            conn = self.transactions.pop(key)
+        except KeyError:
+            pass
+        else:
+            conn.commit()
+
+
+
+class FirebirdJoinWrapper(db.UnitClassWrapper):
+    """Unit class wrapper, for use in parsing multiselect joins."""
+    
+    def _joinname(self):
+        if self.alias:
+            # Firebird doesn't use the "AS" keyword
+            return "%s %s" % (self.table.qname, self.alias)
+        else:
+            return self.table.qname
+    joinname = property(_joinname, doc=("Quoted table name for use in "
+                                        "JOIN clause (read-only)."))
+
+
+class StorageManagerFirebird(db.StorageManagerDB):
+    """StoreManager to save and retrieve Units via Firebird 1.5."""
+    
+    databaseclass = FirebirdDatabase
+    joinwrapper = FirebirdJoinWrapper
+    
+    def __init__(self, arena, allOptions={}):
+        # DSN = "host:database"
+        self.host, self.dbname = allOptions['DSN'].split(":", 1)
+        allOptions['name'] = self.dbname
+        db.StorageManagerDB.__init__(self, arena, allOptions)
+    
-    def version(self):
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+