GNU Mailman

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

  1. lp1435941
  2. Merge into 3.0
Proposed by Barry Warsaw
Status: Rejected
Rejected by: Barry Warsaw
Proposed branch: lp:~barry/mailman/lp1435941
Merge into: lp:mailman
Diff against target: 70 lines (+11/-2)
5 files modified
src/mailman/database/alembic/versions/2bb9b382198_workflow_state_table.py (+3/-1)
src/mailman/database/alembic/versions/46e92facee7_add_serverowner_domainowner.py (+1/-0)
src/mailman/docs/RELEASENOTES.rst (+4/-0)
src/mailman/model/user.py (+1/-0)
src/mailman/model/workflow.py (+2/-1)
To merge this branch: bzr merge lp:~barry/mailman/lp1435941
Reviewer Review Type Date Requested Status
Mailman Coders Pending
Review via email: mp+257022@code.launchpad.net

Description of the change

Try to make the test suite run under PostgreSQL

To post a comment you must log in.

Unmerged revisions

7336. By Barry Warsaw

Add column ids, although this causes other problems.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/mailman/database/alembic/versions/2bb9b382198_workflow_state_table.py'
2--- src/mailman/database/alembic/versions/2bb9b382198_workflow_state_table.py 2015-03-29 21:14:09 +0000
3+++ src/mailman/database/alembic/versions/2bb9b382198_workflow_state_table.py 2015-04-22 01:54:07 +0000
4@@ -15,7 +15,9 @@
5
6
7 def upgrade():
8- op.create_table('workflowstate',
9+ op.create_table(
10+ 'workflowstate',
11+ sa.Column('id', sa.Integer(), nullable=False),
12 sa.Column('name', sa.Unicode(), nullable=False),
13 sa.Column('key', sa.Unicode(), nullable=False),
14 sa.Column('step', sa.Unicode(), nullable=True),
15
16=== modified file 'src/mailman/database/alembic/versions/46e92facee7_add_serverowner_domainowner.py'
17--- src/mailman/database/alembic/versions/46e92facee7_add_serverowner_domainowner.py 2015-04-06 23:07:42 +0000
18+++ src/mailman/database/alembic/versions/46e92facee7_add_serverowner_domainowner.py 2015-04-22 01:54:07 +0000
19@@ -34,6 +34,7 @@
20 def upgrade():
21 op.create_table(
22 'domain_owner',
23+ sa.Column('id', sa.Integer(), nullable=False),
24 sa.Column('user_id', sa.Integer(), nullable=False),
25 sa.Column('domain_id', sa.Integer(), nullable=False),
26 sa.ForeignKeyConstraint(['domain_id'], ['domain.id'], ),
27
28=== modified file 'src/mailman/docs/RELEASENOTES.rst'
29--- src/mailman/docs/RELEASENOTES.rst 2015-04-18 01:35:01 +0000
30+++ src/mailman/docs/RELEASENOTES.rst 2015-04-22 01:54:07 +0000
31@@ -21,3 +21,7 @@
32 The documentation here describes the Mailman Core in great detail.
33 Postorius, Hyperkitty, mailman.client, and the bundler are described and
34 developed elsewhere.
35+
36+More release notes are maintained on the `Mailman wiki`_.
37+
38+.. _`Mailman wiki`: http://wiki.list.org/Mailman3
39
40=== modified file 'src/mailman/model/user.py'
41--- src/mailman/model/user.py 2015-04-06 23:07:42 +0000
42+++ src/mailman/model/user.py 2015-04-22 01:54:07 +0000
43@@ -186,5 +186,6 @@
44
45 __tablename__ = 'domain_owner'
46
47+ id = Column(Integer, primary_key=True)
48 user_id = Column(Integer, ForeignKey('user.id'), primary_key=True)
49 domain_id = Column(Integer, ForeignKey('domain.id'), primary_key=True)
50
51=== modified file 'src/mailman/model/workflow.py'
52--- src/mailman/model/workflow.py 2015-04-14 22:54:05 +0000
53+++ src/mailman/model/workflow.py 2015-04-22 01:54:07 +0000
54@@ -26,7 +26,7 @@
55 from mailman.database.model import Model
56 from mailman.database.transaction import dbconnection
57 from mailman.interfaces.workflow import IWorkflowState, IWorkflowStateManager
58-from sqlalchemy import Column, Unicode
59+from sqlalchemy import Column, Integer, Unicode
60 from zope.interface import implementer
61
62
63@@ -37,6 +37,7 @@
64
65 __tablename__ = 'workflowstate'
66
67+ id = Column(Integer, primary_key=True)
68 name = Column(Unicode, primary_key=True)
69 token = Column(Unicode, primary_key=True)
70 step = Column(Unicode)