From f1f0c0c6de496ced0448dc6514346045d0632f0e Mon Sep 17 00:00:00 2001 From: imcompiling Date: Mon, 3 Mar 2025 15:18:31 -0500 Subject: [PATCH] Rename database_setup directory to database. --- cogs/commands/create.py | 2 +- cogs/commands/delete.py | 2 +- cogs/commands/refresh.py | 2 +- cogs/commands/set.py | 2 +- cogs/commands/submission.py | 2 +- cogs/commands/update.py | 2 +- cogs/commands/view.py | 2 +- cogs/commands/views/delete_confirm.py | 2 +- cogs/commands/views/update_username_verify.py | 2 +- cogs/guild_listener/__init__.py | 2 +- cogs/loops/guild_data.py | 2 +- cogs/submission/verification_view.py | 2 +- {database_setup => database}/database_test.py | 3 ++- {database_setup => database}/db.py | 0 {database_setup => database}/models.py | 0 {database_setup => database}/pyproject.toml | 0 utilities/utils.py | 2 +- 17 files changed, 15 insertions(+), 14 deletions(-) rename {database_setup => database}/database_test.py (90%) rename {database_setup => database}/db.py (100%) rename {database_setup => database}/models.py (100%) rename {database_setup => database}/pyproject.toml (100%) diff --git a/cogs/commands/create.py b/cogs/commands/create.py index 843dfe9..b5214f6 100644 --- a/cogs/commands/create.py +++ b/cogs/commands/create.py @@ -5,7 +5,7 @@ from nextcord.ext import commands from sqlalchemy import exc, select from sqlalchemy.orm import Session -from database_setup.db import Category, CategoryGroup, engine +from database.db import Category, CategoryGroup, engine from utilities.utils import MAX_LINE_LENGTH, autofill_groups, send_highscore_message diff --git a/cogs/commands/delete.py b/cogs/commands/delete.py index 616333b..d7325ef 100644 --- a/cogs/commands/delete.py +++ b/cogs/commands/delete.py @@ -6,7 +6,7 @@ from sqlalchemy import distinct, select from sqlalchemy.orm import Session # pylint: disable=import-error -from database_setup.db import Category, CategoryGroup, Score, engine +from database.db import Category, CategoryGroup, Score, engine from utilities.utils import ( autofill_categories, autofill_groups, diff --git a/cogs/commands/refresh.py b/cogs/commands/refresh.py index 020e66f..fef3415 100644 --- a/cogs/commands/refresh.py +++ b/cogs/commands/refresh.py @@ -8,7 +8,7 @@ from sqlalchemy import select from sqlalchemy.orm import Session # pylint: disable=import-error -from database_setup.db import CategoryGroup, engine +from database.db import CategoryGroup, engine from utilities.utils import autofill_groups, send_highscore_message diff --git a/cogs/commands/set.py b/cogs/commands/set.py index 0d66276..6026ce8 100644 --- a/cogs/commands/set.py +++ b/cogs/commands/set.py @@ -8,7 +8,7 @@ from sqlalchemy import select from sqlalchemy.orm import Session # pylint: disable=import-error -from database_setup.db import CategoryGroup, Guild, engine +from database.db import CategoryGroup, Guild, engine from utilities.utils import MAX_LINE_LENGTH, autofill_groups diff --git a/cogs/commands/submission.py b/cogs/commands/submission.py index cc8ef24..2d89bfb 100644 --- a/cogs/commands/submission.py +++ b/cogs/commands/submission.py @@ -8,7 +8,7 @@ from sqlalchemy import select from sqlalchemy.orm import Session from cogs.submission.verification_view import VerificationView -from database_setup.db import Category, CategoryGroup, Guild, Submission, engine +from database.db import Category, CategoryGroup, Guild, Submission, engine from main import logger from utilities.utils import autofill_categories, autofill_groups, submit_score diff --git a/cogs/commands/update.py b/cogs/commands/update.py index ae46474..671eece 100644 --- a/cogs/commands/update.py +++ b/cogs/commands/update.py @@ -8,7 +8,7 @@ from sqlalchemy import select from sqlalchemy.orm import Session # pylint: disable=import-error -from database_setup.db import Guild, engine +from database.db import Guild, engine from utilities.utils import autofill_users_in_guild from .views.update_username_verify import UpdateUsernameVerifyView diff --git a/cogs/commands/view.py b/cogs/commands/view.py index d53d6bf..f1b6f0a 100644 --- a/cogs/commands/view.py +++ b/cogs/commands/view.py @@ -7,7 +7,7 @@ from sqlalchemy import select from sqlalchemy.orm import Session # pylint: disable=import-error -from database_setup.db import Category, CategoryGroup, Score, engine +from database.db import Category, CategoryGroup, Score, engine from utilities.utils import MAX_LINE_LENGTH, autofill_categories, autofill_groups, format_score_string diff --git a/cogs/commands/views/delete_confirm.py b/cogs/commands/views/delete_confirm.py index c1a0c06..85b3145 100644 --- a/cogs/commands/views/delete_confirm.py +++ b/cogs/commands/views/delete_confirm.py @@ -7,7 +7,7 @@ from sqlalchemy import delete, select from sqlalchemy.orm import Session # pylint: disable=import-error -from database_setup.db import Category, CategoryGroup, engine +from database.db import Category, CategoryGroup, engine from utilities.utils import send_highscore_message diff --git a/cogs/commands/views/update_username_verify.py b/cogs/commands/views/update_username_verify.py index a13261d..3aefd27 100644 --- a/cogs/commands/views/update_username_verify.py +++ b/cogs/commands/views/update_username_verify.py @@ -5,7 +5,7 @@ from sqlalchemy import distinct, exc, select from sqlalchemy.orm import Session # pylint: disable=import-error -from database_setup.db import Category, CategoryGroup, Score, engine +from database.db import Category, CategoryGroup, Score, engine from utilities.utils import send_highscore_message diff --git a/cogs/guild_listener/__init__.py b/cogs/guild_listener/__init__.py index 0892ad2..c3df5a6 100644 --- a/cogs/guild_listener/__init__.py +++ b/cogs/guild_listener/__init__.py @@ -8,7 +8,7 @@ from sqlalchemy import select from sqlalchemy.orm import Session # pylint: disable=import-error -from database_setup.db import Guild, engine +from database.db import Guild, engine class GuildListener(commands.Cog, name="Guild Listener"): diff --git a/cogs/loops/guild_data.py b/cogs/loops/guild_data.py index 3a47035..3760731 100644 --- a/cogs/loops/guild_data.py +++ b/cogs/loops/guild_data.py @@ -7,7 +7,7 @@ from sqlalchemy import select from sqlalchemy.orm import Session # pylint: disable=import-error -from database_setup.db import Guild, engine +from database.db import Guild, engine class GuildData(commands.Cog, name="Guild Data"): diff --git a/cogs/submission/verification_view.py b/cogs/submission/verification_view.py index 0acb654..7cdd522 100644 --- a/cogs/submission/verification_view.py +++ b/cogs/submission/verification_view.py @@ -4,7 +4,7 @@ import nextcord from sqlalchemy import delete, select from sqlalchemy.orm import Session -from database_setup.db import Submission, engine +from database.db import Submission, engine # pylint: disable=import-error from utilities.utils import submit_score diff --git a/database_setup/database_test.py b/database/database_test.py similarity index 90% rename from database_setup/database_test.py rename to database/database_test.py index 91e9d3e..b2ba0f0 100644 --- a/database_setup/database_test.py +++ b/database/database_test.py @@ -1,6 +1,7 @@ -from database_setup.models import CategoryGroup, Guild from sqlmodel import Session, SQLModel, create_engine +from database.models import CategoryGroup, Guild + url = "sqlite:///database.db" engine = create_engine(url) SQLModel.metadata.create_all(engine) diff --git a/database_setup/db.py b/database/db.py similarity index 100% rename from database_setup/db.py rename to database/db.py diff --git a/database_setup/models.py b/database/models.py similarity index 100% rename from database_setup/models.py rename to database/models.py diff --git a/database_setup/pyproject.toml b/database/pyproject.toml similarity index 100% rename from database_setup/pyproject.toml rename to database/pyproject.toml diff --git a/utilities/utils.py b/utilities/utils.py index c85040a..47f9abb 100644 --- a/utilities/utils.py +++ b/utilities/utils.py @@ -8,7 +8,7 @@ from sqlalchemy import distinct, select from sqlalchemy.orm import Session, aliased # pylint: disable=import-error -from database_setup.db import Category, CategoryGroup, Guild, Score, engine +from database.db import Category, CategoryGroup, Guild, Score, engine MAX_LINE_LENGTH = 142