From c33248a0b221f19de0eb7185d630bbbd45b205dd Mon Sep 17 00:00:00 2001 From: LoRiot Date: Sat, 15 Oct 2022 18:28:02 +0300 Subject: [PATCH] Refactor queries --- db/migrations/drop_tables.py | 4 +++- db/migrations/init_tables.py | 36 ++++++++++++++++++------------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/db/migrations/drop_tables.py b/db/migrations/drop_tables.py index 8a74674..07d310e 100644 --- a/db/migrations/drop_tables.py +++ b/db/migrations/drop_tables.py @@ -5,7 +5,9 @@ from asyncpg.connection import Connection async def drop_tables(connection: Connection): - await connection.execute("DROP TABLE users, tags, categories, projects CASCADE") + await connection.execute( + "DROP TABLE users, tags, categories, projects CASCADE" + ) async def main(): diff --git a/db/migrations/init_tables.py b/db/migrations/init_tables.py index e6d88e3..2370a29 100644 --- a/db/migrations/init_tables.py +++ b/db/migrations/init_tables.py @@ -6,40 +6,40 @@ from asyncpg.connection import Connection async def init_tables(connection: Connection): init_users_query = """ - CREATE TABLE users ( \ - user_id bigint PRIMARY KEY, \ - is_admin boolean DEFAULT FALSE \ + CREATE TABLE users ( + user_id bigint PRIMARY KEY, + is_admin boolean DEFAULT FALSE ); """ await connection.execute(init_users_query) init_tags_query = """ - CREATE TABLE tags ( \ - id SERIAL PRIMARY KEY, \ - name varchar(100) \ + CREATE TABLE tags ( + id SERIAL PRIMARY KEY, + name varchar(100) ); """ await connection.execute(init_tags_query) init_categories_query = """ - CREATE TABLE categories ( \ - id SERIAL PRIMARY KEY, \ - name varchar(20) \ + CREATE TABLE categories ( + id SERIAL PRIMARY KEY, + name varchar(20) ); """ await connection.execute(init_categories_query) init_projects_query = """ CREATE TABLE projects ( - id SERIAL PRIMARY KEY, \ - name varchar(50), \ - description varchar(1000), \ - creator bigint REFERENCES users, \ - contributors smallint DEFAULT 1, \ - status bit(1) DEFAULT B'1', \ - tag int REFERENCES tags, \ - category int REFERENCES categories, \ - creation_date date DEFAULT CURRENT_DATE \ + id SERIAL PRIMARY KEY, + name varchar(50), + description varchar(1000), + creator bigint REFERENCES users, + contributors smallint DEFAULT 1, + status bit(1) DEFAULT B'1', + tag int REFERENCES tags, + category int REFERENCES categories, + creation_date date DEFAULT CURRENT_DATE ); """ await connection.execute(init_projects_query)