linmihigo/CMT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remodeling table models and migration to postgres

Browse Source
This commit is contained in:
LinMihigo
2025-08-23 09:16:37 +02:00
parent fe2ccbe368
commit 648448ebdc
20 changed files with 166 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/alembic/env.py
+3 -7
View File
@@ -1,18 +1,16 @@
from logging.config import fileConfig
from app.schemas.models import SQLModel
from sqlalchemy import engine_from_config
from sqlalchemy import pool
from alembic import context
import os
from dotenv import load_dotenv
from sqlmodel import SQLModel
from app.schemas.models import Client, Supplier, Product, Payment, Credit
from app.core.config import settings
load_dotenv()
# this is the Alembic Config object, which provides
# access to the values within the .ini file in use.
config = context.config
config.set_main_option('sqlalchemy.url', str(settings.database_uri)) # type: ignore
# Interpret the config file for Python logging.
# This line sets up loggers basically.
@@ -24,7 +22,6 @@ if config.config_file_name is not None:
# from myapp import mymodel
# target_metadata = mymodel.Base.metadata
target_metadata = SQLModel.metadata
url = os.getenv("DATABASE_URI")
# other values from the config, defined by the needs of env.py,
# can be acquired:
@@ -66,7 +63,6 @@ def run_migrations_online() -> None:
connectable = engine_from_config(
config.get_section(config.config_ini_section, {}),
prefix="sqlalchemy.",
url=url,
poolclass=pool.NullPool,
)
backend/app/alembic/script.py.mako
+1 -1
View File
@@ -13,7 +13,7 @@ ${imports if imports else ""}
# revision identifiers, used by Alembic.
revision: str = ${repr(up_revision)}
down_revision: Union[str, None] = ${repr(down_revision)}
down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
backend/app/alembic/versions/e8c4300db3cb_checking_for_updates.py → backend/app/alembic/versions/0aa4734ce008_initial_tables.py
+6 -6
View File
@@ -1,8 +1,8 @@
"""Checking for updates
"""Initial tables
Revision ID: e8c4300db3cb
Revises: bfb086d8d500
Create Date: 2025-06-08 19:06:55.200977
Revision ID: 0aa4734ce008
Revises:
Create Date: 2025-08-17 16:44:05.785214
"""
from typing import Sequence, Union
@@ -12,8 +12,8 @@ import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision: str = 'e8c4300db3cb'
down_revision: Union[str, None] = 'bfb086d8d500'
revision: str = '0aa4734ce008'
down_revision: Union[str, Sequence[str], None] = None
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
backend/app/alembic/versions/174e0494276d_date_modified_columns_add_default_none.py
-32
View File
@@ -1,32 +0,0 @@
"""Date_modified columns - add default=None
Revision ID: 174e0494276d
Revises: d89dba0432de
Create Date: 2025-06-15 20:42:30.850962
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision: str = '174e0494276d'
down_revision: Union[str, None] = 'd89dba0432de'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
"""Upgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
pass
# ### end Alembic commands ###
def downgrade() -> None:
"""Downgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
pass
# ### end Alembic commands ###
backend/app/alembic/versions/5840d2b52dd8_rebuild.py → backend/app/alembic/versions/4966e016dd7c_initial_tables.py
+11 -12
View File
@@ -1,20 +1,19 @@
"""Rebuild
"""Initial tables
Revision ID: 5840d2b52dd8
Revises:
Create Date: 2025-06-01 14:27:25.657473
Revision ID: 4966e016dd7c
Revises: 0aa4734ce008
Create Date: 2025-08-17 16:50:53.587969
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
import sqlmodel
import sqlmodel.sql.sqltypes
# revision identifiers, used by Alembic.
revision: str = '5840d2b52dd8'
down_revision: Union[str, None] = None
revision: str = '4966e016dd7c'
down_revision: Union[str, Sequence[str], None] = '0aa4734ce008'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
@@ -52,8 +51,8 @@ def upgrade() -> None:
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('transcation_type', sa.Enum('BUY', 'SELL', name='tradetype'), nullable=False),
sa.Column('product_code', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
sa.Column('client_id', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
sa.Column('supplier_id', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
sa.Column('client_id', sa.Integer(), nullable=False),
sa.Column('supplier_id', sa.Integer(), nullable=False),
sa.Column('qty', sa.Integer(), nullable=False),
sa.Column('amount', sa.Integer(), nullable=False),
sa.Column('date', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
@@ -66,8 +65,8 @@ def upgrade() -> None:
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('payment_type', sa.Enum('BUY', 'SELL', name='tradetype'), nullable=False),
sa.Column('product_code', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
sa.Column('client_id', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
sa.Column('supplier_id', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
sa.Column('client_id', sa.Integer(), nullable=False),
sa.Column('supplier_id', sa.Integer(), nullable=False),
sa.Column('amount', sa.Integer(), nullable=False),
sa.Column('payment_method', sqlmodel.sql.sqltypes.AutoString(length=24), nullable=False),
sa.Column('date', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
backend/app/alembic/versions/8aefa882e096_product_id_made_nullable.py
-38
View File
@@ -1,38 +0,0 @@
"""Product id made nullable
Revision ID: 8aefa882e096
Revises: e8c4300db3cb
Create Date: 2025-06-15 19:33:39.299803
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import mysql
# revision identifiers, used by Alembic.
revision: str = '8aefa882e096'
down_revision: Union[str, None] = 'e8c4300db3cb'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
"""Upgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.alter_column('product', 'id',
existing_type=mysql.INTEGER(),
nullable=True,
autoincrement=True)
# ### end Alembic commands ###
def downgrade() -> None:
"""Downgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.alter_column('product', 'id',
existing_type=mysql.INTEGER(),
nullable=False,
autoincrement=True)
# ### end Alembic commands ###
backend/app/alembic/versions/b5ff3e70bd95_product_id_made_nullable_using_default_.py
-32
View File
@@ -1,32 +0,0 @@
"""Product id made nullable using 'default=None'
Revision ID: b5ff3e70bd95
Revises: 8aefa882e096
Create Date: 2025-06-15 19:38:20.874456
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision: str = 'b5ff3e70bd95'
down_revision: Union[str, None] = '8aefa882e096'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
"""Upgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
pass
# ### end Alembic commands ###
def downgrade() -> None:
"""Downgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
pass
# ### end Alembic commands ###
backend/app/alembic/versions/bfb086d8d500_fix_client_id_in_credit_type_to_int.py
-60
View File
@@ -1,60 +0,0 @@
"""Fix client_id in Credit type to int
Revision ID: bfb086d8d500
Revises: 5840d2b52dd8
Create Date: 2025-06-01 14:53:57.095181
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
import sqlmodel
# revision identifiers, used by Alembic.
revision: str = 'bfb086d8d500'
down_revision: Union[str, None] = '5840d2b52dd8'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
"""Upgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('credit',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('transcation_type', sa.Enum('BUY', 'SELL', name='tradetype'), nullable=False),
sa.Column('product_code', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
sa.Column('client_id', sa.Integer(), nullable=False),
sa.Column('supplier_id', sa.Integer(), nullable=False),
sa.Column('qty', sa.Integer(), nullable=False),
sa.Column('amount', sa.Integer(), nullable=False),
sa.Column('date', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
sa.ForeignKeyConstraint(['client_id'], ['client.id'], ),
sa.ForeignKeyConstraint(['product_code'], ['product.product_code'], ),
sa.ForeignKeyConstraint(['supplier_id'], ['supplier.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_table('payment',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('payment_type', sa.Enum('BUY', 'SELL', name='tradetype'), nullable=False),
sa.Column('product_code', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
sa.Column('client_id', sa.Integer(), nullable=False),
sa.Column('supplier_id', sa.Integer(), nullable=False),
sa.Column('amount', sa.Integer(), nullable=False),
sa.Column('payment_method', sqlmodel.sql.sqltypes.AutoString(length=24), nullable=False),
sa.Column('date', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
sa.ForeignKeyConstraint(['client_id'], ['client.id'], ),
sa.ForeignKeyConstraint(['product_code'], ['product.product_code'], ),
sa.ForeignKeyConstraint(['supplier_id'], ['supplier.id'], ),
sa.PrimaryKeyConstraint('id')
)
# ### end Alembic commands ###
def downgrade() -> None:
"""Downgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('payment')
op.drop_table('credit')
# ### end Alembic commands ###
backend/app/alembic/versions/d89dba0432de_making_product_date_modified_default_.py
-32
View File
@@ -1,32 +0,0 @@
"""Making Product.date_modified default=None
Revision ID: d89dba0432de
Revises: b5ff3e70bd95
Create Date: 2025-06-15 20:06:11.734486
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision: str = 'd89dba0432de'
down_revision: Union[str, None] = 'b5ff3e70bd95'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
"""Upgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
pass
# ### end Alembic commands ###
def downgrade() -> None:
"""Downgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
pass
# ### end Alembic commands ###