summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2016-06-03 15:57:16 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2016-06-03 15:57:16 -0400
commit061bae6e043b8c97a42f7ab28878699cdeb6b506 (patch)
tree599db030f8c85893c4011cf769f8212428a22bc9 /lib/sqlalchemy/dialects
parentdaf209bd6b6fe94cbec162cef2a53c49e9f31cde (diff)
downloadsqlalchemy-061bae6e043b8c97a42f7ab28878699cdeb6b506.tar.gz
Ensure "options" present for unnamed / unlocatable FK
Also ensure the regular expression and subsequent matching is case insensitive, add more tests Change-Id: Ie4aa971dcbffca94e78965e22982478eccbf8597
Diffstat (limited to 'lib/sqlalchemy/dialects')
-rw-r--r--lib/sqlalchemy/dialects/sqlite/base.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py
index 7ddd09993..0f3c54385 100644
--- a/lib/sqlalchemy/dialects/sqlite/base.py
+++ b/lib/sqlalchemy/dialects/sqlite/base.py
@@ -1342,6 +1342,7 @@ class SQLiteDialect(default.DefaultDialect):
'referred_schema': schema,
'referred_table': rtbl,
'referred_columns': [],
+ 'options': {}
}
fks[numerical_id] = fk
@@ -1378,7 +1379,6 @@ class SQLiteDialect(default.DefaultDialect):
'((?:ON (?:DELETE|UPDATE) '
'(?:SET NULL|SET DEFAULT|CASCADE|RESTRICT|NO ACTION) *)*)'
)
-
for match in re.finditer(FK_PATTERN, table_data, re.I):
(
constraint_name, constrained_columns,
@@ -1394,7 +1394,7 @@ class SQLiteDialect(default.DefaultDialect):
self._find_cols_in_sig(referred_columns))
referred_name = referred_quoted_name or referred_name
options = {}
- for token in re.split(r" *ON *", onupdatedelete):
+ for token in re.split(r" *ON *", onupdatedelete.upper()):
if token.startswith("DELETE"):
options['ondelete'] = token[6:].strip()
elif token.startswith("UPDATE"):