Ticket #13295: postgresql_name_seq.2.diff

django/db/models/sql/compiler.

@@ -785 +785 @@
             return
         if self.connection.features.can_return_id_from_insert:
             return self.connection.ops.fetch_returned_insert_id(cursor)
-        return self.connection.ops.last_insert_id(cursor,
+        if 'db_seq' in self.query.model._meta.__dict__:
+            return self.connection.ops.last_insert_id(cursor,
+                self.query.model._meta.db_seq, '')
+        else:
+            return self.connection.ops.last_insert_id(cursor,
                 self.query.model._meta.db_table, self.query.model._meta.pk.column)
 
 

django/db/models/options.

@@ -18 +18 @@
 # Calculate the verbose_name by converting from InitialCaps to "lowercase with spaces".
 get_verbose_name = lambda class_name: re.sub('(((?<=[a-z])[A-Z])|([A-Z](?![A-Z]|$)))', ' \\1', class_name).lower().strip()
 
-DEFAULT_NAMES = ('verbose_name', 'db_table', 'ordering',
+DEFAULT_NAMES = ('verbose_name', 'db_table', 'ordering', 'db_seq',
                  'unique_together', 'permissions', 'get_latest_by',
                  'order_with_respect_to', 'app_label', 'db_tablespace',
                  'abstract', 'managed', 'proxy', 'auto_created')
@@ -30 +30 @@
         self.module_name, self.verbose_name = None, None
         self.verbose_name_plural = None
         self.db_table = ''
+        self.db_seq = ''
         self.ordering = []
         self.unique_together =  []
         self.permissions =  []

django/db/backends/postgresql/operations.

@@ -54 +54 @@
         return '%s'
 
     def last_insert_id(self, cursor, table_name, pk_name):
-        cursor.execute("SELECT CURRVAL('\"%s_%s_seq\"')" % (table_name, pk_name))
+        if pk_name:
+            cursor.execute("SELECT CURRVAL('\"%s_%s_seq\"')" % (table_name, pk_name))
+        else:
+            cursor.execute("SELECT CURRVAL('\"%s_seq\"')" % table_name)
         return cursor.fetchone()[0]
 
     def no_limit_value(self):