Fix: correct rebase

aeecleclair · Dec 2, 2024 · 817801f · 817801f
1 parent 463ca27
commit 817801f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 23 deletions.
diff --git a/app/utils/tools.py b/app/utils/tools.py
@@ -19,7 +19,7 @@
 
 from app.core import cruds_core, models_core, security
 from app.core.groups import cruds_groups
-from app.core.groups.groups_type import AccountType
+from app.core.groups.groups_type import AccountType, GroupType
 from app.core.models_core import CoreUser
 from app.core.users import cruds_users
 from app.types import core_data

diff --git a/migrations/versions/27-schools.py b/migrations/versions/27-schools.py
@@ -151,22 +151,6 @@ def upgrade() -> None:
             ),
         )
 
-    with op.batch_alter_table("core_user_unconfirmed") as batch_op:
-        batch_op.add_column(
-            sa.Column(
-                "school_id",
-                sa.String(),
-                nullable=False,
-                server_default="dce19aa2-8863-4c93-861e-fb7be8f610ed",
-            ),
-        )
-        batch_op.create_foreign_key(
-            "core_user_unconfirmed_school_id",
-            "core_school",
-            ["school_id"],
-            ["id"],
-        )
-
     conn.execute(
         sa.insert(school_table).values(
             id="d9772da7-1142-4002-8b86-b694b431dfed",
@@ -200,12 +184,6 @@ def upgrade() -> None:
 
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("core_user_unconfirmed") as batch_op:
-        batch_op.drop_constraint(
-            "core_user_unconfirmed_school_id",
-            type_="foreignkey",
-        )
-        batch_op.drop_column("school_id")
 
     conn = op.get_bind()