diff --git a/migrations/README b/migrations/README new file mode 100755 index 0000000000000000000000000000000000000000..98e4f9c44effe479ed38c66ba922e7bcc672916f --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 0000000000000000000000000000000000000000..f8ed4801f78bcb83cc6acb589508c1b24eda297a --- /dev/null +++ b/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 diff --git a/migrations/env.py b/migrations/env.py new file mode 100755 index 0000000000000000000000000000000000000000..4593816063f7964ffd107a2fe0f2f5bfc01b2351 --- /dev/null +++ b/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.readthedocs.org/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() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100755 index 0000000000000000000000000000000000000000..2c0156303a8df3ffdc9de87765bf801bf6bea4a5 --- /dev/null +++ b/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"} diff --git a/migrations/versions/efaa3b4fd3e8_.py b/migrations/versions/efaa3b4fd3e8_.py new file mode 100644 index 0000000000000000000000000000000000000000..3b712ee6b23d28fc4831787acffa121b70352f14 --- /dev/null +++ b/migrations/versions/efaa3b4fd3e8_.py @@ -0,0 +1,131 @@ +"""empty message + +Revision ID: efaa3b4fd3e8 +Revises: +Create Date: 2017-02-22 05:27:41.905321 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'efaa3b4fd3e8' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('protocoltypes', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('name', sa.String(), nullable=True), + sa.Column('short_name', sa.String(), nullable=True), + sa.Column('organization', sa.String(), nullable=True), + sa.Column('is_public', sa.Boolean(), nullable=True), + sa.Column('private_group', sa.String(), nullable=True), + sa.Column('public_group', sa.String(), nullable=True), + sa.Column('private_mail', sa.String(), nullable=True), + sa.Column('public_mail', sa.String(), nullable=True), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('name'), + sa.UniqueConstraint('short_name') + ) + op.create_table('todos', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('who', sa.String(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('tags', sa.String(), nullable=True), + sa.Column('done', sa.Boolean(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('defaulttops', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('protocoltype_id', sa.Integer(), nullable=True), + sa.Column('name', sa.String(), nullable=True), + sa.Column('number', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['protocoltype_id'], ['protocoltypes.id'], ), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('meetingreminders', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('protocoltype_id', sa.Integer(), nullable=True), + sa.Column('time_before', sa.Interval(), nullable=True), + sa.Column('send_public', sa.Boolean(), nullable=True), + sa.Column('send_private', sa.Boolean(), nullable=True), + sa.ForeignKeyConstraint(['protocoltype_id'], ['protocoltypes.id'], ), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('protocols', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('protocoltype_id', sa.Integer(), nullable=True), + sa.Column('source', sa.String(), nullable=True), + sa.Column('date', sa.Date(), nullable=True), + sa.Column('start_time', sa.Time(), nullable=True), + sa.Column('end_time', sa.Time(), nullable=True), + sa.Column('author', sa.String(), nullable=True), + sa.Column('participants', sa.String(), nullable=True), + sa.Column('location', sa.String(), nullable=True), + sa.ForeignKeyConstraint(['protocoltype_id'], ['protocoltypes.id'], ), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('decisions', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('protocol_id', sa.Integer(), nullable=True), + sa.Column('content', sa.String(), nullable=True), + sa.ForeignKeyConstraint(['protocol_id'], ['protocols.id'], ), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('documents', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('protocol_id', sa.Integer(), nullable=True), + sa.Column('name', sa.String(), nullable=True), + sa.Column('filename', sa.String(), nullable=True), + sa.Column('is_compiled', sa.Boolean(), nullable=True), + sa.ForeignKeyConstraint(['protocol_id'], ['protocols.id'], ), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('filename') + ) + op.create_table('errors', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('protocol_id', sa.Integer(), nullable=True), + sa.Column('action', sa.String(), nullable=True), + sa.Column('name', sa.String(), nullable=True), + sa.Column('datetime', sa.DateTime(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.ForeignKeyConstraint(['protocol_id'], ['protocols.id'], ), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('todoprotocolassociations', + sa.Column('todo_id', sa.Integer(), nullable=False), + sa.Column('protocol_id', sa.Integer(), nullable=False), + sa.ForeignKeyConstraint(['protocol_id'], ['protocols.id'], ), + sa.ForeignKeyConstraint(['todo_id'], ['todos.id'], ), + sa.PrimaryKeyConstraint('todo_id', 'protocol_id') + ) + op.create_table('tops', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('protocol_id', sa.Integer(), nullable=True), + sa.Column('name', sa.String(), nullable=True), + sa.Column('number', sa.String(), nullable=True), + sa.Column('planned', sa.Boolean(), nullable=True), + sa.ForeignKeyConstraint(['protocol_id'], ['protocols.id'], ), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('tops') + op.drop_table('todoprotocolassociations') + op.drop_table('errors') + op.drop_table('documents') + op.drop_table('decisions') + op.drop_table('protocols') + op.drop_table('meetingreminders') + op.drop_table('defaulttops') + op.drop_table('todos') + op.drop_table('protocoltypes') + # ### end Alembic commands ### diff --git a/templates/index.html b/templates/index.html index a4c3739bbf4057c3213d0a6d73502260e2fecbe6..edf0aa3a6d7dcfd4bb283866974baea0496d1b4d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,4 +1,4 @@ -{% extends "layout-bootstrap.html" %} +{% extends "layout.html" %} {% block title %}Hauptseite{% endblock %} {% block content %}