summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2006-09-11 18:41:05 +0000
committerAdrian Holovaty <adrian@holovaty.com>2006-09-11 18:41:05 +0000
commitecf6a3511228eb901b8d69243fc6d6d6d9e89f6b (patch)
tree1f104875fe8f38eb8a1c16c1b2d06c22dbbf919e
parenteaaebf5752fb046ed03e2cbea0a16f17770e6251 (diff)
Fixed #2700 -- Improved introspection for MySQL. Thanks for the patch, serbaut@gmail.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--AUTHORS1
-rw-r--r--django/db/backends/mysql/introspection.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 20251599da..bad8008d86 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -127,6 +127,7 @@ answer newbie questions, and generally made Django that much better:
Oliver Rutherfurd <http://rutherfurd.net/>
Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
David Schein
+ serbaut@gmail.com
Pete Shinners <pete@shinners.org>
SmileyChris <smileychris@gmail.com>
sopel
diff --git a/django/db/backends/mysql/introspection.py b/django/db/backends/mysql/introspection.py
index e227f72706..7829457fa9 100644
--- a/django/db/backends/mysql/introspection.py
+++ b/django/db/backends/mysql/introspection.py
@@ -36,6 +36,7 @@ def get_relations(cursor, table_name):
SELECT column_name, referenced_table_name, referenced_column_name
FROM information_schema.key_column_usage
WHERE table_name = %s
+ AND table_schema = DATABASE()
AND referenced_table_name IS NOT NULL
AND referenced_column_name IS NOT NULL""", [table_name])
constraints.extend(cursor.fetchall())