merge from main

migrations/versions/0219_default_email_branding.py

@@ -1,24 +1,30 @@
 """
  Revision ID: 0219_default_email_branding
-Revises: 0218_another_letter_org
+Revises: 0216_remove_colours
 Create Date: 2018-08-24 13:36:49.346156
  """
 from alembic import op
+from sqlalchemy import text
+
 from app.models import BRANDING_ORG
 
 revision = '0219_default_email_branding'
-down_revision = '0218_another_letter_org'
+down_revision = '0216_remove_colours'
 
 
 def upgrade():
-    op.execute("""
+    conn = op.get_bind()
+    input_params = {
+        "branding_org": BRANDING_ORG
+    }
+    conn.execute(text("""
         update
             email_branding
         set
-            brand_type = '{}'
+            brand_type = :branding_org
         where
             brand_type is null
-    """.format(BRANDING_ORG))
+    """), input_params)
 
 
 def downgrade():