Merge branch 'flask-migration' of https://github.com/hucares/company-website into hucares-flask-migration

Author: joshfraser

env.sh

@@ -22,4 +22,6 @@ then
 fi
 cd $ENV_DIR
 
+export FLASK_APP=main.py
+
 echo "Using virtual environment $VIRTUAL_ENV with project path $PROJECTPATH."

main.py

@@ -9,6 +9,9 @@
 from views import service_views
 from views import web_views
 
+from flask_migrate import Migrate
+from database import db
+
 # Silence pyflakes
 assert patches
 assert service_views
@@ -19,7 +22,9 @@
 
 app_config.init_prod_app(app)
 
+migrate = Migrate(app, db)
+
 if __name__ == '__main__':
-	app.debug = constants.DEBUG
-	port = int(os.environ.get("PORT", 5000))
-	app.run(host='0.0.0.0', port=port, threaded=True)
+    app.debug = constants.DEBUG
+    port = int(os.environ.get("PORT", 5000))
+    app.run(host='0.0.0.0', port=port, threaded=True)

migrations/README

@@ -0,0 +1 @@
+Generic single-database configuration.

migrations/alembic.ini

@@ -0,0 +1,45 @@
+# A generic, single database configuration.
+
+[alembic]
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S

migrations/env.py

@@ -0,0 +1,87 @@
+from __future__ import with_statement
+from alembic import context
+from sqlalchemy import engine_from_config, pool
+from logging.config import fileConfig
+import logging
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+fileConfig(config.config_file_name)
+logger = logging.getLogger('alembic.env')
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+from flask import current_app
+config.set_main_option('sqlalchemy.url',
+                       current_app.config.get('SQLALCHEMY_DATABASE_URI'))
+target_metadata = current_app.extensions['migrate'].db.metadata
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+
+def run_migrations_offline():
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(url=url)
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online():
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+
+    # this callback is used to prevent an auto-migration from being generated
+    # when there are no changes to the schema
+    # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html
+    def process_revision_directives(context, revision, directives):
+        if getattr(config.cmd_opts, 'autogenerate', False):
+            script = directives[0]
+            if script.upgrade_ops.is_empty():
+                directives[:] = []
+                logger.info('No changes in schema detected.')
+
+    engine = engine_from_config(config.get_section(config.config_ini_section),
+                                prefix='sqlalchemy.',
+                                poolclass=pool.NullPool)
+
+    connection = engine.connect()
+    context.configure(connection=connection,
+                      target_metadata=target_metadata,
+                      process_revision_directives=process_revision_directives,
+                      **current_app.extensions['migrate'].configure_args)
+
+    try:
+        with context.begin_transaction():
+            context.run_migrations()
+    finally:
+        connection.close()
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

migrations/script.py.mako

@@ -0,0 +1,24 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision = ${repr(up_revision)}
+down_revision = ${repr(down_revision)}
+branch_labels = ${repr(branch_labels)}
+depends_on = ${repr(depends_on)}
+
+
+def upgrade():
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade():
+    ${downgrades if downgrades else "pass"}

migrations/versions/77799c791f03_.py

@@ -0,0 +1,71 @@
+"""empty message
+
+Revision ID: 77799c791f03
+Revises: 
+Create Date: 2018-01-30 14:11:55.771532
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '77799c791f03'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('email_list',
+    sa.Column('email', sa.String(length=255), autoincrement=False, nullable=False),
+    sa.Column('unsubscribed', sa.Boolean(), nullable=True),
+    sa.PrimaryKeyConstraint('email')
+    )
+    op.create_table('interest',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('name', sa.String(length=255), nullable=True),
+    sa.Column('company_name', sa.String(length=255), nullable=True),
+    sa.Column('email', sa.String(length=255), nullable=True),
+    sa.Column('website', sa.String(length=255), nullable=True),
+    sa.Column('note', sa.Text(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('message_log',
+    sa.Column('id', sa.BigInteger(), nullable=False),
+    sa.Column('email', sa.String(length=255), nullable=True),
+    sa.Column('msg_purpose', sa.String(length=128), nullable=True),
+    sa.Column('msg_subject', sa.String(length=128), nullable=True),
+    sa.Column('msg_text', sa.Text(), nullable=True),
+    sa.Column('msg_html', sa.Text(), nullable=True),
+    sa.Column('msg_sent', sa.DateTime(timezone=True), server_default=sa.text(u'now()'), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_message_log_email'), 'message_log', ['email'], unique=False)
+    op.create_index(op.f('ix_message_log_msg_purpose'), 'message_log', ['msg_purpose'], unique=False)
+    op.create_table('presale',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('full_name', sa.String(length=255), nullable=True),
+    sa.Column('email', sa.String(length=255), nullable=True),
+    sa.Column('accredited', sa.Boolean(), nullable=True),
+    sa.Column('entity_type', sa.String(length=255), nullable=True),
+    sa.Column('desired_allocation', sa.String(length=255), nullable=True),
+    sa.Column('desired_allocation_currency', sa.String(length=3), nullable=True),
+    sa.Column('citizenship', sa.String(length=2), nullable=True),
+    sa.Column('sending_addr', sa.String(length=255), nullable=True),
+    sa.Column('note', sa.Text(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('presale')
+    op.drop_index(op.f('ix_message_log_msg_purpose'), table_name='message_log')
+    op.drop_index(op.f('ix_message_log_email'), table_name='message_log')
+    op.drop_table('message_log')
+    op.drop_table('interest')
+    op.drop_table('email_list')
+    # ### end Alembic commands ###

requirements.txt

@@ -15,6 +15,7 @@ enum34==1.1.6
 Flask==0.12.2
 Flask-Babel==0.11.2
 Flask-Compress==1.4.0
+Flask-Migrate==2.1.1
 Flask-SQLAlchemy==2.3.2
 gnureadline==6.3.8
 gunicorn==19.7.1