summaryrefslogtreecommitdiff
path: root/django/core/management/sql.py
diff options
context:
space:
mode:
authorIan Kelly <ian.g.kelly@gmail.com>2007-09-14 18:12:36 +0000
committerIan Kelly <ian.g.kelly@gmail.com>2007-09-14 18:12:36 +0000
commit93f60163e87036dac3dbfbbe09bdd7c7c195dd67 (patch)
tree2596452fcadceb2e184a51b6524e0c28408950df /django/core/management/sql.py
parent933cda3749865b0c776a21b39076c500ddcbe12f (diff)
Fixed #5218: Made Oracle create autoinc triggers using the correct name
of the AutoField column rather than always assume "ID". git-svn-id: http://code.djangoproject.com/svn/django/trunk@6195 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/core/management/sql.py')
-rw-r--r--django/core/management/sql.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/django/core/management/sql.py b/django/core/management/sql.py
index 8f7f6a023a..ed76bc4e35 100644
--- a/django/core/management/sql.py
+++ b/django/core/management/sql.py
@@ -302,7 +302,8 @@ def sql_model_create(model, style, known_models=set()):
if opts.has_auto_field:
# Add any extra SQL needed to support auto-incrementing primary keys.
- autoinc_sql = connection.ops.autoinc_sql(opts.db_table)
+ auto_column = opts.auto_field.db_column or opts.auto_field.name
+ autoinc_sql = connection.ops.autoinc_sql(opts.db_table, auto_column)
if autoinc_sql:
for stmt in autoinc_sql:
final_output.append(stmt)
@@ -385,7 +386,7 @@ def many_to_many_sql_for_model(model, style):
final_output.append('\n'.join(table_output))
# Add any extra SQL needed to support auto-incrementing PKs
- autoinc_sql = connection.ops.autoinc_sql(f.m2m_db_table())
+ autoinc_sql = connection.ops.autoinc_sql(f.m2m_db_table(), 'id')
if autoinc_sql:
for stmt in autoinc_sql:
final_output.append(stmt)