diff --git a/app.py b/app.py index 8909503..00c94e2 100644 --- a/app.py +++ b/app.py @@ -4,6 +4,7 @@ from flask import session from flask import request from flask import redirect from flask import url_for +from flask_migrate import Migrate from werkzeug.security import generate_password_hash, check_password_hash @@ -90,4 +91,6 @@ def game_answer(): message = "You are not correct !" return render_template("game/answer.html", message=message) elif request.method == "GET": - return render_template("game/new.html") \ No newline at end of file + return render_template("game/new.html") + +migrate = Migrate(app, db) \ No newline at end of file diff --git a/migrations/README b/migrations/README new file mode 100644 index 0000000..0e04844 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Single-database configuration for Flask. diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 0000000..ec9d45c --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,50 @@ +# 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,flask_migrate + +[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 + +[logger_flask_migrate] +level = INFO +handlers = +qualname = flask_migrate + +[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 100644 index 0000000..68feded --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,91 @@ +from __future__ import with_statement + +import logging +from logging.config import fileConfig + +from flask import current_app + +from alembic import context + +# 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 +config.set_main_option( + 'sqlalchemy.url', + str(current_app.extensions['migrate'].db.get_engine().url).replace( + '%', '%%')) +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, target_metadata=target_metadata, literal_binds=True + ) + + 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.') + + connectable = current_app.extensions['migrate'].db.get_engine() + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=target_metadata, + process_revision_directives=process_revision_directives, + **current_app.extensions['migrate'].configure_args + ) + + with context.begin_transaction(): + context.run_migrations() + + +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 100644 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/d9b0e75aca5e_initial_migration.py b/migrations/versions/d9b0e75aca5e_initial_migration.py new file mode 100644 index 0000000..f84c16e --- /dev/null +++ b/migrations/versions/d9b0e75aca5e_initial_migration.py @@ -0,0 +1,34 @@ +"""Initial migration. + +Revision ID: d9b0e75aca5e +Revises: +Create Date: 2022-05-26 10:57:06.959999 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'd9b0e75aca5e' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('userscore', + sa.Column('user_id', sa.Integer(), nullable=False), + sa.Column('score_value', sa.Integer(), nullable=True), + sa.Column('user_level', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['user_id'], ['user.id'], ), + sa.PrimaryKeyConstraint('user_id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('userscore') + # ### end Alembic commands ### diff --git a/model.py b/model.py index 1f2e38b..65b51ea 100644 --- a/model.py +++ b/model.py @@ -1,4 +1,5 @@ from flask_sqlalchemy import SQLAlchemy +from sqlalchemy.orm import declarative_base, relationship db = SQLAlchemy() @@ -8,4 +9,14 @@ class User(db.Model): id = db.Column(db.Integer, primary_key=True) username = db.Column(db.String(64), unique=True) email = db.Column(db.String(64), unique=True, index=True) - password = db.Column(db.String(128)) \ No newline at end of file + password = db.Column(db.String(128)) + +class Score(db.Model): + __tablename__ = 'userscore' + + user_id = db.Column(db.Integer, db.ForeignKey(User.id), primary_key=True) + score_value = db.Column(db.Integer) + user_level = db.Column(db.Integer, default = 1) + user = relationship("User", foreign_keys="User.id") + + \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 197bdb6..18f21ff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,12 @@ +alembic==1.7.7 click==8.1.3 Flask==2.1.2 +Flask-Migrate==3.1.0 Flask-SQLAlchemy==2.5.1 greenlet==1.1.2 itsdangerous==2.1.2 Jinja2==3.1.2 +Mako==1.2.0 MarkupSafe==2.1.1 mysql-connector-python==8.0.29 protobuf==3.20.1