darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 01:41:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1710 from alphagov/org-user-endpionts

Browse Source 
Fix db migration conflicts
This commit is contained in:
Rebecca Law
2018-02-26 16:57:32 +00:00
committed by GitHub
parent 7faf375375 0728c9f41a
commit 6886cfcd82
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
migrations/versions/0168_add_org_invite_template.py → migrations/versions/0171_add_org_invite_template.py
View File

@@ -1,7 +1,7 @@
""" """
Revision ID: 0168_add_org_invite_template Revision ID: 0171_add_org_invite_template
Revises: 0167_add_precomp_letter_svc_perm Revises: 0170_hidden_non_nullable
Create Date: 2018-02-16 14:16:43.618062 Create Date: 2018-02-16 14:16:43.618062
""" """
@@ -11,8 +11,8 @@ from alembic import op
from flask import current_app from flask import current_app
revision = '0168_add_org_invite_template' revision = '0171_add_org_invite_template'
down_revision = '0167_add_precomp_letter_svc_perm' down_revision = '0170_hidden_non_nullable'
template_id = '203566f0-d835-47c5-aa06-932439c86573' template_id = '203566f0-d835-47c5-aa06-932439c86573'
@@ -20,12 +20,14 @@ template_id = '203566f0-d835-47c5-aa06-932439c86573'
def upgrade(): def upgrade():
template_insert = """ template_insert = """
INSERT INTO templates (id, name, template_type, created_at, content, archived, service_id, subject, created_by_id, version, process_type) INSERT INTO templates (id, name, template_type, created_at, content, archived, service_id, subject,
VALUES ('{}', '{}', '{}', '{}', '{}', False, '{}', '{}', '{}', 1, '{}') created_by_id, version, process_type, hidden)
VALUES ('{}', '{}', '{}', '{}', '{}', False, '{}', '{}', '{}', 1, '{}', false)
""" """
template_history_insert = """ template_history_insert = """
INSERT INTO templates_history (id, name, template_type, created_at, content, archived, service_id, subject, created_by_id, version, process_type) INSERT INTO templates_history (id, name, template_type, created_at, content, archived, service_id, subject,
VALUES ('{}', '{}', '{}', '{}', '{}', False, '{}', '{}', '{}', 1, '{}') created_by_id, version, process_type, hidden)
VALUES ('{}', '{}', '{}', '{}', '{}', False, '{}', '{}', '{}', 1, '{}', false)
""" """
template_content = '\n'.join([ template_content = '\n'.join([