diff options
author | Diana Clarke <diana.joan.clarke@gmail.com> | 2016-01-28 18:55:12 -0500 |
---|---|---|
committer | Diana Clarke <diana.joan.clarke@gmail.com> | 2016-01-28 18:55:12 -0500 |
commit | abeb762f885ae59cc05380ec7702680df6fae7ef (patch) | |
tree | 2ceb5fa4503fd5f8397434c0fec1edf6fb0a2f20 | |
parent | b3b3c68a4a0899d2065df36bbb93363f20cebb93 (diff) | |
download | sqlalchemy-abeb762f885ae59cc05380ec7702680df6fae7ef.tar.gz |
same logic, but without the inner functionpr/230
-rw-r--r-- | lib/sqlalchemy/dialects/sqlite/base.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py index 3ab9022cc..da6b9943c 100644 --- a/lib/sqlalchemy/dialects/sqlite/base.py +++ b/lib/sqlalchemy/dialects/sqlite/base.py @@ -1297,12 +1297,12 @@ class SQLiteDialect(default.DefaultDialect): @reflection.cache def get_pk_constraint(self, connection, table_name, schema=None, **kw): + constraint_name = None table_data = self._get_table_sql(connection, table_name, schema=schema) - - def parse_pk(): + if table_data: PK_PATTERN = 'CONSTRAINT (\w+) PRIMARY KEY' result = re.search(PK_PATTERN, table_data, re.I) - return result.group(1) if result else None + constraint_name = result.group(1) if result else None cols = self.get_columns(connection, table_name, schema, **kw) pkeys = [] @@ -1310,7 +1310,6 @@ class SQLiteDialect(default.DefaultDialect): if col['primary_key']: pkeys.append(col['name']) - constraint_name = parse_pk() if table_data else None return {'constrained_columns': pkeys, 'name': constraint_name} @reflection.cache |