Changeset 189

Timestamp:

03/09/06 08:48:26

Author:

fumanchu

Message:

Ugly first crack at database introspection. I don't like the API yet, but the functionality is getting there.

Files:

• trunk/storage/db.py (modified) (2 diffs)
• trunk/storage/storeado.py (modified) (4 diffs)
• trunk/storage/storemysql.py (modified) (4 diffs)
• trunk/storage/storepypgsql.py (modified) (2 diffs)
• trunk/storage/storesqlite.py (modified) (1 diff)
• trunk/test/zoo_fixture.py (modified) (1 diff)

trunk/storage/db.py

@@ -1431 +1431 @@
-        if self.has_property(cls, name):
-            clsname = cls.__name__
-
-
-
+
+
-            self.execute("ALTER TABLE %s DROP COLUMN %s;" %
-                         (self.table_name(clsname),
@@ -1445 +1444 @@
-            self.execute("ALTER TABLE %s RENAME COLUMN %s TO %s;" %
-                         (self.table_name(clsname), oldname, newname))
+    
+    def has_index(self, cls, name):
+        return name in [i.name for i in self.get_indices(cls.__name__)]
+    
+    def drop_index(self, cls, name):
+        clsname = cls.__name__
+        self.execute('DROP INDEX %s ON %s;' %
+                     (self.sql_name("i" + clsname + name),
+                      self.table_name(clsname)))
+
+
+class Table:
+    """A table in a database."""
+    
+    def __init__(self, name):
+        self.name = name
+        self.columns = []
+    
+    def __repr__(self):
+        return "dejavu.db.Table(%s)" % repr(self.name)
+
+
+class Column:
+    """A column in a table in a database."""
+    
+    def __init__(self, key, type, default=None):
+        self.key = key
+        self.type = type
+        self.default = default
+        self.hints = {}
+    
+    def __repr__(self):
+        return ("dejavu.db.Column(%s, %s, default=%s, hints=%s)" %
+                (repr(self.key), repr(self.type),
+                 repr(self.default), repr(self.hints))
+                )
+
+
+class Index:
+    """An index on a table column (or columns) in a database."""
+    
+    def __init__(self, name, tablename, colname, pk=True, unique=True):
+        self.name = name
+        self.tablename = tablename
+        self.colname = colname
+        self.pk = pk
+        self.unique = unique
+    
+    def __repr__(self):
+        return ("dejavu.db.Index(%s, %s, %s, pk=%s, unique=%s)" %
+                (repr(self.name), repr(self.tablename), repr(self.colname),
+                 repr(self.pk), repr(self.unique)))
-
-

trunk/storage/storeado.py

@@ -53 +53 @@
-# 12/30/1899, the zero-Date for ADO = 693594
-zeroHour = datetime.date(1899, 12, 30).toordinal()
+
+# DataTypeEnum
+adEmpty = 0
+adSmallInt = 2
+adInteger = 3
+adSingle = 4
+adDouble = 5
+adCurrency = 6
+adDate = 7
+adBSTR = 8
+adIDispatch = 9
+adError = 10
+adBoolean = 11
+adVariant = 12
+adIUnknown = 13
+adDecimal = 14
+adTinyInt = 16
+adUnsignedTinyInt = 17
+adUnsignedSmallInt = 18
+adUnsignedInt = 19
+adBigInt = 20
+adUnsignedBigInt = 21
+adGUID = 72 # e.g. {E5D50A9B-33D2-11D3-AAB3-00104BA31425}
+adBinary = 128
+adChar = 129
+adWChar = 130
+adNumeric = 131
+adUserDefined = 132
+adDBDate = 133
+adDBTime = 134
+adDBTimeStamp = 135
+adVarChar = 200
+adLongVarChar = 201
+adVarWChar = 202
+adLongVarWChar = 203
+adVarBinary = 204
+adLongVarBinary = 205
-
-
@@ -400 +437 @@
-    
-    def has_storage(self, cls):
-
-
+
-        return self.table_name(cls.__name__, quoted=False) in names
-    
@@ -420 +456 @@
-            raise
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    
-    def get_tables(self, conn=None):
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        # [(u'TABLE_CATALOG', 202), (u'TABLE_SCHEMA', 202), (u'TABLE_NAME', 202),
-        # (u'INDEX_CATALOG', 202), (u'INDEX_SCHEMA', 202), (u'INDEX_NAME', 202),
@@ -453 +543 @@
-        # (u'COLUMN_PROPID', 19), (u'COLLATION', 2), (u'CARDINALITY', 21),
-        # (u'PAGES', 3), (u'FILTER_CONDITION', 202), (u'INTEGRATED', 11)]
-
+
+
+
+
+
+
+
+
+
-
-

trunk/storage/storemysql.py

@@ -16 +16 @@
-import warnings
-import datetime
+
+try:
+    # Builtin in Python 2.5?
+    decimal
+except NameError:
+    try:
+        # Module in Python 2.3, 2.4
+        import decimal
+    except ImportError:
+        pass
-
-import dejavu
@@ -159 +169 @@
-        
-        self.decompiler = MySQLDecompiler
-Try to g
+G
-        # a different decompiler.
-        conn = self._template_conn()
-
-
-
-
-
+
-        conn.close()
+        v = rowdata[0][0]
+        self._version = storage.Version(v)
+        if self._version > storage.Version("4.1.1"):
+            self.decompiler = MySQLDecompiler411
-    
-    def sql_name(self, name, quoted=True):
@@ -211 +221 @@
-    
-    def version(self):
-
-
-
-
+
-    
-    def _seq_UnitSequencerInteger(self, unit):
@@ -329 +336 @@
-                         (self.table_name(clsname), oldcolname, newcolname,
-                          self.typeAdapter.coerce(cls, newname)))
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/storage/storepypgsql.py

@@ -1 +1 @@
-# Use libpq directly to avoid all of the DB-API overhead.
-from pyPgSQL import libpq
+
-import datetime
+
+try:
+    # Builtin in Python 2.5?
+    decimal
+except NameError:
+    try:
+        # Module in Python 2.3, 2.4
+        import decimal
+    except ImportError:
+        pass
+
-import dejavu
-from dejavu.storage import db
@@ -192 +204 @@
-            self.execute('CREATE INDEX %s ON %s (%s);' %
-                         (i, tablename, self.column_name(clsname, index)))
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/storage/storesqlite.py

@@ -430 +430 @@
-        altermap[newname] = oldname
-        self._legacy_alter_table(cls, altermap)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/test/zoo_fixture.py

@@ -725 +725 @@
-##        box.commit_since("rollback point name")
-    
+    def test_DB_Introspection(self):
+        s = arena.stores.values()[0]
+        if getattr(s, "get_tables", None) is None:
+            return
+        
+        tables = s.get_tables()
+        for t in tables:
+##            print t
+##            for c in s.get_columns(t.name):
+##                print "   ", c
+##            for i in s.get_indices(t.name):
+##                print "   ", i
+            if t.name.lower() == "djvzoo":
+                zootable = t
+        self.assertEqual(zootable.name.lower(), "djvzoo")
+        cols = s.get_columns(zootable.name)
+        self.assertEqual(len(cols), 6)
+        
+        cols = dict([(x.key.lower(), x) for x in cols])
+        idcol = cols['id']
+        # Since SQLite is typless, it will set all types to 'str'
+        self.assert_(idcol.type in (int, str))
+        self.assertEqual(idcol.default, None)
+    
-    def testzzzz_Schema_Upgrade(self):
-        # Must run last.