test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #19677 -- Introspection of recursive foreign keys under SQLite. 

Thanks Simon Charette.
This commit is contained in:
Aymeric Augustin 2013-01-28 10:17:56 +01:00
parent 14d1d504d5
commit f46d7314b5
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/db/backends/creation.py
View File

@ -77,7 +77,7 @@ class BaseDatabaseCreation(object):
field_output.append(tablespace_sql) field_output.append(tablespace_sql)
if f.rel: if f.rel:
ref_output, pending = self.sql_for_inline_foreign_key_references( ref_output, pending = self.sql_for_inline_foreign_key_references(
f, known_models, style) model, f, known_models, style)
if pending: if pending:
pending_references.setdefault(f.rel.to, []).append( pending_references.setdefault(f.rel.to, []).append(
(model, f)) (model, f))
@ -116,15 +116,16 @@ class BaseDatabaseCreation(object):
return final_output, pending_references return final_output, pending_references
def sql_for_inline_foreign_key_references(self, field, known_models, style): def sql_for_inline_foreign_key_references(self, model, field, known_models, style):
""" """
Return the SQL snippet defining the foreign key reference for a field. Return the SQL snippet defining the foreign key reference for a field.
""" """
qn = self.connection.ops.quote_name qn = self.connection.ops.quote_name
if field.rel.to in known_models: rel_to = field.rel.to
if rel_to in known_models or rel_to == model:
output = [style.SQL_KEYWORD('REFERENCES') + ' ' + output = [style.SQL_KEYWORD('REFERENCES') + ' ' +
style.SQL_TABLE(qn(field.rel.to._meta.db_table)) + ' (' + style.SQL_TABLE(qn(rel_to._meta.db_table)) + ' (' +
style.SQL_FIELD(qn(field.rel.to._meta.get_field( style.SQL_FIELD(qn(rel_to._meta.get_field(
field.rel.field_name).column)) + ')' + field.rel.field_name).column)) + ')' +
self.connection.ops.deferrable_sql() self.connection.ops.deferrable_sql()
] ]

2
django/db/backends/mysql/creation.py
View File

@ -38,7 +38,7 @@ class DatabaseCreation(BaseDatabaseCreation):
suffix.append('COLLATE %s' % self.connection.settings_dict['TEST_COLLATION']) suffix.append('COLLATE %s' % self.connection.settings_dict['TEST_COLLATION'])
return ' '.join(suffix) return ' '.join(suffix)
def sql_for_inline_foreign_key_references(self, field, known_models, style): def sql_for_inline_foreign_key_references(self, model, field, known_models, style):
"All inline references are pending under MySQL" "All inline references are pending under MySQL"
return [], True return [], True

1
tests/regressiontests/introspection/models.py
View File

@ -23,6 +23,7 @@ class Article(models.Model):
headline = models.CharField(max_length=100) headline = models.CharField(max_length=100)
pub_date = models.DateField() pub_date = models.DateField()
reporter = models.ForeignKey(Reporter) reporter = models.ForeignKey(Reporter)
response_to = models.ForeignKey('self', null=True)
def __str__(self): def __str__(self):
return self.headline return self.headline

8
tests/regressiontests/introspection/tests.py
View File

@ -106,13 +106,17 @@ class IntrospectionTests(TestCase):
# should test that the response is correct. # should test that the response is correct.
if relations: if relations:
# That's {field_index: (field_index_other_table, other_table)} # That's {field_index: (field_index_other_table, other_table)}
self.assertEqual(relations, {3: (0, Reporter._meta.db_table)}) self.assertEqual(relations, {3: (0, Reporter._meta.db_table),
4: (0, Article._meta.db_table)})
@skipUnlessDBFeature('can_introspect_foreign_keys') @skipUnlessDBFeature('can_introspect_foreign_keys')
def test_get_key_columns(self): def test_get_key_columns(self):
cursor = connection.cursor() cursor = connection.cursor()
key_columns = connection.introspection.get_key_columns(cursor, Article._meta.db_table) key_columns = connection.introspection.get_key_columns(cursor, Article._meta.db_table)
self.assertEqual(key_columns, [('reporter_id', Reporter._meta.db_table, 'id')]) self.assertEqual(
set(key_columns),
set([('reporter_id', Reporter._meta.db_table, 'id'),
('response_to_id', Article._meta.db_table, 'id')]))
def test_get_primary_key_column(self): def test_get_primary_key_column(self):
cursor = connection.cursor() cursor = connection.cursor()