All:
The attached patch implements the MATCH keyword for foreign keys. This
is part of the SQL92 standard, and is supported by PostgreSQL and
Oracle.
Feedback welcome.
-Ryan Kelly
--
You received this message because you are subscribed to the Google Groups
"sqlalchemy" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/sqlalchemy?hl=en.
diff -r ea4bd6b54789 lib/sqlalchemy/schema.py
--- a/lib/sqlalchemy/schema.py Fri Jun 08 15:56:58 2012 -0400
+++ b/lib/sqlalchemy/schema.py Sat Jun 09 19:02:42 2012 -0400
@@ -1191,7 +1191,7 @@
def __init__(self, column, _constraint=None, use_alter=False, name=None,
onupdate=None, ondelete=None, deferrable=None,
schema=None,
- initially=None, link_to_name=False):
+ initially=None, link_to_name=False, match=None):
"""
Construct a column-level FOREIGN KEY.
@@ -1236,6 +1236,10 @@
generated/dropped externally from the CREATE TABLE/ DROP TABLE
statement. See that classes' constructor for details.
+ :param match: Optional string. If set, emit MATCH <value> when issuing
+ DDL for this constraint. Typical values include SIMPLE, PARTIAL
+ and FULL.
+
"""
self._colspec = column
@@ -1255,6 +1259,7 @@
self.deferrable = deferrable
self.initially = initially
self.link_to_name = link_to_name
+ self.match = match
def __repr__(self):
return "ForeignKey(%r)" % self._get_colspec()
@@ -1283,7 +1288,8 @@
ondelete=self.ondelete,
deferrable=self.deferrable,
initially=self.initially,
- link_to_name=self.link_to_name
+ link_to_name=self.link_to_name,
+ match=self.match
)
fk.dispatch._update(self.dispatch)
return fk
@@ -1445,6 +1451,7 @@
[], [], use_alter=self.use_alter, name=self.name,
onupdate=self.onupdate, ondelete=self.ondelete,
deferrable=self.deferrable, initially=self.initially,
+ match=self.match,
)
self.constraint._elements[self.parent] = self
self.constraint._set_parent_with_dispatch(table)
@@ -2031,7 +2038,7 @@
def __init__(self, columns, refcolumns, name=None, onupdate=None,
ondelete=None, deferrable=None, initially=None, use_alter=False,
- link_to_name=False, table=None):
+ link_to_name=False, match=None, table=None):
"""Construct a composite-capable FOREIGN KEY.
:param columns: A sequence of local column names. The named columns
@@ -2072,6 +2079,10 @@
This is normally used to generate/drop constraints on objects that
are mutually dependent on each other.
+ :param match: Optional string. If set, emit MATCH <value> when issuing
+ DDL for this constraint. Typical values include SIMPLE, PARTIAL
+ and FULL.
+
"""
super(ForeignKeyConstraint, self).\
__init__(name, deferrable, initially)
@@ -2082,6 +2093,7 @@
if self.name is None and use_alter:
raise exc.ArgumentError("Alterable Constraint requires a name")
self.use_alter = use_alter
+ self.match = match
self._elements = util.OrderedDict()
@@ -2097,7 +2109,8 @@
onupdate=self.onupdate,
ondelete=self.ondelete,
use_alter=self.use_alter,
- link_to_name=self.link_to_name
+ link_to_name=self.link_to_name,
+ match=self.match
)
if table is not None:
@@ -2153,7 +2166,8 @@
use_alter=self.use_alter,
deferrable=self.deferrable,
initially=self.initially,
- link_to_name=self.link_to_name
+ link_to_name=self.link_to_name,
+ match=self.match
)
fkc.dispatch._update(self.dispatch)
return fkc
diff -r ea4bd6b54789 lib/sqlalchemy/sql/compiler.py
--- a/lib/sqlalchemy/sql/compiler.py Fri Jun 08 15:56:58 2012 -0400
+++ b/lib/sqlalchemy/sql/compiler.py Sat Jun 09 19:02:42 2012 -0400
@@ -1719,6 +1719,7 @@
', '.join(preparer.quote(f.column.name, f.column.quote)
for f in constraint._elements.values())
)
+ text += self.define_constraint_match(constraint)
text += self.define_constraint_cascades(constraint)
text += self.define_constraint_deferrability(constraint)
return text
@@ -1758,6 +1759,12 @@
text += " INITIALLY %s" % constraint.initially
return text
+ def define_constraint_match(self, constraint):
+ text = ""
+ if constraint.match is not None:
+ text += " MATCH %s" % constraint.match
+ return text
+
class GenericTypeCompiler(engine.TypeCompiler):
def visit_CHAR(self, type_):
diff -r ea4bd6b54789 test/sql/test_constraints.py
--- a/test/sql/test_constraints.py Fri Jun 08 15:56:58 2012 -0400
+++ b/test/sql/test_constraints.py Sat Jun 09 19:02:42 2012 -0400
@@ -355,6 +355,19 @@
"(a) DEFERRABLE INITIALLY DEFERRED)",
)
+ def test_fk_match_clause(self):
+ t = Table('tbl', MetaData(),
+ Column('a', Integer),
+ Column('b', Integer,
+ ForeignKey('tbl.a', match="SIMPLE")))
+
+ self.assert_compile(
+ schema.CreateTable(t),
+ "CREATE TABLE tbl (a INTEGER, b INTEGER, "
+ "FOREIGN KEY(b) REFERENCES tbl "
+ "(a) MATCH SIMPLE)",
+ )
+
def test_deferrable_unique(self):
factory = lambda **kw: UniqueConstraint('b', **kw)
self._test_deferrable(factory)
@@ -554,4 +567,4 @@
)
c = CheckConstraint(t.c.a > t2.c.b)
assert c not in t.constraints
- assert c not in t2.constraints
\ No newline at end of file
+ assert c not in t2.constraints
