From ecf6ac665ba82339ba084f75ea2c17e5351bb1b7 Mon Sep 17 00:00:00 2001 From: eguerrant Date: Fri, 27 Jun 2025 13:56:10 -0700 Subject: [PATCH 1/3] idk why this broke... --- api/models/core_models.py | 4 +- .../versions/0a7f1ca77b12_do_not_renew.py | 39 ------------------- .../versions/cbc5bb2f05b7_do_not_renew.py | 38 ++++++++++++++++++ 3 files changed, 40 insertions(+), 41 deletions(-) delete mode 100644 migrations/versions/0a7f1ca77b12_do_not_renew.py create mode 100644 migrations/versions/cbc5bb2f05b7_do_not_renew.py diff --git a/api/models/core_models.py b/api/models/core_models.py index dfd40d5..067bb78 100644 --- a/api/models/core_models.py +++ b/api/models/core_models.py @@ -42,7 +42,7 @@ class OktaUserGroupMember(db.Model): # This field is set to True when an owner chooses to not renew access in the Expiring Access workflow should_expire: Mapped[bool] = mapped_column( - db.Boolean, nullable=False, server_default=expression.false(), default=False + db.Boolean, nullable=False, server_default="false", default=False ) # See more details on specifying alternative join conditions for relationships at @@ -462,7 +462,7 @@ class RoleGroupMap(db.Model): # This field is set to True when an owner chooses to not renew access in the Expiring Access workflow should_expire: Mapped[bool] = mapped_column( - db.Boolean, nullable=False, server_default=expression.false(), default=False + db.Boolean, nullable=False, server_default="false", default=False ) # See more details on specifying alternative join conditions for relationships at diff --git a/migrations/versions/0a7f1ca77b12_do_not_renew.py b/migrations/versions/0a7f1ca77b12_do_not_renew.py deleted file mode 100644 index 5b2b36d..0000000 --- a/migrations/versions/0a7f1ca77b12_do_not_renew.py +++ /dev/null @@ -1,39 +0,0 @@ -"""do not renew - -Revision ID: 0a7f1ca77b12 -Revises: 6d2a03b326f9 -Create Date: 2025-06-08 18:18:38.868290 - -""" - -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = "0a7f1ca77b12" -down_revision = "6d2a03b326f9" -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - with op.batch_alter_table("okta_user_group_member", schema=None) as batch_op: - batch_op.add_column(sa.Column("should_expire", sa.Boolean(), server_default=sa.text("0"), nullable=False)) - - with op.batch_alter_table("role_group_map", schema=None) as batch_op: - batch_op.add_column(sa.Column("should_expire", sa.Boolean(), server_default=sa.text("0"), nullable=False)) - - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - with op.batch_alter_table("role_group_map", schema=None) as batch_op: - batch_op.drop_column("should_expire") - - with op.batch_alter_table("okta_user_group_member", schema=None) as batch_op: - batch_op.drop_column("should_expire") - - # ### end Alembic commands ### diff --git a/migrations/versions/cbc5bb2f05b7_do_not_renew.py b/migrations/versions/cbc5bb2f05b7_do_not_renew.py new file mode 100644 index 0000000..ee4a202 --- /dev/null +++ b/migrations/versions/cbc5bb2f05b7_do_not_renew.py @@ -0,0 +1,38 @@ +"""do not renew + +Revision ID: cbc5bb2f05b7 +Revises: 6d2a03b326f9 +Create Date: 2025-06-27 13:55:16.355027 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'cbc5bb2f05b7' +down_revision = '6d2a03b326f9' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('okta_user_group_member', schema=None) as batch_op: + batch_op.add_column(sa.Column('should_expire', sa.Boolean(), server_default='false', nullable=False)) + + with op.batch_alter_table('role_group_map', schema=None) as batch_op: + batch_op.add_column(sa.Column('should_expire', sa.Boolean(), server_default='false', nullable=False)) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('role_group_map', schema=None) as batch_op: + batch_op.drop_column('should_expire') + + with op.batch_alter_table('okta_user_group_member', schema=None) as batch_op: + batch_op.drop_column('should_expire') + + # ### end Alembic commands ### From 63ecb4b958f5b8e00a4c15e6f1339ecd87f4ebab Mon Sep 17 00:00:00 2001 From: eguerrant Date: Fri, 27 Jun 2025 13:59:49 -0700 Subject: [PATCH 2/3] formatting --- api/models/core_models.py | 8 ++----- .../versions/cbc5bb2f05b7_do_not_renew.py | 21 ++++++++++--------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/api/models/core_models.py b/api/models/core_models.py index 067bb78..0bc8ed4 100644 --- a/api/models/core_models.py +++ b/api/models/core_models.py @@ -41,9 +41,7 @@ class OktaUserGroupMember(db.Model): created_reason: Mapped[str] = mapped_column(db.Unicode(1024), nullable=False, default="", server_default="") # This field is set to True when an owner chooses to not renew access in the Expiring Access workflow - should_expire: Mapped[bool] = mapped_column( - db.Boolean, nullable=False, server_default="false", default=False - ) + should_expire: Mapped[bool] = mapped_column(db.Boolean, nullable=False, server_default="false", default=False) # See more details on specifying alternative join conditions for relationships at # https://docs.sqlalchemy.org/en/14/orm/join_conditions.html#specifying-alternate-join-conditions @@ -461,9 +459,7 @@ class RoleGroupMap(db.Model): created_reason: Mapped[str] = mapped_column(db.Unicode(1024), nullable=False, default="", server_default="") # This field is set to True when an owner chooses to not renew access in the Expiring Access workflow - should_expire: Mapped[bool] = mapped_column( - db.Boolean, nullable=False, server_default="false", default=False - ) + should_expire: Mapped[bool] = mapped_column(db.Boolean, nullable=False, server_default="false", default=False) # See more details on specifying alternative join conditions for relationships at # https://docs.sqlalchemy.org/en/14/orm/join_conditions.html#specifying-alternate-join-conditions diff --git a/migrations/versions/cbc5bb2f05b7_do_not_renew.py b/migrations/versions/cbc5bb2f05b7_do_not_renew.py index ee4a202..e125332 100644 --- a/migrations/versions/cbc5bb2f05b7_do_not_renew.py +++ b/migrations/versions/cbc5bb2f05b7_do_not_renew.py @@ -5,34 +5,35 @@ Create Date: 2025-06-27 13:55:16.355027 """ + from alembic import op import sqlalchemy as sa # revision identifiers, used by Alembic. -revision = 'cbc5bb2f05b7' -down_revision = '6d2a03b326f9' +revision = "cbc5bb2f05b7" +down_revision = "6d2a03b326f9" branch_labels = None depends_on = None def upgrade(): # ### commands auto generated by Alembic - please adjust! ### - with op.batch_alter_table('okta_user_group_member', schema=None) as batch_op: - batch_op.add_column(sa.Column('should_expire', sa.Boolean(), server_default='false', nullable=False)) + with op.batch_alter_table("okta_user_group_member", schema=None) as batch_op: + batch_op.add_column(sa.Column("should_expire", sa.Boolean(), server_default="false", nullable=False)) - with op.batch_alter_table('role_group_map', schema=None) as batch_op: - batch_op.add_column(sa.Column('should_expire', sa.Boolean(), server_default='false', nullable=False)) + with op.batch_alter_table("role_group_map", schema=None) as batch_op: + batch_op.add_column(sa.Column("should_expire", sa.Boolean(), server_default="false", nullable=False)) # ### end Alembic commands ### def downgrade(): # ### commands auto generated by Alembic - please adjust! ### - with op.batch_alter_table('role_group_map', schema=None) as batch_op: - batch_op.drop_column('should_expire') + with op.batch_alter_table("role_group_map", schema=None) as batch_op: + batch_op.drop_column("should_expire") - with op.batch_alter_table('okta_user_group_member', schema=None) as batch_op: - batch_op.drop_column('should_expire') + with op.batch_alter_table("okta_user_group_member", schema=None) as batch_op: + batch_op.drop_column("should_expire") # ### end Alembic commands ### From 2238341f96c8e9e365a8714e813ee5b2f3d06352 Mon Sep 17 00:00:00 2001 From: eguerrant Date: Mon, 30 Jun 2025 10:02:31 -0700 Subject: [PATCH 3/3] change to server default everywhere --- api/models/core_models.py | 8 ++++++-- migrations/versions/cbc5bb2f05b7_do_not_renew.py | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/api/models/core_models.py b/api/models/core_models.py index 0bc8ed4..dfd40d5 100644 --- a/api/models/core_models.py +++ b/api/models/core_models.py @@ -41,7 +41,9 @@ class OktaUserGroupMember(db.Model): created_reason: Mapped[str] = mapped_column(db.Unicode(1024), nullable=False, default="", server_default="") # This field is set to True when an owner chooses to not renew access in the Expiring Access workflow - should_expire: Mapped[bool] = mapped_column(db.Boolean, nullable=False, server_default="false", default=False) + should_expire: Mapped[bool] = mapped_column( + db.Boolean, nullable=False, server_default=expression.false(), default=False + ) # See more details on specifying alternative join conditions for relationships at # https://docs.sqlalchemy.org/en/14/orm/join_conditions.html#specifying-alternate-join-conditions @@ -459,7 +461,9 @@ class RoleGroupMap(db.Model): created_reason: Mapped[str] = mapped_column(db.Unicode(1024), nullable=False, default="", server_default="") # This field is set to True when an owner chooses to not renew access in the Expiring Access workflow - should_expire: Mapped[bool] = mapped_column(db.Boolean, nullable=False, server_default="false", default=False) + should_expire: Mapped[bool] = mapped_column( + db.Boolean, nullable=False, server_default=expression.false(), default=False + ) # See more details on specifying alternative join conditions for relationships at # https://docs.sqlalchemy.org/en/14/orm/join_conditions.html#specifying-alternate-join-conditions diff --git a/migrations/versions/cbc5bb2f05b7_do_not_renew.py b/migrations/versions/cbc5bb2f05b7_do_not_renew.py index e125332..ecc3cd8 100644 --- a/migrations/versions/cbc5bb2f05b7_do_not_renew.py +++ b/migrations/versions/cbc5bb2f05b7_do_not_renew.py @@ -8,6 +8,7 @@ from alembic import op import sqlalchemy as sa +from sqlalchemy.sql import expression # revision identifiers, used by Alembic. @@ -20,10 +21,10 @@ def upgrade(): # ### commands auto generated by Alembic - please adjust! ### with op.batch_alter_table("okta_user_group_member", schema=None) as batch_op: - batch_op.add_column(sa.Column("should_expire", sa.Boolean(), server_default="false", nullable=False)) + batch_op.add_column(sa.Column("should_expire", sa.Boolean(), server_default=expression.false(), nullable=False)) with op.batch_alter_table("role_group_map", schema=None) as batch_op: - batch_op.add_column(sa.Column("should_expire", sa.Boolean(), server_default="false", nullable=False)) + batch_op.add_column(sa.Column("should_expire", sa.Boolean(), server_default=expression.false(), nullable=False)) # ### end Alembic commands ###