summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-10-25 17:01:38 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-10-25 17:01:38 -0400
commite5a42a748be8c5556fa631f031173452f581d05b (patch)
treed5e23d531cfa82b7b927070b2d56ddf7d6d05bf1 /lib/sqlalchemy/engine
parent2b1c8eabb10c932f6e83d08147c75bb05f96a161 (diff)
parentf17e8a4452de1363263d4aad9b24612570d64ccc (diff)
downloadsqlalchemy-e5a42a748be8c5556fa631f031173452f581d05b.tar.gz
Merge branch 'master' of github.com:ijl/sqlalchemy into merge_2183
Diffstat (limited to 'lib/sqlalchemy/engine')
-rw-r--r--lib/sqlalchemy/engine/reflection.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/sqlalchemy/engine/reflection.py b/lib/sqlalchemy/engine/reflection.py
index a9ccf5539..461f5eb23 100644
--- a/lib/sqlalchemy/engine/reflection.py
+++ b/lib/sqlalchemy/engine/reflection.py
@@ -564,9 +564,14 @@ class Inspector(object):
)
for column in referred_columns:
refspec.append(".".join([referred_table, column]))
+ if 'options' in fkey_d:
+ options = fkey_d['options']
+ else:
+ options = {}
table.append_constraint(
sa_schema.ForeignKeyConstraint(constrained_columns, refspec,
- conname, link_to_name=True))
+ conname, link_to_name=True,
+ **options))
# Indexes
indexes = self.get_indexes(table_name, schema)
for index_d in indexes: