From: Diana Clarke <diana.joan.clarke@gmail.com>
Date: Thu, 28 Jan 2016 23:55:12 +0000 (-0500)
Subject: same logic, but without the inner function
X-Git-Tag: rel_1_1_0b1~84^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abeb762f885ae59cc05380ec7702680df6fae7ef;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

same logic, but without the inner function
---

diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py
index 3ab9022cc0..da6b9943c6 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