[SQL-CVS] r608 - trunk/SQLObject/sqlobject/tests

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

Author: ianb
Date: 2005-02-16 04:26:43 +0000 (Wed, 16 Feb 2005)
New Revision: 608

Modified:
   trunk/SQLObject/sqlobject/tests/dbtest.py
Log:
* Use new attributes
* Be more careful about supports -- negation supports weren't working
  before (supports like '-dynamicColumns': 'dbs...')


Modified: trunk/SQLObject/sqlobject/tests/dbtest.py
===================================================================
--- trunk/SQLObject/sqlobject/tests/dbtest.py	2005-02-16 04:25:58 UTC (rev 607)
+++ trunk/SQLObject/sqlobject/tests/dbtest.py	2005-02-16 04:26:43 UTC (rev 608)
@@ -96,7 +96,7 @@
         reversed = list(soClasses)[:]
         reversed.reverse()
         for soClass in reversed:
-            table = soClass._table
+            table = soClass.sqlmeta.table
             if not soClass._connection.tableExists(table):
                 continue
             items = list(cls.selectBy(
@@ -115,7 +115,7 @@
             else:
                 cls.clear(soClass)
         for soClass in soClasses:
-            table = soClass._table
+            table = soClass.sqlmeta.table
             if not soClass._connection.tableExists(table):
                 cls.install(soClass)
     installOrClear = classmethod(installOrClear)
@@ -131,7 +131,7 @@
         else:
             sql = soClass.createTableSQL()
             soClass.createTable()
-        cls(tableName=soClass._table,
+        cls(tableName=soClass.sqlmeta.table,
             createSQL=sql,
             connectionURI=soClass._connection.uri())
     install = classmethod(install)
@@ -158,7 +158,7 @@
         """
         This sets up *this* table.
         """
-        if not cls._connection.tableExists(cls._table):
+        if not cls._connection.tableExists(cls.sqlmeta.table):
             cls.createTable()
     setup = classmethod(setup)
 
@@ -216,11 +216,11 @@
     notSupport = supportsMatrix.get('-' + feature, None)
     if support is not None and dbName in support.split():
         return True
-    else:
+    elif support:
         return False
     if notSupport is not None and dbName in notSupport.split():
         return False
-    else:
+    elif notSupport:
         return True
     assert notSupport is not None or support is not None, (
         "The supportMatrix does not list this feature: %r"