[SQL-CVS] r847 - trunk/SQLObject/sqlobject

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

Author: ianb
Date: 2005-07-21 06:02:09 +0000 (Thu, 21 Jul 2005)
New Revision: 847

Modified:
   trunk/SQLObject/sqlobject/main.py
Log:
Moved _fromDatabase into sqlmeta

Modified: trunk/SQLObject/sqlobject/main.py
===================================================================
--- trunk/SQLObject/sqlobject/main.py	2005-07-21 05:56:44 UTC (rev 846)
+++ trunk/SQLObject/sqlobject/main.py	2005-07-21 06:02:09 UTC (rev 847)
@@ -159,6 +159,7 @@
     defaultOrder = None
     cacheValues = True
     registry = None
+    fromDatabase = False
 
     __metaclass__ = declarative.DeclarativeMeta
 
@@ -283,8 +284,6 @@
 
     _indexes = []
 
-    _fromDatabase = False
-
     # Default is false, but we set it to true for the *instance*
     # when necessary: (bad clever? maybe)
     _expired = False
@@ -463,7 +462,7 @@
 
         for column in cls._columns:
             cls.addColumn(column)
-        if cls._fromDatabase:
+        if cls.sqlmeta.fromDatabase:
             cls.addColumnsFromDatabase()
 
         ########################################
@@ -506,10 +505,12 @@
     _cacheValues = _sqlmeta_attr('cacheValues', 2)
     _registry = _sqlmeta_attr('registry', 2)
     _idType = _sqlmeta_attr('idType', 2)
+    _fromDatabase = _sqlmeta_attr('fromDatabase', 2)
 
     def _cleanDeprecatedAttrs(cls, new_attrs):
         for attr in ['_table', '_lazyUpdate', '_style', '_idName',
-                     '_defaultOrder', '_cacheValues', '_registry']:
+                     '_defaultOrder', '_cacheValues', '_registry',
+                     '_idType', '_fromDatabase']:
             if new_attrs.has_key(attr):
                 new_name = attr[1:]
                 deprecated("'%s' is deprecated; please set the '%s' "