[SQL-CVS] r2455 - in home/phd/SQLObject/paramstyles/sqlobject: . inheritance

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

Author: phd
Date: 2007-03-27 09:01:10 -0600 (Tue, 27 Mar 2007)
New Revision: 2455

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/inheritance/__init__.py
   home/phd/SQLObject/paramstyles/sqlobject/sqlbuilder.py
   home/phd/SQLObject/paramstyles/sqlobject/sresults.py
Log:
Merged patches from the revisions 2452:2454 from the trunk

Modified: home/phd/SQLObject/paramstyles/sqlobject/inheritance/__init__.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/inheritance/__init__.py	2007-03-27 14:59:52 UTC (rev 2454)
+++ home/phd/SQLObject/paramstyles/sqlobject/inheritance/__init__.py	2007-03-27 15:01:10 UTC (rev 2455)
@@ -33,11 +33,11 @@
         if clause is None or isinstance(clause, str) and clause == 'all':
             clause = sqlbuilder.SQLTrueClause
         tablesDict = tablesUsedDict(clause)
-        tablesDict[sourceClass.sqlmeta.table] = 1
+        tablesDict[str(sourceClass.sqlmeta.table)] = 1
         orderBy = ops.get('orderBy')
         if inheritedTables:
             for tableName in inheritedTables:
-                tablesDict[tableName] = 1
+                tablesDict[str(tableName)] = 1
         if orderBy and not isinstance(orderBy, basestring):
             tablesDict.update(tablesUsedDict(orderBy))
         #DSM: if this class has a parent, we need to link it
@@ -51,7 +51,7 @@
             allClasses = classregistry.registry(
                 sourceClass.sqlmeta.registry).allClasses()
             for registryClass in allClasses:
-                if registryClass.sqlmeta.table in tablesDict:
+                if str(registryClass.sqlmeta.table) in tablesDict:
                     #DSM: By default, no parents are needed for the clauses
                     tableRegistry[registryClass] = registryClass
             tableRegistryCopy = tableRegistry.copy()
@@ -78,7 +78,7 @@
                     parentClass = currentClass.sqlmeta.parentClass
                     parentClause.append(currentClass.q.id == parentClass.q.id)
                     currentClass = parentClass
-                    tablesDict[currentClass.sqlmeta.table] = 1
+                    tablesDict[str(currentClass.sqlmeta.table)] = 1
             clause = reduce(sqlbuilder.AND, parentClause, clause)
 
         super(InheritableSelectResults, self).__init__(sourceClass,

Modified: home/phd/SQLObject/paramstyles/sqlobject/sqlbuilder.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/sqlbuilder.py	2007-03-27 14:59:52 UTC (rev 2454)
+++ home/phd/SQLObject/paramstyles/sqlobject/sqlbuilder.py	2007-03-27 15:01:10 UTC (rev 2455)
@@ -216,7 +216,7 @@
     def tablesUsedDict(self):
         tables = {}
         for table in self.tablesUsedImmediate():
-            tables[table] = 1
+            tables[str(table)] = 1
         for component in self.components():
             tables.update(tablesUsedDict(component))
         return tables

Modified: home/phd/SQLObject/paramstyles/sqlobject/sresults.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/sresults.py	2007-03-27 14:59:52 UTC (rev 2454)
+++ home/phd/SQLObject/paramstyles/sqlobject/sresults.py	2007-03-27 15:01:10 UTC (rev 2455)
@@ -14,10 +14,10 @@
             clause = sqlbuilder.SQLTrueClause
         self.clause = clause
         tablesDict = sqlbuilder.tablesUsedDict(self.clause)
-        tablesDict[sourceClass.sqlmeta.table] = 1
+        tablesDict[str(sourceClass.sqlmeta.table)] = 1
         if clauseTables:
             for table in clauseTables:
-                tablesDict[table] = 1
+                tablesDict[str(table)] = 1
         self.clauseTables = clauseTables
         self.tables = tablesDict.keys()
         self.ops = ops