summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Pope <nick.pope@flightdataservices.com>2019-01-18 22:44:09 +0000
committerTim Graham <timograham@gmail.com>2019-01-22 19:02:34 -0500
commitbff748df3e1e1c0077e02df2b77bda2b827ad129 (patch)
treee7e538a078c93fd3f0071fef69dedec73f92e6c9
parentd82f212ec8a55aaeb9d1fe893b902c648d0e0065 (diff)
Fixed #30115 -- Fixed SQLite introspection crash with a varchar primary key.
Removed obsolete max_length handling for CharField that caused the issue. Regression in a35d2a4510d5beec398b1007aaa26492d6aedf97.
-rw-r--r--django/db/backends/sqlite3/introspection.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/django/db/backends/sqlite3/introspection.py b/django/db/backends/sqlite3/introspection.py
index 2a5c64dd26..0d27c5511b 100644
--- a/django/db/backends/sqlite3/introspection.py
+++ b/django/db/backends/sqlite3/introspection.py
@@ -40,6 +40,7 @@ class FlexibleFieldLookupDict:
'real': 'FloatField',
'text': 'TextField',
'char': 'CharField',
+ 'varchar': 'CharField',
'blob': 'BinaryField',
'date': 'DateField',
'datetime': 'DateTimeField',
@@ -47,14 +48,8 @@ class FlexibleFieldLookupDict:
}
def __getitem__(self, key):
- key = key.lower()
- try:
- return self.base_data_types_reverse[key]
- except KeyError:
- size = get_field_size(key)
- if size is not None:
- return ('CharField', {'max_length': size})
- raise KeyError
+ key = key.lower().split('(', 1)[0].strip()
+ return self.base_data_types_reverse[key]
class DatabaseIntrospection(BaseDatabaseIntrospection):