]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
same logic, but without the inner function
authorDiana Clarke <diana.joan.clarke@gmail.com>
Thu, 28 Jan 2016 23:55:12 +0000 (18:55 -0500)
committerDiana Clarke <diana.joan.clarke@gmail.com>
Thu, 28 Jan 2016 23:55:12 +0000 (18:55 -0500)
lib/sqlalchemy/dialects/sqlite/base.py

index 3ab9022cc06f4bd45dfa6dbfe0ffe123ba422c49..da6b9943c60dc85f94d02fa358b48ff51aaf340f 100644 (file)
@@ -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