[SQL-CVS] r3707 - SQLObject/trunk/sqlobject
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
From: <sub...@co...> - 2008-12-08 13:36:31
|
Author: dan Date: 2008-12-08 06:36:24 -0700 (Mon, 08 Dec 2008) New Revision: 3707 Modified: SQLObject/trunk/sqlobject/col.py Log: Fixed createSQL table constrains generation when table name includes the database name (contains a dot) Modified: SQLObject/trunk/sqlobject/col.py =================================================================== --- SQLObject/trunk/sqlobject/col.py 2008-12-05 01:25:12 UTC (rev 3706) +++ SQLObject/trunk/sqlobject/col.py 2008-12-08 13:36:24 UTC (rev 3707) @@ -833,6 +833,7 @@ def mysqlCreateReferenceConstraint(self): sTName = self.soClass.sqlmeta.table + sTLocalName = sTName.split('.')[-1] other = findClass(self.foreignKey, self.soClass.sqlmeta.registry) tName = other.sqlmeta.table idName = other.sqlmeta.idName @@ -845,7 +846,7 @@ action = 'ON DELETE RESTRICT' else: action = '' - constraint = ('ALTER TABLE %(sTName)s ADD CONSTRAINT %(sTName)s_%(colName)s_exists ' + constraint = ('ALTER TABLE %(sTName)s ADD CONSTRAINT %(sTLocalName)s_%(colName)s_exists ' 'FOREIGN KEY (%(colName)s) ' 'REFERENCES %(tName)s (%(idName)s) ' '%(action)s' % @@ -853,7 +854,8 @@ 'colName': self.dbName, 'idName': idName, 'action': action, - 'sTName': sTName}) + 'sTName': sTName, + 'sTLocalName': sTLocalName}) return constraint def mysqlCreateSQL(self): |