Merge lp:~barry/mailman/lp1435941 into lp:mailman

[Barry Warsaw]

Try to make the test suite run under PostgreSQL

Unmerged revisions

7336. By Barry Warsaw on 2015-04-22

Add column ids, although this causes other problems.

=== modified file 'src/mailman/database/alembic/versions/2bb9b382198_workflow_state_table.py'
--- src/mailman/database/alembic/versions/2bb9b382198_workflow_state_table.py	2015-03-29 21:14:09 +0000
+++ src/mailman/database/alembic/versions/2bb9b382198_workflow_state_table.py	2015-04-22 01:54:07 +0000
@@ -15,7 +15,9 @@
 
 
 def upgrade():
-    op.create_table('workflowstate',
+    op.create_table(
+        'workflowstate',
+        sa.Column('id', sa.Integer(), nullable=False),
         sa.Column('name', sa.Unicode(), nullable=False),
         sa.Column('key', sa.Unicode(), nullable=False),
         sa.Column('step', sa.Unicode(), nullable=True),
 
=== modified file 'src/mailman/database/alembic/versions/46e92facee7_add_serverowner_domainowner.py'
--- src/mailman/database/alembic/versions/46e92facee7_add_serverowner_domainowner.py	2015-04-06 23:07:42 +0000
+++ src/mailman/database/alembic/versions/46e92facee7_add_serverowner_domainowner.py	2015-04-22 01:54:07 +0000
@@ -34,6 +34,7 @@
 def upgrade():
     op.create_table(
         'domain_owner',
+        sa.Column('id', sa.Integer(), nullable=False),
         sa.Column('user_id', sa.Integer(), nullable=False),
         sa.Column('domain_id', sa.Integer(), nullable=False),
         sa.ForeignKeyConstraint(['domain_id'], ['domain.id'], ),
 
=== modified file 'src/mailman/docs/RELEASENOTES.rst'
--- src/mailman/docs/RELEASENOTES.rst	2015-04-18 01:35:01 +0000
+++ src/mailman/docs/RELEASENOTES.rst	2015-04-22 01:54:07 +0000
@@ -21,3 +21,7 @@
 The documentation here describes the Mailman Core in great detail.
 Postorius, Hyperkitty, mailman.client, and the bundler are described and
 developed elsewhere.
+
+More release notes are maintained on the `Mailman wiki`_.
+
+.. _`Mailman wiki`: http://wiki.list.org/Mailman3
 
=== modified file 'src/mailman/model/user.py'
--- src/mailman/model/user.py	2015-04-06 23:07:42 +0000
+++ src/mailman/model/user.py	2015-04-22 01:54:07 +0000
@@ -186,5 +186,6 @@
 
     __tablename__ = 'domain_owner'
 
+    id = Column(Integer, primary_key=True)
     user_id = Column(Integer, ForeignKey('user.id'), primary_key=True)
     domain_id = Column(Integer, ForeignKey('domain.id'), primary_key=True)
 
=== modified file 'src/mailman/model/workflow.py'
--- src/mailman/model/workflow.py	2015-04-14 22:54:05 +0000
+++ src/mailman/model/workflow.py	2015-04-22 01:54:07 +0000
@@ -26,7 +26,7 @@
 from mailman.database.model import Model
 from mailman.database.transaction import dbconnection
 from mailman.interfaces.workflow import IWorkflowState, IWorkflowStateManager
-from sqlalchemy import Column, Unicode
+from sqlalchemy import Column, Integer, Unicode
 from zope.interface import implementer
 
 
@@ -37,6 +37,7 @@
 
     __tablename__ = 'workflowstate'
 
+    id = Column(Integer, primary_key=True)
     name = Column(Unicode, primary_key=True)
     token = Column(Unicode, primary_key=True)
     step = Column(Unicode)