Skip to content

Make BaseRole abstract #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mekanix merged 1 commit into from
Feb 1, 2025
Merged

Make BaseRole abstract #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions alembic/versions/baf1dd67f3ed_initial.py → alembic/versions/f2a9191e9157_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

"""

Expand All @@ -11,7 +11,7 @@


# revision identifiers, used by Alembic.
revision = "baf1dd67f3ed"
revision = "f2a9191e9157"
down_revision = None
branch_labels = None
depends_on = None
Expand All @@ -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),
Expand All @@ -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),
Expand Down Expand Up @@ -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 ###
2 changes: 1 addition & 1 deletion freenit/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.3.12"
__version__ = "0.3.13"
2 changes: 1 addition & 1 deletion freenit/models/sql/base.py
View file
Open in desktop
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)
2 changes: 1 addition & 1 deletion freenit/models/sql/role.py
View file
Open in desktop
Original file line number Diff 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