[SQL-CVS] r2575 - in SQLObject/branches/0.9: docs sqlobject

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

Author: phd
Date: 2007-04-20 08:17:58 -0600 (Fri, 20 Apr 2007)
New Revision: 2575

Modified:
   SQLObject/branches/0.9/docs/News.txt
   SQLObject/branches/0.9/sqlobject/dbconnection.py
   SQLObject/branches/0.9/sqlobject/main.py
Log:
Removed support for MySQL storage ENGINEs - it's too special and could be
implemented using createSQL.


Modified: SQLObject/branches/0.9/docs/News.txt
===================================================================
--- SQLObject/branches/0.9/docs/News.txt	2007-04-20 13:58:02 UTC (rev 2574)
+++ SQLObject/branches/0.9/docs/News.txt	2007-04-20 14:17:58 UTC (rev 2575)
@@ -53,8 +53,6 @@
 
 * Support for DEFAULT SQL attribute via defaultSQL keyword argument.
 
-* Support for MySQL storage ENGINEs.
-
 * cls.tableExists() as a shortcut for conn.tableExists(cls.sqlmeta.table).
 
 * cls.deleteMany(), cls.deleteBy().

Modified: SQLObject/branches/0.9/sqlobject/dbconnection.py
===================================================================
--- SQLObject/branches/0.9/sqlobject/dbconnection.py	2007-04-20 13:58:02 UTC (rev 2574)
+++ SQLObject/branches/0.9/sqlobject/dbconnection.py	2007-04-20 14:17:58 UTC (rev 2575)
@@ -548,13 +548,12 @@
         self.query(self._SO_createJoinTableSQL(join))
 
     def _SO_createJoinTableSQL(self, join):
-        return ('CREATE TABLE %s (\n%s %s,\n%s %s\n) %s' %
+        return ('CREATE TABLE %s (\n%s %s,\n%s %s\n)' %
                 (join.intermediateTable,
                  join.joinColumn,
                  self.joinSQLType(join),
                  join.otherColumn,
-                 self.joinSQLType(join),
-                 self.getDBOptions(join)))
+                 self.joinSQLType(join)))
 
     def _SO_dropJoinTable(self, join):
         self.query("DROP TABLE %s" % join.intermediateTable)
@@ -600,21 +599,10 @@
     def createTableSQL(self, soClass):
         constraints = self.createReferenceConstraints(soClass)
         extraSQL = self.createSQL(soClass)
-        createSql = ('CREATE TABLE %s (\n%s\n) %s' %
-                (soClass.sqlmeta.table, self.createColumns(soClass),
-                self.getDBOptions(soClass)))
+        createSql = ('CREATE TABLE %s (\n%s\n)' %
+                (soClass.sqlmeta.table, self.createColumns(soClass)))
         return createSql, constraints + extraSQL
 
-    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):
         columnDefs = [self.createIDColumn(soClass)] \
                      + [self.createColumn(soClass, col)

Modified: SQLObject/branches/0.9/sqlobject/main.py
===================================================================
--- SQLObject/branches/0.9/sqlobject/main.py	2007-04-20 13:58:02 UTC (rev 2574)
+++ SQLObject/branches/0.9/sqlobject/main.py	2007-04-20 14:17:58 UTC (rev 2575)
@@ -200,8 +200,6 @@
     # Default is false, but we set it to true for the *instance*
     # when necessary: (bad clever? maybe)
     expired = False
-    # Engine SQL; currently used for MySQL engine ("MyISAM", "InnoDB", etc.)
-    engineSQL = None
 
     # This is a mapping from column names to SOCol (or subclass)
     # instances:
@@ -1462,7 +1460,6 @@
                 continue
             if join.soClass.__name__ > join.otherClass.__name__:
                 continue
-            join.engineSQL = cls.sqlmeta.engineSQL
             joins.append(join)
         return joins
     _getJoinsToCreate = classmethod(_getJoinsToCreate)