From a40e4d412b7712493e114d5e7858fa020ed89998 Mon Sep 17 00:00:00 2001 From: htylight Date: Mon, 3 Jul 2023 01:03:54 +0800 Subject: [PATCH] migrate user_account table --- Pipfile | 2 +- Pipfile.lock | 45 +++++++++++++++++-- alembic.ini | 2 +- migrations/env.py | 2 +- .../2ac7bad1f528_create_user_account_table.py | 38 ++++++++++++++++ src/database/db.py | 7 +-- src/database/models.py | 6 ++- 7 files changed, 89 insertions(+), 13 deletions(-) create mode 100644 migrations/versions/2ac7bad1f528_create_user_account_table.py diff --git a/Pipfile b/Pipfile index 26e02b8..d8cdf06 100644 --- a/Pipfile +++ b/Pipfile @@ -1,5 +1,5 @@ [[source]] -url = "https://pypi.org/simple" +url = "https://mirrors.aliyun.com/pypi/simple" verify_ssl = true name = "pypi" diff --git a/Pipfile.lock b/Pipfile.lock index 820fb77..97ea679 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "6361c308c8160793691a66630b2c2a504953c4ab008609798de95bab7c05f8e7" + "sha256": "c2f505048c4397339837b528a77d4bb8428b29a0ecda73233aedd4c8e268cc46" }, "pipfile-spec": 6, "requires": { @@ -10,7 +10,7 @@ "sources": [ { "name": "pypi", - "url": "https://pypi.org/simple", + "url": "https://mirrors.aliyun.com/pypi/simple", "verify_ssl": true } ] @@ -27,6 +27,8 @@ "anyio": { "hashes": [ "sha256:275d9973793619a5374e1c89a4f4ad3f4b0a5510a2b5b939444bee8f4c4d37ce", + "sha256:691adfc3c36c0d922c69a8d4105e73cf4cf697f7e66a1baf04347bf5f1a0d6a9", + "sha256:8ffa2a3572d4a9852481fb6f8b7fd3c678b27860e07b8789da4ddb06675aa219", "sha256:eddca883c4175f14df8aedce21054bfca3adb70ffe76a9f607aef9d7fa2ea7f0" ], "markers": "python_version >= '3.7'", @@ -93,6 +95,8 @@ "dnspython": { "hashes": [ "sha256:224e32b03eb46be70e12ef6d64e0be123a64e621ab4c0822ff6d450d52a540b9", + "sha256:36565511acce19ee18048b9ea0d25b76d2a2a56e8b5dfaf2ec52deb616f307b4", + "sha256:4f5226f7378abd4e01181df1e5daa536af9dfdca72cc41f117847e5583d2fed6", "sha256:89141536394f909066cabd112e3e1a37e4e654db00a25308b0f130bc3152eb46" ], "markers": "python_version >= '3.7' and python_version < '4.0'", @@ -540,34 +544,60 @@ }, "pyyaml": { "hashes": [ + "sha256:0044ec607d28033fc79d9900748eafdd62e9a79d3882858e8c0c001f30e9c79a", "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf", "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293", + "sha256:0495b956bd45025c5d13ae8af0ea238923e88f2d98efd7484ec99dac46291d22", "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b", "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57", + "sha256:09317957e01b6b4da6f9ea96f9e661225662212acee57fcb201775a82196523e", + "sha256:0b2167570ea8e96a2710efaae860d71cc3f80e35fe07a915093c596170f024bf", "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b", "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4", + "sha256:1114a62d443cb157ac36beb79fc323d830f4a0586ffd1da8319d72fbf4514d6c", + "sha256:11dae7bfe84016061d528c355bbe0faa0775f077f21831b1fbaa7997b266ca99", + "sha256:171533a79a71520ccdf08136012ea0c8fe7f152cda69168dc38ea34da67c9f80", "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07", + "sha256:1fffde5b126e4433829530b621a209c07a4c2a808b03e5b808419745b3509c79", "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba", "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9", + "sha256:267bf63c911ab6302341e37329f049ddfcab4aea26c8895da1e6a5bcdf1bcc37", + "sha256:26fdf07f0d7442fe4cc637aadeb08e9e6dc853f9a4d99a3d813bd23dc6e1cc52", "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287", "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513", + "sha256:2ea9326fba939d5e87a1890c27a7aaf5a75e49cfe2c1696bc4fbb25305ca2767", + "sha256:33d6ec1e993c063d4fb4009f439a3d81773ca81cc4109f701eb7a4782d171495", "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0", + "sha256:40f637ea3333c0969c3f4127393a5f908f40f7e85605f9e6f568cff2c66849ef", "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782", + "sha256:437e3796f5dd7f2ad8f70084f7fe82472b11483aa1c53c073ab430974bdf1b6d", "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0", "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92", + "sha256:4983bee1be18c3faed20c8eead1c543c1356a2b468984c1385b523e23d3ab0ed", + "sha256:499b0b45b68671df4b47b185a5a664d6e3871c93956c6f70bf04de5344c6ef02", "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f", + "sha256:56e213cbb463f43f354a9d0a455b68128599df9a8aed0f7ac8e7b7fbbc219bee", + "sha256:639787884913ee65a617fd826abb6d8b0c4896d533d0caae05b031d7b4089faf", + "sha256:68877239810a357a100157233314784ab332ee33bc978de030d0135553db69e2", "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2", + "sha256:69b8e0559a01ef14b5d76882c2b49f643ab6d5b953ec5e5590411d2bdb707f4a", + "sha256:77627ca1909b1c9efdd42d7c7f680b22e620ffda5f64b01ba282bd5a59a5d108", "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc", "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1", "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c", + "sha256:839f695fedfb65dbca690ce57907e076d355ee7c34b857c13926e251d1381ce7", "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86", + "sha256:9175c938a11a371421e2221faf1ae9d32e86462953917854d70afd2048bb7495", "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4", "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c", "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34", "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b", + "sha256:a978f8308deff49581479be11e7455af9b3d368dd3c3cb5c22b32c691b12b172", + "sha256:acd3d75d7ce71850f9d3972f68baca1133a8cd27e6153d64d00be8504a491c8c", "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d", "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c", "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb", + "sha256:b811ca77229f55eab2d9b3c6abc6d44c9be3f04461f04ab87f523d778c55c782", "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7", "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737", "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3", @@ -576,10 +606,17 @@ "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53", "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78", "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803", + "sha256:da51ac8b4d42f9197cad065d6c3e2815eb768eac1d7fc0f9c343db280b1b9edc", "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a", "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f", + "sha256:dfeba8c78b9db00667b94cddb1db6559e068cb7f469e681a4e9aa74dc3e86b24", + "sha256:e35aff01f870f898f4e4b5360a3f18c98f9c47edab1c2d6bdfa5c876bf74ab73", + "sha256:e47100ec1e464ff8a43e4c96758fd9cd66d202986d93de0f2962c1a7cb851391", "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174", - "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5" + "sha256:e628d48defb4a7eacb2087d42f9a7576324279c9b769625941ba39d78c441e29", + "sha256:ebf35bb455f33c1ff3a61031a68f930bd69e88ee3a0882d3d5e677b823785d1e", + "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5", + "sha256:fb03b63e01fd848abb4219b2c2103a1962358c8f4db5150f7a5c1136d3e24d2e" ], "version": "==6.0" }, @@ -662,6 +699,8 @@ }, "typing-extensions": { "hashes": [ + "sha256:16224afa8cc2b3679dd9e9a1efe719dd2e20a03f0cc2e4cc4c97870ae9622532", + "sha256:3c2c2cd887648efa0ea8f8ba4260a1213058e8e4a25a6a6f4e084740b2c858e2", "sha256:5d8c9dac95c27d20df12fb1d97b9793ab8b2af8a3a525e68c80e21060c161771", "sha256:935ccf31549830cda708b42289d44b6f74084d616a00be651601a4f968e77c82" ], diff --git a/alembic.ini b/alembic.ini index da0e90e..c7ca37b 100644 --- a/alembic.ini +++ b/alembic.ini @@ -58,7 +58,7 @@ version_path_separator = os # Use os.pathsep. Default configuration used for ne # are written from script.py.mako # output_encoding = utf-8 -sqlalchemy.url = postgresql+asyncpg://together_app:togetherno.1@localhost/together_chat +sqlalchemy.url = postgresql+asyncpg://together:togetherno.1@localhost/together [post_write_hooks] diff --git a/migrations/env.py b/migrations/env.py index 9685a3e..ab3a924 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -18,7 +18,7 @@ if config.config_file_name is not None: # add your model's MetaData object here # for 'autogenerate' support -from src.database.db import BaseModel +from src.database.models import BaseModel # target_metadata = mymodel.Base.metadata target_metadata = BaseModel.metadata diff --git a/migrations/versions/2ac7bad1f528_create_user_account_table.py b/migrations/versions/2ac7bad1f528_create_user_account_table.py new file mode 100644 index 0000000..851eb71 --- /dev/null +++ b/migrations/versions/2ac7bad1f528_create_user_account_table.py @@ -0,0 +1,38 @@ +"""create user_account table + +Revision ID: 2ac7bad1f528 +Revises: +Create Date: 2023-07-03 01:00:13.176776 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '2ac7bad1f528' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('user_account', + sa.Column('id', sa.String(length=26), nullable=False), + sa.Column('username', sa.String(length=20), nullable=False), + sa.Column('email', sa.String(), nullable=False), + sa.Column('password', sa.String(), nullable=False), + sa.Column('updated_at', sa.DateTime(), nullable=False), + sa.Column('created_at', sa.DateTime(), nullable=False), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('email'), + sa.UniqueConstraint('username') + ) + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('user_account') + # ### end Alembic commands ### diff --git a/src/database/db.py b/src/database/db.py index 40ddff7..fc2a3dd 100644 --- a/src/database/db.py +++ b/src/database/db.py @@ -1,11 +1,6 @@ -from sqlalchemy.orm import DeclarativeBase from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine -db_url = "postgresql+asyncpg://together_app:togetherno.1@localhost/together_chat" +db_url = "postgresql+asyncpg://together:togetherno.1@localhost/together" engine = create_async_engine(db_url, echo=True) async_session = async_sessionmaker(engine, expire_on_commit=False) - -class BaseModel(DeclarativeBase): - pass - diff --git a/src/database/models.py b/src/database/models.py index db99adf..45fdb13 100644 --- a/src/database/models.py +++ b/src/database/models.py @@ -1,11 +1,15 @@ from datetime import datetime +from sqlalchemy.orm import DeclarativeBase from sqlalchemy.orm import mapped_column, Mapped from sqlalchemy import String, func import ulid -from .db import BaseModel + + +class BaseModel(DeclarativeBase): + pass class UserAccount(BaseModel):