From 93f60163e87036dac3dbfbbe09bdd7c7c195dd67 Mon Sep 17 00:00:00 2001 From: Ian Kelly Date: Fri, 14 Sep 2007 18:12:36 +0000 Subject: 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 --- django/core/management/sql.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'django/core/management/sql.py') 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) -- cgit v1.3