From 4a54d870b36795b1ca1cf5780f58973df9f27b0b Mon Sep 17 00:00:00 2001 From: Simon Milvert Date: Tue, 22 Aug 2017 13:39:25 +0200 Subject: [PATCH] First try with db and sqlalchemy --- app/__init__.py | 19 ++++++ app/models.py | 19 ++++++ config.py | 28 +++++++++ instance/config.py | 4 ++ migrations/README | 1 + migrations/alembic.ini | 45 ++++++++++++++ migrations/env.py | 87 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++++ migrations/versions/46b4c05512b3_.py | 36 ++++++++++++ run.py | 11 ++++ 10 files changed, 274 insertions(+) create mode 100644 app/__init__.py create mode 100644 app/models.py create mode 100644 config.py create mode 100644 instance/config.py create mode 100755 migrations/README create mode 100644 migrations/alembic.ini create mode 100755 migrations/env.py create mode 100755 migrations/script.py.mako create mode 100644 migrations/versions/46b4c05512b3_.py create mode 100644 run.py diff --git a/app/__init__.py b/app/__init__.py new file mode 100644 index 0000000..a360ae6 --- /dev/null +++ b/app/__init__.py @@ -0,0 +1,19 @@ +from flask import Flask +from flask_sqlalchemy import SQLAlchemy +from flask_migrate import Migrate +from config import app_config + +db = SQLAlchemy() +def create_app(config_name): + app = Flask(__name__, instance_relative_config=True) + app.config.from_object(app_config[config_name]) + app.config.from_pyfile('config.py') + db.init_app(app) + from app import models + migrate = Migrate(app, db) + + @app.route('/') + def hello_world(): + return 'Hello, World!' + + return app diff --git a/app/models.py b/app/models.py new file mode 100644 index 0000000..76ee162 --- /dev/null +++ b/app/models.py @@ -0,0 +1,19 @@ +from app import db +from datetime import datetime + +class Gas(db.Model): + """ + Create a gas table + """ + + __tablename__ = 'gas' + + id = db.Column(db.Integer, primary_key=True) + price = db.Column(db.Integer) + volume = db.Column(db.Integer) + milage = db.Column(db.Integer) + date = db.Column(db.DateTime, default=datetime.utcnow) + winterTyre = db.Column(db.Boolean) + + def __ref__(self): + return ''.format(self.id) diff --git a/config.py b/config.py new file mode 100644 index 0000000..f025a6d --- /dev/null +++ b/config.py @@ -0,0 +1,28 @@ +# config.py + +class Config(object): + """ + Common configurations + """ + + # Put any configurations here that are common across all environments + +class DevelopmentConfig(Config): + """ + Development configurations + """ + + DEBUG = True + SQLALCHEMY_ECHO = True + +class ProductionConfig(Config): + """ + Production configurations + """ + + DEBUG = False + +app_config = { + 'development': DevelopmentConfig, + 'production': ProductionConfig + } diff --git a/instance/config.py b/instance/config.py new file mode 100644 index 0000000..c954d3a --- /dev/null +++ b/instance/config.py @@ -0,0 +1,4 @@ +# instance/config.py + +SECRET_KEY = 'p9Bv<3Eid9%$i01' +SQLALCHEMY_DATABASE_URI = 'mysql://bensin:bajsa@localhost/bensin' diff --git a/migrations/README b/migrations/README new file mode 100755 index 0000000..98e4f9c --- /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 0000000..f8ed480 --- /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 0000000..23663ff --- /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.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() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100755 index 0000000..2c01563 --- /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/46b4c05512b3_.py b/migrations/versions/46b4c05512b3_.py new file mode 100644 index 0000000..66ce48f --- /dev/null +++ b/migrations/versions/46b4c05512b3_.py @@ -0,0 +1,36 @@ +"""empty message + +Revision ID: 46b4c05512b3 +Revises: +Create Date: 2017-08-22 13:25:11.487648 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '46b4c05512b3' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('gas', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('price', sa.Integer(), nullable=True), + sa.Column('volume', sa.Integer(), nullable=True), + sa.Column('milage', sa.Integer(), nullable=True), + sa.Column('date', sa.DateTime(), nullable=True), + sa.Column('winterTyre', sa.Boolean(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('gas') + # ### end Alembic commands ### diff --git a/run.py b/run.py new file mode 100644 index 0000000..85db4d3 --- /dev/null +++ b/run.py @@ -0,0 +1,11 @@ +# run.py + +import os + +from app import create_app + +config_name = os.getenv('FLASK_CONFIG') +app = create_app(config_name) + +if __name__ == '__main__': + app.run()