Merge pull request #168 from mekanix/abstract-roles

Make BaseRole abstract
freenit-framework · Feb 1, 2025 · f323d63 · f323d63
2 parents d86a51c + eae099c
commit f323d63
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/alembic/versions/baf1dd67f3ed_initial.py → alembic/versions/f2a9191e9157_initial.py b/alembic/versions/baf1dd67f3ed_initial.py → alembic/versions/f2a9191e9157_initial.py
@@ -1,8 +1,8 @@
 """initial
 
-Revision ID: baf1dd67f3ed
+Revision ID: f2a9191e9157
 Revises:
-Create Date: 2025-01-27 17:11:10.217492
+Create Date: 2025-02-01 13:43:38.485626
 
 """
 
@@ -11,7 +11,7 @@
 
 
 # revision identifiers, used by Alembic.
-revision = "baf1dd67f3ed"
+revision = "f2a9191e9157"
 down_revision = None
 branch_labels = None
 depends_on = None
@@ -24,8 +24,8 @@ def upgrade():
         sa.Column("id", sa.Integer(), nullable=False),
         sa.Column("name", sa.Text(), nullable=False),
         sa.PrimaryKeyConstraint("id"),
-        sa.UniqueConstraint("name"),
     )
+    op.create_index(op.f("ix_roles_name"), "roles", ["name"], unique=True)
     op.create_table(
         "themes",
         sa.Column("id", sa.Integer(), nullable=False),
@@ -51,7 +51,7 @@ def upgrade():
         "users",
         sa.Column("id", sa.Integer(), nullable=False),
         sa.Column("email", sa.Text(), nullable=False),
-        sa.Column("password", sa.Text(), nullable=True),
+        sa.Column("password", sa.Text(), nullable=False),
         sa.Column("fullname", sa.Text(), nullable=True),
         sa.Column("active", sa.Boolean(), nullable=True),
         sa.Column("admin", sa.Boolean(), nullable=True),
@@ -87,5 +87,6 @@ def downgrade():
     op.drop_table("users_roles")
     op.drop_table("users")
     op.drop_table("themes")
+    op.drop_index(op.f("ix_roles_name"), table_name="roles")
     op.drop_table("roles")
     # ### end Alembic commands ###
diff --git a/freenit/__init__.py b/freenit/__init__.py
@@ -1 +1 @@
-__version__ = "0.3.12"
+__version__ = "0.3.13"
diff --git a/freenit/models/sql/base.py b/freenit/models/sql/base.py
@@ -47,4 +47,4 @@ def make_optional(OptionalModel):
 
 
 class BaseRole(OrmarBaseModel, OrmarRoleMixin):
-    ormar_config = ormar_config.copy()
+    ormar_config = ormar_config.copy(abstract=True)
diff --git a/freenit/models/sql/role.py b/freenit/models/sql/role.py
@@ -4,7 +4,7 @@ class Role(BaseRole):
     ormar_config = ormar_config.copy()
 
 
-class RoleOptional(BaseRole):
+class RoleOptional(BaseRole.get_pydantic()):
     pass
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,4 +47,4 @@ def make_optional(OptionalModel):


		class BaseRole(OrmarBaseModel, OrmarRoleMixin):
		ormar_config = ormar_config.copy()
		ormar_config = ormar_config.copy(abstract=True)
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ class Role(BaseRole): @@
         ormar_config = ormar_config.copy()
-    class RoleOptional(BaseRole):
+    class RoleOptional(BaseRole.get_pydantic()):
         pass
@@ Expand Down @@