[SQL-CVS] r626 - in trunk/SQLObject/sqlobject: . inheritance tests

[<sub...@co...>]

Author: ianb
Date: 2005-02-20 04:55:21 +0000 (Sun, 20 Feb 2005)
New Revision: 626

Modified:
   trunk/SQLObject/sqlobject/inheritance/__init__.py
   trunk/SQLObject/sqlobject/inheritance/iteration.py
   trunk/SQLObject/sqlobject/joins.py
   trunk/SQLObject/sqlobject/main.py
   trunk/SQLObject/sqlobject/tests/test_auto.py
Log:
Moved _registry into sqlmeta


Modified: trunk/SQLObject/sqlobject/inheritance/__init__.py
===================================================================
--- trunk/SQLObject/sqlobject/inheritance/__init__.py	2005-02-20 04:49:42 UTC (rev 625)
+++ trunk/SQLObject/sqlobject/inheritance/__init__.py	2005-02-20 04:55:21 UTC (rev 626)
@@ -31,7 +31,8 @@
         #DSM: and will do himself the relationship between classes.
         if type(clause) is not str:
             tableRegistry = {}
-            allClasses = classregistry.registry(sourceClass._registry).allClasses()
+            allClasses = classregistry.registry(
+                sourceClass.sqlmeta.registry).allClasses()
             for registryClass in allClasses:
                 if registryClass.sqlmeta.table in tablesDict:
                     #DSM: By default, no parents are needed for the clauses

Modified: trunk/SQLObject/sqlobject/inheritance/iteration.py
===================================================================
--- trunk/SQLObject/sqlobject/inheritance/iteration.py	2005-02-20 04:49:42 UTC (rev 625)
+++ trunk/SQLObject/sqlobject/inheritance/iteration.py	2005-02-20 04:55:21 UTC (rev 626)
@@ -64,7 +64,7 @@
         dbconn = self.dbconn
         rawconn = self.rawconn
         cursor = rawconn.cursor()
-        registry = self.select.sourceClass._registry
+        registry = self.select.sourceClass.sqlmeta.registry
         for childName, ids in childIdsNames.items():
             klass = findClass(childName, registry)
             select = klass.select(sqlbuilder.IN(sqlbuilder.SQLConstant("id"), ids))

Modified: trunk/SQLObject/sqlobject/joins.py
===================================================================
--- trunk/SQLObject/sqlobject/joins.py	2005-02-20 04:49:42 UTC (rev 625)
+++ trunk/SQLObject/sqlobject/joins.py	2005-02-20 04:55:21 UTC (rev 626)
@@ -54,7 +54,7 @@
                  joinDef=None):
         self.soClass = soClass
         self.otherClassName = otherClass
-        classregistry.registry(soClass._registry).addClassCallback(
+        classregistry.registry(soClass.sqlmeta.registry).addClassCallback(
             otherClass, self._setOtherClass)
         self.joinColumn = joinColumn
         self.joinMethodName = joinMethodName
@@ -145,7 +145,8 @@
         self.intermediateTable = intermediateTable
         self.otherColumn = otherColumn
         SOMultipleJoin.__init__(self, **kw)
-        classregistry.registry(self.soClass._registry).addClassCallback(
+        classregistry.registry(
+            self.soClass.sqlmeta.registry).addClassCallback(
             self.otherClassName, self._setOtherRelatedClass)
 
     def _setOtherRelatedClass(self, otherClass):

Modified: trunk/SQLObject/sqlobject/main.py
===================================================================
--- trunk/SQLObject/sqlobject/main.py	2005-02-20 04:49:42 UTC (rev 625)
+++ trunk/SQLObject/sqlobject/main.py	2005-02-20 04:55:21 UTC (rev 626)
@@ -154,6 +154,7 @@
     lazyUpdate = False
     defaultOrder = None
     cacheValues = True
+    registry = None
 
     __metaclass__ = declarative.DeclarativeMeta
 
@@ -247,8 +248,6 @@
 
     _fromDatabase = False
 
-    _registry = None
-
     # Default is false, but we set it to true for the *instance*
     # when necessary: (bad clever? maybe)
     _expired = False
@@ -484,7 +483,7 @@
                     setattr(cls.q, column.name,
                         getattr(currentClass.q, column.name))
 
-        classregistry.registry(cls._registry).addClass(cls)
+        classregistry.registry(cls.sqlmeta.registry).addClass(cls)
 
     _style = _sqlmeta_attr('style', 2)
     _table = _sqlmeta_attr('table', 2)
@@ -492,10 +491,11 @@
     _lazyUpdate = _sqlmeta_attr('lazyUpdate', 2)
     _defaultOrder = _sqlmeta_attr('defaultOrder', 2)
     _cacheValues = _sqlmeta_attr('cacheValues', 2)
+    _registry = _sqlmeta_attr('registry', 2)
 
     def _cleanDeprecatedAttrs(cls, new_attrs):
         for attr in ['_table', '_lazyUpdate', '_style', '_idName',
-                     '_defaultOrder', '_cacheValues']:
+                     '_defaultOrder', '_cacheValues', '_registry']:
             if new_attrs.has_key(attr):
                 new_name = attr[1:]
                 deprecated("'%s' is deprecated; please set the '%s' "
@@ -637,7 +637,7 @@
             # We'll need to put in a real reference at
             # some point.  See needSet at the top of the
             # file for more on this.
-            classregistry.registry(cls._registry).addClassCallback(
+            classregistry.registry(cls.sqlmeta.registry).addClassCallback(
                 column.foreignKey,
                 lambda foreign, me, attr: setattr(me, attr, foreign),
                 cls, '_SO_class_%s' % column.foreignKey)
@@ -1134,7 +1134,7 @@
     _SO_fetchAlternateID = classmethod(_SO_fetchAlternateID)
 
     def _SO_depends(cls):
-        return findDependencies(cls.__name__, cls._registry)
+        return findDependencies(cls.__name__, cls.sqlmeta.registry)
     _SO_depends = classmethod(_SO_depends)
 
     def select(cls, clause=None, clauseTables=None,

Modified: trunk/SQLObject/sqlobject/tests/test_auto.py
===================================================================
--- trunk/SQLObject/sqlobject/tests/test_auto.py	2005-02-20 04:49:42 UTC (rev 625)
+++ trunk/SQLObject/sqlobject/tests/test_auto.py	2005-02-20 04:55:21 UTC (rev 626)
@@ -160,4 +160,5 @@
         assert jane.wannahavefun
         assert john.longField == 'x'*1000
         assert jane.longField == 'x'*1000
-        del classregistry.registry(AutoTest._registry).classes['AutoTest']
+        del classregistry.registry(
+            AutoTest.sqlmeta.registry).classes['AutoTest']