Author: phd
Date: 2007-04-20 08:23:33 -0600 (Fri, 20 Apr 2007)
New Revision: 2578
Modified:
home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py
home/phd/SQLObject/paramstyles/sqlobject/main.py
Log:
Merged patches from the revisions 2575:2577 from the trunk
Modified: home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py 2007-04-20 14:19:06 UTC (rev 2577)
+++ home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py 2007-04-20 14:23:33 UTC (rev 2578)
@@ -559,13 +559,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)
@@ -611,21 +610,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: home/phd/SQLObject/paramstyles/sqlobject/main.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/main.py 2007-04-20 14:19:06 UTC (rev 2577)
+++ home/phd/SQLObject/paramstyles/sqlobject/main.py 2007-04-20 14:23:33 UTC (rev 2578)
@@ -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)
|
