Author: ianb
Date: 2004-08-30 13:19:22 -0400 (Mon, 30 Aug 2004)
New Revision: 210
Modified:
trunk/SQLObject/sqlobject/col.py
Log:
Changed contraint name generation; since you may have two columns
that are both keys to the same table, you shouldn't use=20
foreign_table_name_exists as the constraint name, as it won't be unique.
Instead we use col_name_exists.
Modified: trunk/SQLObject/sqlobject/col.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/SQLObject/sqlobject/col.py 2004-08-30 17:15:21 UTC (rev 209)
+++ trunk/SQLObject/sqlobject/col.py 2004-08-30 17:19:22 UTC (rev 210)
@@ -450,7 +450,7 @@
tName =3D other._table
idName =3D other._idName
if self.cascade is not None:
- if self.cascade.lower() =3D=3D 'null':
+ if self.cascade =3D=3D 'null':
action =3D 'ON DELETE SET NULL'
elif self.cascade:
action =3D 'ON DELETE CASCADE'
@@ -458,7 +458,7 @@
action =3D 'ON DELETE RESTRICT'
else:
action =3D ''
- constraint =3D ('CONSTRAINT %(tName)s_exists '
+ constraint =3D ('CONSTRAINT %(colName)s_exists '
'FOREIGN KEY (%(colName)s) '
'REFERENCES %(tName)s (%(idName)s) '
'%(action)s' %
|
