From 061bae6e043b8c97a42f7ab28878699cdeb6b506 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 3 Jun 2016 15:57:16 -0400 Subject: Ensure "options" present for unnamed / unlocatable FK Also ensure the regular expression and subsequent matching is case insensitive, add more tests Change-Id: Ie4aa971dcbffca94e78965e22982478eccbf8597 --- lib/sqlalchemy/dialects/sqlite/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/sqlalchemy/dialects/sqlite') 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"): -- cgit v1.2.1