From 3ae237b9b320a79cab7a024d741c3dd4a0e35fd1 Mon Sep 17 00:00:00 2001 From: Timur Enikeev <163281083+DaymasS@users.noreply.github.com> Date: Sat, 10 Aug 2024 13:52:15 +0200 Subject: [PATCH 1/5] Update 52230bfc3f86_56_add_is_hidden_field.py --- migrations/versions/52230bfc3f86_56_add_is_hidden_field.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migrations/versions/52230bfc3f86_56_add_is_hidden_field.py b/migrations/versions/52230bfc3f86_56_add_is_hidden_field.py index 6d00b8f..c62d0e2 100644 --- a/migrations/versions/52230bfc3f86_56_add_is_hidden_field.py +++ b/migrations/versions/52230bfc3f86_56_add_is_hidden_field.py @@ -19,7 +19,7 @@ def upgrade(): # ### commands auto generated by Alembic - please adjust! ### - op.add_column('button', sa.Column('is_hidden', sa.Boolean(), nullable=False)) + op.add_column('button', sa.Column('is_hidden', sa.Boolean(), nullable=True)) # ### end Alembic commands ### From a9df60a56bc64c8e386bd91cd35107b1f45c8dd9 Mon Sep 17 00:00:00 2001 From: Timur Enikeev <163281083+DaymasS@users.noreply.github.com> Date: Sat, 10 Aug 2024 13:54:10 +0200 Subject: [PATCH 2/5] Update database.py --- services_backend/models/database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services_backend/models/database.py b/services_backend/models/database.py index 611beac..2746002 100644 --- a/services_backend/models/database.py +++ b/services_backend/models/database.py @@ -63,7 +63,7 @@ class Button(Base): icon: Mapped[str] = mapped_column(String) link: Mapped[str] = mapped_column(String) type: Mapped[Type] = mapped_column(DbEnum(Type, native_enum=False), nullable=False) - is_hidden: Mapped[bool] = mapped_column(Boolean, default=False) + is_hidden: Mapped[bool] = mapped_column(Boolean, default=False, nullable=True) _scopes: Mapped[list[Scope]] = relationship("Scope", back_populates="button", lazy='joined', cascade='delete') From 7725954f39bc49cce1bcd5b66fc5d0efde96605c Mon Sep 17 00:00:00 2001 From: Timur Enikeev <163281083+DaymasS@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:16:21 +0200 Subject: [PATCH 3/5] Update database.py --- services_backend/models/database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services_backend/models/database.py b/services_backend/models/database.py index 2746002..611beac 100644 --- a/services_backend/models/database.py +++ b/services_backend/models/database.py @@ -63,7 +63,7 @@ class Button(Base): icon: Mapped[str] = mapped_column(String) link: Mapped[str] = mapped_column(String) type: Mapped[Type] = mapped_column(DbEnum(Type, native_enum=False), nullable=False) - is_hidden: Mapped[bool] = mapped_column(Boolean, default=False, nullable=True) + is_hidden: Mapped[bool] = mapped_column(Boolean, default=False) _scopes: Mapped[list[Scope]] = relationship("Scope", back_populates="button", lazy='joined', cascade='delete') From 7d2b763ed85923c37597138da10acd0650a813bc Mon Sep 17 00:00:00 2001 From: Timur Enikeev <163281083+DaymasS@users.noreply.github.com> Date: Sat, 10 Aug 2024 09:00:39 -0400 Subject: [PATCH 4/5] Update 52230bfc3f86_56_add_is_hidden_field.py --- .../versions/52230bfc3f86_56_add_is_hidden_field.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/migrations/versions/52230bfc3f86_56_add_is_hidden_field.py b/migrations/versions/52230bfc3f86_56_add_is_hidden_field.py index c62d0e2..8c9f306 100644 --- a/migrations/versions/52230bfc3f86_56_add_is_hidden_field.py +++ b/migrations/versions/52230bfc3f86_56_add_is_hidden_field.py @@ -18,9 +18,18 @@ def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### op.add_column('button', sa.Column('is_hidden', sa.Boolean(), nullable=True)) - # ### end Alembic commands ### + conn = op.get_bind() + res = conn.execute(sa.text("select * from button")).fetchall() + for i in range(0, len(res)): + conn.execute( + sa.text( + f"""UPDATE "button" + SET "is_hidden"='false' + WHERE id={res[i][0]}""" + ) + ) + op.alter_column('button', 'is_hidden', nullable=False) def downgrade(): From acf2c929513702c8126e52078c821b5b15a39f3b Mon Sep 17 00:00:00 2001 From: Timur Enikeev <163281083+DaymasS@users.noreply.github.com> Date: Sat, 10 Aug 2024 09:07:26 -0400 Subject: [PATCH 5/5] Update 52230bfc3f86_56_add_is_hidden_field.py --- .../versions/52230bfc3f86_56_add_is_hidden_field.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/migrations/versions/52230bfc3f86_56_add_is_hidden_field.py b/migrations/versions/52230bfc3f86_56_add_is_hidden_field.py index 8c9f306..6d6611e 100644 --- a/migrations/versions/52230bfc3f86_56_add_is_hidden_field.py +++ b/migrations/versions/52230bfc3f86_56_add_is_hidden_field.py @@ -20,15 +20,7 @@ def upgrade(): op.add_column('button', sa.Column('is_hidden', sa.Boolean(), nullable=True)) conn = op.get_bind() - res = conn.execute(sa.text("select * from button")).fetchall() - for i in range(0, len(res)): - conn.execute( - sa.text( - f"""UPDATE "button" - SET "is_hidden"='false' - WHERE id={res[i][0]}""" - ) - ) + conn.execute(sa.text(f"""UPDATE "button" SET "is_hidden"='false'""")) op.alter_column('button', 'is_hidden', nullable=False)