Ticket #11107: many_to_many.rel.through.4.diff

django/db/backends/postgresql/operations.py

@@ -121 +121 @@
                         style.SQL_TABLE(qn(model._meta.db_table))))
                     break # Only one AutoField is allowed per model, so don't bother continuing.
             for f in model._meta.many_to_many:
-                output.append("%s setval('%s', coalesce(max(%s), 1), max(%s) %s null) %s %s;" % \
-                    (style.SQL_KEYWORD('SELECT'),
-                    style.SQL_FIELD(qn('%s_id_seq' % f.m2m_db_table())),
-                    style.SQL_FIELD(qn('id')),
-                    style.SQL_FIELD(qn('id')),
-                    style.SQL_KEYWORD('IS NOT'),
-                    style.SQL_KEYWORD('FROM'),
-                    style.SQL_TABLE(qn(f.m2m_db_table()))))
+                if not f.rel.through:
+                    output.append("%s setval('%s', coalesce(max(%s), 1), max(%s) %s null) %s %s;" % \
+                        (style.SQL_KEYWORD('SELECT'),
+                        style.SQL_FIELD(qn('%s_id_seq' % f.m2m_db_table())),
+                        style.SQL_FIELD(qn('id')),
+                        style.SQL_FIELD(qn('id')),
+                        style.SQL_KEYWORD('IS NOT'),
+                        style.SQL_KEYWORD('FROM'),
+                        style.SQL_TABLE(qn(f.m2m_db_table()))))
         return output
 
     def savepoint_create_sql(self, sid):

django/db/backends/oracle/base.py

@@ -217 +217 @@
                     # continue to loop
                     break
             for f in model._meta.many_to_many:
-                table_name = self.quote_name(f.m2m_db_table())
-                sequence_name = get_sequence_name(f.m2m_db_table())
-                column_name = self.quote_name('id')
-                output.append(query % {'sequence': sequence_name,
-                                       'table': table_name,
-                                       'column': column_name})
+                if not f.rel.through:
+                    table_name = self.quote_name(f.m2m_db_table())
+                    sequence_name = get_sequence_name(f.m2m_db_table())
+                    column_name = self.quote_name('id')
+                    output.append(query % {'sequence': sequence_name,
+                                           'table': table_name,
+                                           'column': column_name})
         return output
 
     def start_transaction_sql(self):

tests/regressiontests/m2m_through_regress/models.py

@@ -12 +12 @@
     def __unicode__(self):
         return "%s is a member of %s" % (self.person.name, self.group.name)
 
+# using custom id column to test ticket #11107
 class UserMembership(models.Model):
+    id = models.AutoField(db_column='usermembership_id', primary_key=True)
     user = models.ForeignKey(User)
     group = models.ForeignKey('Group')
     price = models.IntegerField(default=100)
@@ -196 +198 @@
 # Flush the database, just to make sure we can.
 >>> management.call_command('flush', verbosity=0, interactive=False)
 
+## Regression test for #11107
+Ensure that sequences on m2m_through tables are being created for the through
+model, not for a phantom auto-generated m2m table.
+
+>>> management.call_command('sqlsequencereset', 'm2m_through_regress')
+BEGIN;
+SELECT setval('"m2m_through_regress_membership_id_seq"', coalesce(max("id"), 1), max("id") IS NOT null) FROM "m2m_through_regress_membership";
+SELECT setval('"m2m_through_regress_usermembership_usermembership_id_seq"', coalesce(max("usermembership_id"), 1), max("usermembership_id") IS NOT null) FROM "m2m_through_regress_usermembership";
+SELECT setval('"m2m_through_regress_person_id_seq"', coalesce(max("id"), 1), max("id") IS NOT null) FROM "m2m_through_regress_person";
+SELECT setval('"m2m_through_regress_group_id_seq"', coalesce(max("id"), 1), max("id") IS NOT null) FROM "m2m_through_regress_group";
+SELECT setval('"m2m_through_regress_a_id_seq"', coalesce(max("id"), 1), max("id") IS NOT null) FROM "m2m_through_regress_a";
+SELECT setval('"m2m_through_regress_throughbase_id_seq"', coalesce(max("id"), 1), max("id") IS NOT null) FROM "m2m_through_regress_throughbase";
+SELECT setval('"m2m_through_regress_b_id_seq"', coalesce(max("id"), 1), max("id") IS NOT null) FROM "m2m_through_regress_b";
+COMMIT;
 """}