Merge pull request #1017 from alphagov/fix-migration-conflict

Fix conflict in db migration script
This commit is contained in:
Rebecca Law
2017-06-06 11:17:31 +01:00
committed by GitHub

View File

@@ -1,14 +1,14 @@
"""empty message """empty message
Revision ID: 0092_data_gov_uk Revision ID: 0093_data_gov_uk
Revises: 0091_letter_billing Revises: 0092_add_inbound_provider
Create Date: 2017-06-05 16:15:17.744908 Create Date: 2017-06-05 16:15:17.744908
""" """
# revision identifiers, used by Alembic. # revision identifiers, used by Alembic.
revision = '0092_data_gov_uk' revision = '0093_data_gov_uk'
down_revision = '0091_letter_billing' down_revision = '0092_add_inbound_provider'
from alembic import op from alembic import op
import sqlalchemy as sa import sqlalchemy as sa
@@ -16,6 +16,7 @@ from sqlalchemy.dialects import postgresql
DATA_GOV_UK_ID = '123496d4-44cb-4324-8e0a-4187101f4bdc' DATA_GOV_UK_ID = '123496d4-44cb-4324-8e0a-4187101f4bdc'
def upgrade(): def upgrade():
op.execute("""INSERT INTO organisation VALUES ( op.execute("""INSERT INTO organisation VALUES (
'{}', '{}',