summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzshimanchik <zahar.shimanchik@ya.ru>2016-02-25 23:10:03 +0300
committerTim Graham <timograham@gmail.com>2016-02-26 12:02:13 -0500
commit65aa94200b3d10d515b15a78898c3692cd57e6c7 (patch)
tree49b25aa2cc94216d4f2257576e680f758ce4d989
parent62ea86448ee1e56c96a4275da5d42f39680a611c (diff)
Fixed #24653 -- Fixed MySQL database introspection when using read_default_file.
-rw-r--r--django/db/backends/mysql/introspection.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/django/db/backends/mysql/introspection.py b/django/db/backends/mysql/introspection.py
index 835276d7e1..6b324b738a 100644
--- a/django/db/backends/mysql/introspection.py
+++ b/django/db/backends/mysql/introspection.py
@@ -165,10 +165,10 @@ class DatabaseIntrospection(BaseDatabaseIntrospection):
kc.`referenced_table_name`, kc.`referenced_column_name`
FROM information_schema.key_column_usage AS kc
WHERE
- kc.table_schema = %s AND
+ kc.table_schema = DATABASE() AND
kc.table_name = %s
"""
- cursor.execute(name_query, [self.connection.settings_dict['NAME'], table_name])
+ cursor.execute(name_query, [table_name])
for constraint, column, ref_table, ref_column in cursor.fetchall():
if constraint not in constraints:
constraints[constraint] = {
@@ -185,10 +185,10 @@ class DatabaseIntrospection(BaseDatabaseIntrospection):
SELECT c.constraint_name, c.constraint_type
FROM information_schema.table_constraints AS c
WHERE
- c.table_schema = %s AND
+ c.table_schema = DATABASE() AND
c.table_name = %s
"""
- cursor.execute(type_query, [self.connection.settings_dict['NAME'], table_name])
+ cursor.execute(type_query, [table_name])
for constraint, kind in cursor.fetchall():
if kind.lower() == "primary key":
constraints[constraint]['primary_key'] = True