* The test suite now runs successfully again with PostgreSQL. Given by

   Aurélien Bompard.  (LP: #1435941)

2 files changed, 16 insertions, 5 deletions

diff --git a/src/mailman/database/factory.py b/src/mailman/database/factory.py
index 7222ba395..8b30b9417 100644
--- a/src/mailman/database/factory.py
+++ b/src/mailman/database/factory.py
@@ -135,6 +135,12 @@ class DatabaseTestingFactory:
         database = call_name(database_class)
         verifyObject(IDatabase, database)
         database.initialize()
+        # Remove existing tables (PostgreSQL will keep them across runs)
+        metadata = MetaData(bind=database.engine)
+        metadata.reflect()
+        metadata.drop_all()
+        database.commit()
+        # Now create the current model without Alembic upgrades.
         Model.metadata.create_all(database.engine)
         database.commit()
         # Make _reset() a bound method of the database instance.
diff --git a/src/mailman/database/postgresql.py b/src/mailman/database/postgresql.py
index 9877f110d..ea6540721 100644
--- a/src/mailman/database/postgresql.py
+++ b/src/mailman/database/postgresql.py
@@ -24,6 +24,7 @@ __all__ = [
 
 from mailman.database.base import SABaseDatabase
 from mailman.database.model import Model
+from sqlalchemy import Integer
 
 
 
@@ -42,8 +43,12 @@ class PostgreSQLDatabase(SABaseDatabase):
         # http://stackoverflow.com/questions/544791/
         # django-postgresql-how-to-reset-primary-key
         for table in tables:
-            store.execute("""\
-                SELECT setval('"{0}_id_seq"', coalesce(max("id"), 1),
-                              max("id") IS NOT null)
-                       FROM "{0}";
-                """.format(table))
+            for column in table.primary_key:
+                if (column.autoincrement
+                        and isinstance(column.type, Integer)
+                        and not column.foreign_keys):
+                    store.execute("""\
+                        SELECT setval('"{0}_{1}_seq"', coalesce(max("{1}"), 1),
+                                      max("{1}") IS NOT null)
+                               FROM "{0}";
+                        """.format(table, column.name))