diff --git a/.gitignore b/.gitignore index 792f7d9..2b4fd5b 100644 --- a/.gitignore +++ b/.gitignore @@ -139,4 +139,4 @@ TODO.txt sql_tester.py conf outputs -dakiny.db \ No newline at end of file +database \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 543f981..1415ee1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ COPY dakiny_bot.py dakiny_bot.py COPY requirements.txt requirements.txt COPY config.py config.py COPY classes classes/ -COPY database database +COPY database_setup database_setup/ RUN pip install -r requirements.txt diff --git a/classes/election_cycle.py b/classes/election_cycle.py index 3ae32b2..13b654e 100644 --- a/classes/election_cycle.py +++ b/classes/election_cycle.py @@ -9,7 +9,7 @@ from sqlalchemy import select from sqlalchemy.orm import Session from config import DakinyConfig -from database.sql_data_classes import ElectionInformation, engine +from database_setup.sql_data_classes import ElectionInformation, engine from utils import get_datetime diff --git a/dakiny_bot.py b/dakiny_bot.py index fb7bba8..1c42bb8 100644 --- a/dakiny_bot.py +++ b/dakiny_bot.py @@ -6,7 +6,7 @@ import nextcord from hydra.core.config_store import ConfigStore from nextcord.ext import commands -import database.create_database as create_database +import database_setup.create_database as create_database from config import DakinyConfig cs = ConfigStore.instance() diff --git a/database/create_database.py b/database_setup/create_database.py similarity index 59% rename from database/create_database.py rename to database_setup/create_database.py index 427f3ea..7b975ca 100644 --- a/database/create_database.py +++ b/database_setup/create_database.py @@ -5,11 +5,11 @@ Small script to create the database if it doesn't already exist. import sqlite3 from os.path import exists -if not exists("dakiny.db"): - with sqlite3.connect("dakiny.db") as con: +if not exists("database/dakiny.db"): + with sqlite3.connect("database/dakiny.db") as con: cur = con.cursor() - with open("database/database.sql", mode="r", encoding="utf-8") as file: + with open("database_setup/database.sql", mode="r", encoding="utf-8") as file: database_script = file.read() cur.executescript(database_script) con.commit() diff --git a/database/database.sql b/database_setup/database.sql similarity index 100% rename from database/database.sql rename to database_setup/database.sql diff --git a/database/sql_data_classes.py b/database_setup/sql_data_classes.py similarity index 90% rename from database/sql_data_classes.py rename to database_setup/sql_data_classes.py index cbee89d..d7ed893 100644 --- a/database/sql_data_classes.py +++ b/database_setup/sql_data_classes.py @@ -5,7 +5,7 @@ from sqlalchemy import create_engine from sqlalchemy.ext.automap import automap_base # connect with sql alchemy and autoload schema -URL = "sqlite+pysqlite:///dakiny.db" +URL = "sqlite+pysqlite:///database/dakiny.db" engine = create_engine(URL) Base = automap_base() Base.prepare(autoload_with=engine)