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

4 files changed, 12 insertions, 8 deletions

diff --git a/django/db/backends/__init__.py b/django/db/backends/__init__.py
index f3c6f59258..1b6ba07f24 100644
--- a/django/db/backends/__init__.py
+++ b/django/db/backends/__init__.py
@@ -56,7 +56,7 @@ class BaseDatabaseOperations(object):
     a backend performs ordering or calculates the ID of a recently-inserted
     row.
     """
-    def autoinc_sql(self, table):
+    def autoinc_sql(self, table, column):
         """
         Returns any SQL needed to support auto-incrementing primary keys, or
         None if no SQL is necessary.
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py
index 23ce30f37e..4093b69be6 100644
--- a/django/db/backends/oracle/base.py
+++ b/django/db/backends/oracle/base.py
@@ -31,20 +31,23 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     uses_custom_queryset = True
 
 class DatabaseOperations(BaseDatabaseOperations):
-    def autoinc_sql(self, table):
+    def autoinc_sql(self, table, column):
         # To simulate auto-incrementing primary keys in Oracle, we have to
         # create a sequence and a trigger.
         sq_name = get_sequence_name(table)
         tr_name = get_trigger_name(table)
+        tbl_name = self.quote_name(table)
+        col_name = self.quote_name(column)
         sequence_sql = 'CREATE SEQUENCE %s;' % sq_name
         trigger_sql = """
-            CREATE OR REPLACE TRIGGER %s
-            BEFORE INSERT ON %s
+            CREATE OR REPLACE TRIGGER %(tr_name)s
+            BEFORE INSERT ON %(tbl_name)s
             FOR EACH ROW
-            WHEN (new.id IS NULL)
+            WHEN (new.%(col_name)s IS NULL)
                 BEGIN
-                    SELECT %s.nextval INTO :new.id FROM dual;
-                END;/""" % (tr_name, self.quote_name(table), sq_name)
+                    SELECT %(sq_name)s.nextval
+                    INTO :new.%(col_name)s FROM dual;
+                END;/""" % locals()
         return sequence_sql, trigger_sql
 
     def date_extract_sql(self, lookup_type, field_name):
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 3792a30a88..34d998c219 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -433,6 +433,7 @@ class AutoField(Field):
         assert not cls._meta.has_auto_field, "A model can't have more than one AutoField."
         super(AutoField, self).contribute_to_class(cls, name)
         cls._meta.has_auto_field = True
+        cls._meta.auto_field = self
 
     def formfield(self, **kwargs):
         return None
diff --git a/django/db/models/options.py b/django/db/models/options.py
index ad813ae0f7..502cbc4a65 100644
--- a/django/db/models/options.py
+++ b/django/db/models/options.py
@@ -33,7 +33,7 @@ class Options(object):
         self.admin = None
         self.meta = meta
         self.pk = None
-        self.has_auto_field = False
+        self.has_auto_field, self.auto_field = False, None
         self.one_to_one_field = None
         self.parents = []