From 24f19fbbac9f2c0881f1db46b1c49a5fb079030f Mon Sep 17 00:00:00 2001 From: Stanislav Roslavtsev Date: Tue, 14 Feb 2023 23:08:20 +0300 Subject: [PATCH 01/13] Update 6a486347af93_order.py --- migrations/versions/6a486347af93_order.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/migrations/versions/6a486347af93_order.py b/migrations/versions/6a486347af93_order.py index 15bb287..248fbda 100644 --- a/migrations/versions/6a486347af93_order.py +++ b/migrations/versions/6a486347af93_order.py @@ -17,7 +17,7 @@ def upgrade(): - op.add_column('button', sa.Column('order', sa.Integer(), nullable=False)) + op.add_column('button', sa.Column('order', sa.Integer(), nullable=True)) op.add_column('button', sa.Column('link', sa.String(), nullable=False)) op.add_column('button', sa.Column('type', sa.String(), nullable=False)) op.alter_column('button', 'name', existing_type=sa.VARCHAR(), nullable=False) @@ -26,6 +26,7 @@ def upgrade(): op.add_column('category', sa.Column('order', sa.Integer(), nullable=False)) op.alter_column('category', 'name', existing_type=sa.VARCHAR(), nullable=False) op.alter_column('category', 'type', existing_type=sa.VARCHAR(), nullable=False) + op.alter_column('button', 'order', nullable=False) def downgrade(): From 65c1c05b9cbf5c1687ce93f5e35a64ff65c2d363 Mon Sep 17 00:00:00 2001 From: Stanislav Roslavtsev Date: Tue, 14 Feb 2023 23:18:25 +0300 Subject: [PATCH 02/13] Update 6a486347af93_order.py --- migrations/versions/6a486347af93_order.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/migrations/versions/6a486347af93_order.py b/migrations/versions/6a486347af93_order.py index 248fbda..8c8e532 100644 --- a/migrations/versions/6a486347af93_order.py +++ b/migrations/versions/6a486347af93_order.py @@ -17,13 +17,21 @@ def upgrade(): - op.add_column('button', sa.Column('order', sa.Integer(), nullable=True)) + op.add_column('button', sa.Column('order', sa.Integer(), nullable=False)) + conn = op.get_bind() + res = conn.execute(sa.text("select name from button")).fetchall() + for i in range(1, len(res)): + op.execute(f'UPDATE "button" SET order=0') op.add_column('button', sa.Column('link', sa.String(), nullable=False)) op.add_column('button', sa.Column('type', sa.String(), nullable=False)) op.alter_column('button', 'name', existing_type=sa.VARCHAR(), nullable=False) op.alter_column('button', 'category_id', existing_type=sa.INTEGER(), nullable=False) op.alter_column('button', 'icon', existing_type=sa.VARCHAR(), nullable=False) op.add_column('category', sa.Column('order', sa.Integer(), nullable=False)) + conn = op.get_bind() + res = conn.execute(sa.text("select name from category")).fetchall() + for i in range(1, len(res)): + op.execute(f'UPDATE "category" SET order=0') op.alter_column('category', 'name', existing_type=sa.VARCHAR(), nullable=False) op.alter_column('category', 'type', existing_type=sa.VARCHAR(), nullable=False) op.alter_column('button', 'order', nullable=False) From 6294a3e858be4733df975e196d55ec09c6c26951 Mon Sep 17 00:00:00 2001 From: Stanislav Roslavtsev Date: Tue, 14 Feb 2023 23:31:55 +0300 Subject: [PATCH 03/13] Update 6a486347af93_order.py --- migrations/versions/6a486347af93_order.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/migrations/versions/6a486347af93_order.py b/migrations/versions/6a486347af93_order.py index 8c8e532..29c887d 100644 --- a/migrations/versions/6a486347af93_order.py +++ b/migrations/versions/6a486347af93_order.py @@ -19,9 +19,9 @@ def upgrade(): op.add_column('button', sa.Column('order', sa.Integer(), nullable=False)) conn = op.get_bind() - res = conn.execute(sa.text("select name from button")).fetchall() - for i in range(1, len(res)): - op.execute(f'UPDATE "button" SET order=0') + res = conn.execute(sa.text("select id from button")).fetchall() + for i in range(0, len(res)): + conn.execute(sa.text(f'select order from button where button.id={res[i]} update button set order = {i+1}')) op.add_column('button', sa.Column('link', sa.String(), nullable=False)) op.add_column('button', sa.Column('type', sa.String(), nullable=False)) op.alter_column('button', 'name', existing_type=sa.VARCHAR(), nullable=False) From 2b88b1174015151156c008c9d58fec4635ddab04 Mon Sep 17 00:00:00 2001 From: Stanislav Roslavtsev Date: Tue, 14 Feb 2023 23:37:32 +0300 Subject: [PATCH 04/13] Update 6a486347af93_order.py --- migrations/versions/6a486347af93_order.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/migrations/versions/6a486347af93_order.py b/migrations/versions/6a486347af93_order.py index 29c887d..6e127df 100644 --- a/migrations/versions/6a486347af93_order.py +++ b/migrations/versions/6a486347af93_order.py @@ -17,21 +17,23 @@ def upgrade(): - op.add_column('button', sa.Column('order', sa.Integer(), nullable=False)) + op.add_column('button', sa.Column('order', sa.Integer(), nullable=True)) conn = op.get_bind() res = conn.execute(sa.text("select id from button")).fetchall() for i in range(0, len(res)): conn.execute(sa.text(f'select order from button where button.id={res[i]} update button set order = {i+1}')) + op.alter_column('button', 'order', nullable=False) op.add_column('button', sa.Column('link', sa.String(), nullable=False)) op.add_column('button', sa.Column('type', sa.String(), nullable=False)) op.alter_column('button', 'name', existing_type=sa.VARCHAR(), nullable=False) op.alter_column('button', 'category_id', existing_type=sa.INTEGER(), nullable=False) op.alter_column('button', 'icon', existing_type=sa.VARCHAR(), nullable=False) - op.add_column('category', sa.Column('order', sa.Integer(), nullable=False)) + op.add_column('category', sa.Column('order', sa.Integer(), nullable=True)) conn = op.get_bind() - res = conn.execute(sa.text("select name from category")).fetchall() - for i in range(1, len(res)): - op.execute(f'UPDATE "category" SET order=0') + res = conn.execute(sa.text("select id from category")).fetchall() + for i in range(0, len(res)): + conn.execute(sa.text(f'select order from category where category.id={res[i]} update category set order = {i+1}')) + op.alter_column('category', 'order', nullable=False) op.alter_column('category', 'name', existing_type=sa.VARCHAR(), nullable=False) op.alter_column('category', 'type', existing_type=sa.VARCHAR(), nullable=False) op.alter_column('button', 'order', nullable=False) From 5b37577676d62a309b845245c13ee71a3f31f857 Mon Sep 17 00:00:00 2001 From: Stanislav Roslavtsev Date: Tue, 14 Feb 2023 23:43:20 +0300 Subject: [PATCH 05/13] Update 6a486347af93_order.py --- migrations/versions/6a486347af93_order.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/migrations/versions/6a486347af93_order.py b/migrations/versions/6a486347af93_order.py index 6e127df..9509d5e 100644 --- a/migrations/versions/6a486347af93_order.py +++ b/migrations/versions/6a486347af93_order.py @@ -23,8 +23,10 @@ def upgrade(): for i in range(0, len(res)): conn.execute(sa.text(f'select order from button where button.id={res[i]} update button set order = {i+1}')) op.alter_column('button', 'order', nullable=False) - op.add_column('button', sa.Column('link', sa.String(), nullable=False)) - op.add_column('button', sa.Column('type', sa.String(), nullable=False)) + op.add_column('button', sa.Column('link', sa.String(), nullable=True)) + conn.execute(sa.text(f'update button set link=""') + op.add_column('button', sa.Column('type', sa.String(), nullable=True)) + conn.execute(sa.text(f'update button set type=""') op.alter_column('button', 'name', existing_type=sa.VARCHAR(), nullable=False) op.alter_column('button', 'category_id', existing_type=sa.INTEGER(), nullable=False) op.alter_column('button', 'icon', existing_type=sa.VARCHAR(), nullable=False) From 41657b1d30483595f7e8598ac57a4bfe0e4f75f6 Mon Sep 17 00:00:00 2001 From: Stanislav Roslavtsev Date: Tue, 14 Feb 2023 23:46:04 +0300 Subject: [PATCH 06/13] Update 6a486347af93_order.py --- migrations/versions/6a486347af93_order.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migrations/versions/6a486347af93_order.py b/migrations/versions/6a486347af93_order.py index 9509d5e..05be6f1 100644 --- a/migrations/versions/6a486347af93_order.py +++ b/migrations/versions/6a486347af93_order.py @@ -24,9 +24,9 @@ def upgrade(): conn.execute(sa.text(f'select order from button where button.id={res[i]} update button set order = {i+1}')) op.alter_column('button', 'order', nullable=False) op.add_column('button', sa.Column('link', sa.String(), nullable=True)) - conn.execute(sa.text(f'update button set link=""') + conn.execute(sa.text(f'update button set link=""')) op.add_column('button', sa.Column('type', sa.String(), nullable=True)) - conn.execute(sa.text(f'update button set type=""') + conn.execute(sa.text(f'update button set type=""')) op.alter_column('button', 'name', existing_type=sa.VARCHAR(), nullable=False) op.alter_column('button', 'category_id', existing_type=sa.INTEGER(), nullable=False) op.alter_column('button', 'icon', existing_type=sa.VARCHAR(), nullable=False) From e2b86ba89745838f97b6b43e3f76abe729d76c5e Mon Sep 17 00:00:00 2001 From: Stanislav Roslavtsev Date: Tue, 14 Feb 2023 23:48:02 +0300 Subject: [PATCH 07/13] Update 6a486347af93_order.py --- migrations/versions/6a486347af93_order.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migrations/versions/6a486347af93_order.py b/migrations/versions/6a486347af93_order.py index 05be6f1..acd3402 100644 --- a/migrations/versions/6a486347af93_order.py +++ b/migrations/versions/6a486347af93_order.py @@ -24,9 +24,9 @@ def upgrade(): conn.execute(sa.text(f'select order from button where button.id={res[i]} update button set order = {i+1}')) op.alter_column('button', 'order', nullable=False) op.add_column('button', sa.Column('link', sa.String(), nullable=True)) - conn.execute(sa.text(f'update button set link=""')) + conn.execute(sa.text(f'update button set link=" "')) op.add_column('button', sa.Column('type', sa.String(), nullable=True)) - conn.execute(sa.text(f'update button set type=""')) + conn.execute(sa.text(f'update button set type=" "')) op.alter_column('button', 'name', existing_type=sa.VARCHAR(), nullable=False) op.alter_column('button', 'category_id', existing_type=sa.INTEGER(), nullable=False) op.alter_column('button', 'icon', existing_type=sa.VARCHAR(), nullable=False) From b2967a684eaedb171848a6f6a81b515891c915d2 Mon Sep 17 00:00:00 2001 From: Stanislav Roslavtsev Date: Tue, 14 Feb 2023 23:50:39 +0300 Subject: [PATCH 08/13] Update 6a486347af93_order.py --- migrations/versions/6a486347af93_order.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migrations/versions/6a486347af93_order.py b/migrations/versions/6a486347af93_order.py index acd3402..22d0c76 100644 --- a/migrations/versions/6a486347af93_order.py +++ b/migrations/versions/6a486347af93_order.py @@ -24,9 +24,9 @@ def upgrade(): conn.execute(sa.text(f'select order from button where button.id={res[i]} update button set order = {i+1}')) op.alter_column('button', 'order', nullable=False) op.add_column('button', sa.Column('link', sa.String(), nullable=True)) - conn.execute(sa.text(f'update button set link=" "')) + conn.execute(sa.text(f'update button set link="test"')) op.add_column('button', sa.Column('type', sa.String(), nullable=True)) - conn.execute(sa.text(f'update button set type=" "')) + conn.execute(sa.text(f'update button set type="test"')) op.alter_column('button', 'name', existing_type=sa.VARCHAR(), nullable=False) op.alter_column('button', 'category_id', existing_type=sa.INTEGER(), nullable=False) op.alter_column('button', 'icon', existing_type=sa.VARCHAR(), nullable=False) From cfa9bab3f11b2bb0f0334213e3cd24edc8ced8ab Mon Sep 17 00:00:00 2001 From: Stanislav Roslavtsev Date: Tue, 14 Feb 2023 23:53:40 +0300 Subject: [PATCH 09/13] Update 6a486347af93_order.py --- migrations/versions/6a486347af93_order.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migrations/versions/6a486347af93_order.py b/migrations/versions/6a486347af93_order.py index 22d0c76..41a9485 100644 --- a/migrations/versions/6a486347af93_order.py +++ b/migrations/versions/6a486347af93_order.py @@ -24,9 +24,9 @@ def upgrade(): conn.execute(sa.text(f'select order from button where button.id={res[i]} update button set order = {i+1}')) op.alter_column('button', 'order', nullable=False) op.add_column('button', sa.Column('link', sa.String(), nullable=True)) - conn.execute(sa.text(f'update button set link="test"')) + conn.execute(sa.text(f'update button set button.link="test"')) op.add_column('button', sa.Column('type', sa.String(), nullable=True)) - conn.execute(sa.text(f'update button set type="test"')) + conn.execute(sa.text(f'update button set button.type="test"')) op.alter_column('button', 'name', existing_type=sa.VARCHAR(), nullable=False) op.alter_column('button', 'category_id', existing_type=sa.INTEGER(), nullable=False) op.alter_column('button', 'icon', existing_type=sa.VARCHAR(), nullable=False) From fa78d9436eb5d4b4858021d818f4f84ed8636ad8 Mon Sep 17 00:00:00 2001 From: Stanislav Roslavtsev Date: Tue, 14 Feb 2023 23:58:08 +0300 Subject: [PATCH 10/13] Update 6a486347af93_order.py --- migrations/versions/6a486347af93_order.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migrations/versions/6a486347af93_order.py b/migrations/versions/6a486347af93_order.py index 41a9485..14fff5e 100644 --- a/migrations/versions/6a486347af93_order.py +++ b/migrations/versions/6a486347af93_order.py @@ -24,9 +24,9 @@ def upgrade(): conn.execute(sa.text(f'select order from button where button.id={res[i]} update button set order = {i+1}')) op.alter_column('button', 'order', nullable=False) op.add_column('button', sa.Column('link', sa.String(), nullable=True)) - conn.execute(sa.text(f'update button set button.link="test"')) + op.execute('update button set button.link="test"') op.add_column('button', sa.Column('type', sa.String(), nullable=True)) - conn.execute(sa.text(f'update button set button.type="test"')) + op.execute('update button set button.link="test"') op.alter_column('button', 'name', existing_type=sa.VARCHAR(), nullable=False) op.alter_column('button', 'category_id', existing_type=sa.INTEGER(), nullable=False) op.alter_column('button', 'icon', existing_type=sa.VARCHAR(), nullable=False) From c60458458d2084c9afeb0bf5f6f30ac8376416b2 Mon Sep 17 00:00:00 2001 From: Stanislav Roslavtsev Date: Wed, 15 Feb 2023 00:00:28 +0300 Subject: [PATCH 11/13] Update 6a486347af93_order.py --- migrations/versions/6a486347af93_order.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migrations/versions/6a486347af93_order.py b/migrations/versions/6a486347af93_order.py index 14fff5e..53a8f6e 100644 --- a/migrations/versions/6a486347af93_order.py +++ b/migrations/versions/6a486347af93_order.py @@ -24,9 +24,9 @@ def upgrade(): conn.execute(sa.text(f'select order from button where button.id={res[i]} update button set order = {i+1}')) op.alter_column('button', 'order', nullable=False) op.add_column('button', sa.Column('link', sa.String(), nullable=True)) - op.execute('update button set button.link="test"') + op.execute('update button set link=test') op.add_column('button', sa.Column('type', sa.String(), nullable=True)) - op.execute('update button set button.link="test"') + op.execute('update button set link=test') op.alter_column('button', 'name', existing_type=sa.VARCHAR(), nullable=False) op.alter_column('button', 'category_id', existing_type=sa.INTEGER(), nullable=False) op.alter_column('button', 'icon', existing_type=sa.VARCHAR(), nullable=False) From 104396b620d23bd61441d49742afffab852e3793 Mon Sep 17 00:00:00 2001 From: Stanislav Roslavtsev Date: Wed, 15 Feb 2023 00:02:48 +0300 Subject: [PATCH 12/13] Update 6a486347af93_order.py --- migrations/versions/6a486347af93_order.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migrations/versions/6a486347af93_order.py b/migrations/versions/6a486347af93_order.py index 53a8f6e..8337fb3 100644 --- a/migrations/versions/6a486347af93_order.py +++ b/migrations/versions/6a486347af93_order.py @@ -24,9 +24,9 @@ def upgrade(): conn.execute(sa.text(f'select order from button where button.id={res[i]} update button set order = {i+1}')) op.alter_column('button', 'order', nullable=False) op.add_column('button', sa.Column('link', sa.String(), nullable=True)) - op.execute('update button set link=test') + op.execute('update "button" set link=test') op.add_column('button', sa.Column('type', sa.String(), nullable=True)) - op.execute('update button set link=test') + op.execute('update "button" set link=test') op.alter_column('button', 'name', existing_type=sa.VARCHAR(), nullable=False) op.alter_column('button', 'category_id', existing_type=sa.INTEGER(), nullable=False) op.alter_column('button', 'icon', existing_type=sa.VARCHAR(), nullable=False) From 02a6979baa6ba660e3a12d518cf8df2f6326892d Mon Sep 17 00:00:00 2001 From: Stanislav Roslavtsev Date: Wed, 15 Feb 2023 00:07:53 +0300 Subject: [PATCH 13/13] Update 6a486347af93_order.py --- migrations/versions/6a486347af93_order.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/migrations/versions/6a486347af93_order.py b/migrations/versions/6a486347af93_order.py index 8337fb3..893ac35 100644 --- a/migrations/versions/6a486347af93_order.py +++ b/migrations/versions/6a486347af93_order.py @@ -18,15 +18,15 @@ def upgrade(): op.add_column('button', sa.Column('order', sa.Integer(), nullable=True)) + op.add_column('button', sa.Column('link', sa.String(), nullable=True)) + op.add_column('button', sa.Column('type', sa.String(), nullable=True)) conn = op.get_bind() res = conn.execute(sa.text("select id from button")).fetchall() for i in range(0, len(res)): - conn.execute(sa.text(f'select order from button where button.id={res[i]} update button set order = {i+1}')) + conn.execute(sa.text(f'UPDATE button set order = {i+1}, link = "a", type = "b", where id={res[i]}')) op.alter_column('button', 'order', nullable=False) - op.add_column('button', sa.Column('link', sa.String(), nullable=True)) - op.execute('update "button" set link=test') - op.add_column('button', sa.Column('type', sa.String(), nullable=True)) - op.execute('update "button" set link=test') + op.alter_column('button', 'link', nullable=False) + op.alter_column('button', 'type', nullable=False) op.alter_column('button', 'name', existing_type=sa.VARCHAR(), nullable=False) op.alter_column('button', 'category_id', existing_type=sa.INTEGER(), nullable=False) op.alter_column('button', 'icon', existing_type=sa.VARCHAR(), nullable=False)