Changeset 192

Timestamp:

03/13/06 11:27:08

Author:

fumanchu

Message:

Bugfixes and new storeado.rename_property method.

Files:

• trunk/arenas.py (modified) (1 diff)
• trunk/storage/db.py (modified) (1 diff)
• trunk/storage/storeado.py (modified) (7 diffs)
• trunk/units.py (modified) (1 diff)

trunk/arenas.py

@@ -319 +319 @@
-                for id in keys:
-                    unit = cache.get(id)
-expr is None) or expr.evaluate(unit
+(expr is None) or expr.evaluate(unit)
-                        # Do NOT call on_recall here. That should be called
-                        # only at the Sandbox-SM boundary.

trunk/storage/db.py

@@ -1474 +1474 @@
-    
-    def has_index(self, cls, name):
-
+
+
+
-    
-    def drop_index(self, cls, name):

trunk/storage/storeado.py

@@ -137 +137 @@
-                    return datetime.datetime(int(value[0:4]), int(value[4:6]),
-                                             int(value[6:8]))
-, x
+
-                    raise ValueError("'%s' %s" % (value, type(value)))
-            else:
@@ -153 +153 @@
-                    return datetime.date(int(value[0:4]), int(value[4:6]),
-                                         int(value[6:8]))
-, x
+
-                    raise ValueError("'%s' %s" % (value, type(value)))
-            else:
@@ -436 +436 @@
-        return "ADO Version: %s" % adoconn.Version
-    
+    #                               Schemas                               #
+    
-    def has_storage(self, cls):
-        names = [t.name for t in self.get_tables()]
-        return self.table_name(cls.__name__, quoted=False) in names
+    
+    def rename_storage(self, oldname, newname):
+        oldname = self.table_name(oldname, quoted=False)
+        newname = self.table_name(newname, quoted=False)
+        self.arena.log("rename table %s to %s" % (oldname, newname),
+                       dejavu.LOGSQL)
+        
+        conn = self.connection()
+        try:
+            cat = win32com.client.Dispatch(r'ADOX.Catalog')
+            cat.ActiveConnection = conn
+            cat.Tables(oldname).Name = newname
+        except pywintypes.com_error:
+            conn = None
+            cat = None
+            raise
-    
-    def rename_property(self, cls, oldname, newname):
@@ -445 +463 @@
-        oldname = self.column_name(clsname, oldname, quoted=False)
-        newname = self.column_name(clsname, newname, quoted=False)
+        self.arena.log("rename %s column %s to %s" %
+                       (tblname, oldname, newname),
+                       dejavu.LOGSQL)
-         
-        conn = self.connection()
@@ -451 +472 @@
-            cat.ActiveConnection = conn
-            cat.Tables(tblname).Columns(oldname).Name = newname
-, x
+
-            conn = None
-            cat = None
@@ -462 +483 @@
-        colname = self.column_name(clsname, name, quoted=False)
-        
-
-tablename == tablename and i.
+tablename
+
-                # The INDEX_NAME may include a trailing " ASC" or other data
-                self.execute('DROP INDEX [%s] ON %s;' % (i.name, qtablename))
@@ -938 +959 @@
-
-
-
-def gen_py():
-    # Auto generate .py support for ADO 2.7+

trunk/units.py

@@ -386 +386 @@
-        # but not back up to superclasses.
-        if hasattr(cls, "properties"):
-cls.properties[:]
+list(cls.properties)
-        else:
-            props = []