Author: phd
Date: 2006-02-06 10:30:14 -0700 (Mon, 06 Feb 2006)
New Revision: 1569
Modified:
home/phd/SQLObject/paramstyles/sqlobject/col.py
home/phd/SQLObject/paramstyles/sqlobject/maxdb/maxdbconnection.py
home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py
home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py
Log:
Merged patches from the revisions 1561:1568 from the trunk
Modified: home/phd/SQLObject/paramstyles/sqlobject/col.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/col.py 2006-02-06 04:34:14 UTC (rev 1568)
+++ home/phd/SQLObject/paramstyles/sqlobject/col.py 2006-02-06 17:30:14 UTC (rev 1569)
@@ -777,6 +777,9 @@
sql = ', '.join([sql, constraint])
return sql
+ def mysqlCreateReferenceConstraint(self):
+ return None
+
def sybaseCreateSQL(self):
sql = SOKeyCol.sybaseCreateSQL(self)
other = findClass(self.foreignKey)
@@ -788,6 +791,10 @@
sql = ' '.join([sql, reference])
return sql
+ def sybaseCreateReferenceConstraint(self):
+ # @@: Code from above should be moved here
+ return None
+
def mssqlCreateSQL(self):
sql = SOKeyCol.mssqlCreateSQL(self)
other = findClass(self.foreignKey)
@@ -799,6 +806,10 @@
sql = ' '.join([sql, reference])
return sql
+ def mssqlCreateReferenceConstraint(self):
+ # @@: Code from above should be moved here
+ return None
+
def maxdbCreateSQL(self):
other = findClass(self.foreignKey)
fidName = self.dbName
@@ -810,6 +821,10 @@
sql=sql + 'FOREIGN KEY (%s) REFERENCES %s(%s)'%(fidName,tName,idName)
return sql
+ def maxdbCreateReferenceConstraint(self):
+ # @@: Code from above should be moved here
+ return None
+
class ForeignKey(KeyCol):
baseClass = SOForeignKey
Modified: home/phd/SQLObject/paramstyles/sqlobject/maxdb/maxdbconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/maxdb/maxdbconnection.py 2006-02-06 04:34:14 UTC (rev 1568)
+++ home/phd/SQLObject/paramstyles/sqlobject/maxdb/maxdbconnection.py 2006-02-06 17:30:14 UTC (rev 1569)
@@ -169,6 +169,9 @@
self.query("CREATE SEQUENCE %s"
% self.createSequenceName(soClass.sqlmeta.table))
+ def createReferenceConstraint(self, soClass, col):
+ return col.maxdbCreateReferenceConstraint()
+
def createColumn(self, soClass, col):
return col.maxdbCreateSQL()
Modified: home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py 2006-02-06 04:34:14 UTC (rev 1568)
+++ home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py 2006-02-06 17:30:14 UTC (rev 1569)
@@ -148,6 +148,9 @@
else:
return query
+ def createReferenceConstraint(self, soClass, col):
+ return col.mssqlCreateReferenceConstraint()
+
def createColumn(self, soClass, col):
return col.mssqlCreateSQL()
Modified: home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py 2006-02-06 04:34:14 UTC (rev 1568)
+++ home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py 2006-02-06 17:30:14 UTC (rev 1569)
@@ -92,6 +92,9 @@
return "%s LIMIT %i, -1" % (query, start)
return "%s LIMIT %i, %i" % (query, start, end-start)
+ def createReferenceConstraint(self, soClass, col):
+ return col.mysqlCreateReferenceConstraint()
+
def createColumn(self, soClass, col):
return col.mysqlCreateSQL()
|
