Changeset 458

Timestamp:

06/11/07 22:44:18

Author:

fumanchu

Message:

Added logging to db.py.

Files:

• trunk/storage/db.py (modified) (10 diffs)

trunk/storage/db.py

@@ -86 +86 @@
-    def xrecall(self, cls, expr=None):
-        """Yield a sequence of Unit instances which satisfy the expression."""
+        if self.logflags & logflags.RECALL:
+            self.log(logflags.RECALL.message(unit_cls, expr))
+        
-        clsname = cls.__name__
-        
@@ -120 +123 @@
-            unit.cleanse()
-            yield unit
-    
-    def recall(self, cls, expr=None):
-        """Return a sequence of Unit instances which satisfy the expression."""
-        return [x for x in self.xrecall(cls, expr)]
-    
-    def reserve(self, unit):
@@ -169 +168 @@
-    def save(self, unit, forceSave=False):
-        """Update storage from unit's data (if unit.dirty())."""
-
+
+
+
+
-            self.schema[unit.__class__.__name__].save(**unit._properties)
-            unit.cleanse()
@@ -175 +177 @@
-    def destroy(self, unit):
-        """Delete the unit."""
+        if self.logflags & logflags.DESTROY:
+            self.log(logflags.DESTROY.message(unit))
+        
-        table = self.schema[unit.__class__.__name__]
-        table.delete(**unit._properties)
@@ -233 +238 @@
-        if not isinstance(query, dejavu.Query):
-            query = dejavu.Query(*query)
+        
+        if self.logflags & logflags.VIEW:
+            self.log(logflags.VIEW.message(query, distinct))
-        
-        data = self.select(query, distinct=distinct)
@@ -253 +261 @@
-    def multirecall(self, relation, expr):
-        """Yield Unit instance sets which satisfy the expression."""
+        if self.logflags & logflags.RECALL:
+            self.log(logflags.RECALL.message(relation, expr))
+        
-        # Gather attribute list.
-        allattrs = []
@@ -307 +318 @@
-    
-    def create_database(self):
+        if self.logflags & logflags.DDL:
+            self.log(logflags.DDL.message("create database"))
-        self.schema.create_database()
-    
-    def drop_database(self):
+        if self.logflags & logflags.DDL:
+            self.log(logflags.DDL.message("drop database"))
-        self.schema.drop_database()
-    
@@ -331 +346 @@
-    def create_storage(self, cls):
-        """Create storage for the given class."""
+        if self.logflags & logflags.DDL:
+            self.log(logflags.DDL.message("create storage %s" % cls))
-        # Attach to self.schema, which should call CREATE TABLE.
-        self.schema[cls.__name__] = self._make_table(cls)
@@ -348 +365 @@
-    
-    def drop_storage(self, cls):
+        if self.logflags & logflags.DDL:
+            self.log(logflags.DDL.message("drop storage %s" % cls))
-        del self.schema[cls.__name__]
-    
-    def rename_storage(self, oldname, newname):
+        if self.logflags & logflags.DDL:
+            self.log(logflags.DDL.message("rename storage from %s to %s"
+                                          % (oldname, newname)))
-        self.schema.rename(oldname, newname)
-    
-    def add_property(self, cls, name):
+        if self.logflags & logflags.DDL:
+            self.log(logflags.DDL.message("add property %s %s" %
+                                          (cls, name)))
-        if not self.has_property(cls, name):
-            table = self.schema[cls.__name__]
@@ -362 +387 @@
-    
-    def drop_property(self, cls, name):
+        if self.logflags & logflags.DDL:
+            self.log(logflags.DDL.message("drop property %s %s" %
+                                          (cls, name)))
-        if self.has_property(cls, name):
-            del self.schema[cls.__name__][name]
-    
-    def rename_property(self, cls, oldname, newname):
+        if self.logflags & logflags.DDL:
+            self.log(logflags.DDL.message(
+                "rename property %s from %s to %s" %
+                (cls, oldname, newname)))
-        t = self.schema[cls.__name__]
-