[SQL-CVS] r2379 - home/phd/SQLObject/paramstyles/sqlobject

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

Author: phd
Date: 2007-03-02 09:29:21 -0700 (Fri, 02 Mar 2007)
New Revision: 2379

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py
Log:
Merged patches from the revisions 2377:2378 from the trunk

Modified: home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py	2007-03-02 16:27:58 UTC (rev 2378)
+++ home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py	2007-03-02 16:29:21 UTC (rev 2379)
@@ -612,11 +612,14 @@
                 self.getDBOptions(soClass)))
         return createSql, constraints + extraSQL
 
-    def getDBOptions(self, soClass):
-        if soClass.sqlmeta.engineSQL is not None and \
-                len(soClass.sqlmeta.engineSQL) > 0:
-            return "ENGINE = %s" % soClass.sqlmeta.engineSQL
+    def getDBOptions(self, SO_or_join):
+        if hasattr(SO_or_join, "sqlmeta"):
+            engineSQL = SO_or_join.sqlmeta.engineSQL
         else:
+            engineSQL = getattr(SO_or_join, "engineSQL", None)
+        if engineSQL:
+            return "ENGINE = %s" % engineSQL
+        else:
             return ""
 
     def createColumns(self, soClass):