From 2db55c3d261ddee52019bbd06dc5f6545db39c16 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 2 Jun 2020 16:09:59 +0200 Subject: form for making a new graph. add username field to db --- cli/app/sql/common.py | 1 - cli/app/sql/models/graph.py | 2 + cli/app/sql/models/page.py | 2 + .../sql/versions/202006011943_adding_database.py | 66 ------------------ .../sql/versions/202006011944_adding_uploads.py | 37 ---------- .../sql/versions/202006021608_creating_database.py | 78 ++++++++++++++++++++++ 6 files changed, 82 insertions(+), 104 deletions(-) delete mode 100644 cli/app/sql/versions/202006011943_adding_database.py delete mode 100644 cli/app/sql/versions/202006011944_adding_uploads.py create mode 100644 cli/app/sql/versions/202006021608_creating_database.py (limited to 'cli') diff --git a/cli/app/sql/common.py b/cli/app/sql/common.py index d007e23..c8bd557 100644 --- a/cli/app/sql/common.py +++ b/cli/app/sql/common.py @@ -21,7 +21,6 @@ from app.settings import app_cfg os.makedirs(app_cfg.DIR_DATABASE, exist_ok=True) connection_url = "sqlite:///{}".format(os.path.join(app_cfg.DIR_DATABASE, 'swimmer.sqlite3')) -print(connection_url) engine = create_engine(connection_url, encoding="utf-8", pool_recycle=3600) diff --git a/cli/app/sql/models/graph.py b/cli/app/sql/models/graph.py index 1f553e9..0d3fdab 100644 --- a/cli/app/sql/models/graph.py +++ b/cli/app/sql/models/graph.py @@ -17,6 +17,7 @@ class Graph(Base): id = Column(Integer, primary_key=True) path = Column(String(64, convert_unicode=True), nullable=False) title = Column(String(64, convert_unicode=True), nullable=False) + username = Column(String(32, convert_unicode=True), nullable=False) description = Column(Text(convert_unicode=True), nullable=False) settings = Column(JSON, default={}, nullable=True) created_at = Column(UtcDateTime(), default=utcnow()) @@ -29,6 +30,7 @@ class Graph(Base): 'id': self.id, 'path': self.path, 'title': self.title, + 'username': self.username, 'description': self.description, 'settings': self.settings, 'created_at': self.created_at, diff --git a/cli/app/sql/models/page.py b/cli/app/sql/models/page.py index f23db8d..22fcc96 100644 --- a/cli/app/sql/models/page.py +++ b/cli/app/sql/models/page.py @@ -16,6 +16,7 @@ class Page(Base): graph_id = Column(Integer, ForeignKey('graph.id'), nullable=True) path = Column(String(64, convert_unicode=True), nullable=False) title = Column(String(64, convert_unicode=True), nullable=False) + username = Column(String(32, convert_unicode=True), nullable=False) description = Column(Text(convert_unicode=True), nullable=False) settings = Column(JSON, default={}, nullable=True) created_at = Column(UtcDateTime(), default=utcnow()) @@ -29,6 +30,7 @@ class Page(Base): 'graph_id': self.graph_id, 'path': self.path, 'title': self.title, + 'username': self.username, 'description': self.description, 'settings': self.settings, 'created_at': self.created_at, diff --git a/cli/app/sql/versions/202006011943_adding_database.py b/cli/app/sql/versions/202006011943_adding_database.py deleted file mode 100644 index 4e5b0e6..0000000 --- a/cli/app/sql/versions/202006011943_adding_database.py +++ /dev/null @@ -1,66 +0,0 @@ -"""adding database - -Revision ID: 7acd0c82a048 -Revises: -Create Date: 2020-06-01 19:43:53.359855 - -""" -from alembic import op -import sqlalchemy as sa -import sqlalchemy_utc - - -# revision identifiers, used by Alembic. -revision = '7acd0c82a048' -down_revision = None -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.create_table('graph', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('path', sa.String(length=64, _expect_unicode=True), nullable=False), - sa.Column('title', sa.String(length=64, _expect_unicode=True), nullable=False), - sa.Column('description', sa.Text(_expect_unicode=True), nullable=False), - sa.Column('settings', sa.JSON(), nullable=True), - sa.Column('created_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True), - sa.Column('updated_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True), - sa.PrimaryKeyConstraint('id') - ) - op.create_table('page', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('graph_id', sa.Integer(), nullable=True), - sa.Column('path', sa.String(length=64, _expect_unicode=True), nullable=False), - sa.Column('title', sa.String(length=64, _expect_unicode=True), nullable=False), - sa.Column('description', sa.Text(_expect_unicode=True), nullable=False), - sa.Column('settings', sa.JSON(), nullable=True), - sa.Column('created_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True), - sa.Column('updated_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True), - sa.ForeignKeyConstraint(['graph_id'], ['graph.id'], ), - sa.PrimaryKeyConstraint('id') - ) - op.create_table('tile', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('graph_id', sa.Integer(), nullable=True), - sa.Column('page_id', sa.Integer(), nullable=True), - sa.Column('target_page_id', sa.Integer(), nullable=True), - sa.Column('type', sa.String(length=16, _expect_unicode=True), nullable=False), - sa.Column('settings', sa.JSON(), nullable=True), - sa.Column('created_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True), - sa.Column('updated_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True), - sa.ForeignKeyConstraint(['graph_id'], ['graph.id'], ), - sa.ForeignKeyConstraint(['page_id'], ['page.id'], ), - sa.ForeignKeyConstraint(['target_page_id'], ['page.id'], ), - sa.PrimaryKeyConstraint('id') - ) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_table('tile') - op.drop_table('page') - op.drop_table('graph') - # ### end Alembic commands ### diff --git a/cli/app/sql/versions/202006011944_adding_uploads.py b/cli/app/sql/versions/202006011944_adding_uploads.py deleted file mode 100644 index f09f013..0000000 --- a/cli/app/sql/versions/202006011944_adding_uploads.py +++ /dev/null @@ -1,37 +0,0 @@ -"""adding uploads - -Revision ID: 5b926731a4ac -Revises: 7acd0c82a048 -Create Date: 2020-06-01 19:44:30.400513 - -""" -from alembic import op -import sqlalchemy as sa -import sqlalchemy_utc - - -# revision identifiers, used by Alembic. -revision = '5b926731a4ac' -down_revision = '7acd0c82a048' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.create_table('upload', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('sha256', sa.String(length=256), nullable=False), - sa.Column('fn', sa.String(length=256), nullable=False), - sa.Column('ext', sa.String(length=4, _expect_unicode=True), nullable=False), - sa.Column('username', sa.String(length=16, _expect_unicode=True), nullable=False), - sa.Column('created_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True), - sa.PrimaryKeyConstraint('id') - ) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_table('upload') - # ### end Alembic commands ### diff --git a/cli/app/sql/versions/202006021608_creating_database.py b/cli/app/sql/versions/202006021608_creating_database.py new file mode 100644 index 0000000..7c6e54a --- /dev/null +++ b/cli/app/sql/versions/202006021608_creating_database.py @@ -0,0 +1,78 @@ +"""creating database + +Revision ID: 453787357254 +Revises: +Create Date: 2020-06-02 16:08:43.195875 + +""" +from alembic import op +import sqlalchemy as sa +import sqlalchemy_utc + + +# revision identifiers, used by Alembic. +revision = '453787357254' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('graph', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('path', sa.String(length=64, _expect_unicode=True), nullable=False), + sa.Column('title', sa.String(length=64, _expect_unicode=True), nullable=False), + sa.Column('username', sa.String(length=32, _expect_unicode=True), nullable=False), + sa.Column('description', sa.Text(_expect_unicode=True), nullable=False), + sa.Column('settings', sa.JSON(), nullable=True), + sa.Column('created_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True), + sa.Column('updated_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('upload', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('sha256', sa.String(length=256), nullable=False), + sa.Column('fn', sa.String(length=256), nullable=False), + sa.Column('ext', sa.String(length=4, _expect_unicode=True), nullable=False), + sa.Column('username', sa.String(length=16, _expect_unicode=True), nullable=False), + sa.Column('created_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('page', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('graph_id', sa.Integer(), nullable=True), + sa.Column('path', sa.String(length=64, _expect_unicode=True), nullable=False), + sa.Column('title', sa.String(length=64, _expect_unicode=True), nullable=False), + sa.Column('username', sa.String(length=32, _expect_unicode=True), nullable=False), + sa.Column('description', sa.Text(_expect_unicode=True), nullable=False), + sa.Column('settings', sa.JSON(), nullable=True), + sa.Column('created_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True), + sa.Column('updated_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True), + sa.ForeignKeyConstraint(['graph_id'], ['graph.id'], ), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('tile', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('graph_id', sa.Integer(), nullable=True), + sa.Column('page_id', sa.Integer(), nullable=True), + sa.Column('target_page_id', sa.Integer(), nullable=True), + sa.Column('type', sa.String(length=16, _expect_unicode=True), nullable=False), + sa.Column('settings', sa.JSON(), nullable=True), + sa.Column('created_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True), + sa.Column('updated_at', sqlalchemy_utc.sqltypes.UtcDateTime(timezone=True), nullable=True), + sa.ForeignKeyConstraint(['graph_id'], ['graph.id'], ), + sa.ForeignKeyConstraint(['page_id'], ['page.id'], ), + sa.ForeignKeyConstraint(['target_page_id'], ['page.id'], ), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('tile') + op.drop_table('page') + op.drop_table('upload') + op.drop_table('graph') + # ### end Alembic commands ### -- cgit v1.2.3-70-g09d2