fix

alembic/versions/rev001.py

@@ -9,6 +9,8 @@
 
 """
 
+import os
+
 import sqlalchemy as sa
 from sqlalchemy import schema
 
@@ -52,7 +54,7 @@ def upgrade():
         sa.PrimaryKeyConstraint("boathouse"),
     )
 
-    with open(f"{QUERIES_DIR}/override_event_triggers_v1.sql", "r") as f:
+    with open(os.path.join(QUERIES_DIR, "override_event_triggers_v1.sql"), "r") as f:
         sql = sa.text(f.read())
         conn.execute(sql)
 
@@ -71,16 +73,6 @@ def upgrade():
         sa.Column("reason", sa.TEXT(), nullable=True),
     )
 
-    with open(f"{QUERIES_DIR}/define_reach.sql", "r") as f:
-        sql = sa.text(f.read())
-        conn.execute(sql)
-    with open(f"{QUERIES_DIR}/define_boathouse.sql", "r") as f:
-        sql = sa.text(f.read())
-        conn.execute(sql)
-    with open(f"{QUERIES_DIR}/define_default_options.sql", "r") as f:
-        sql = sa.text(f.read())
-        conn.execute(sql)
-
 
 def downgrade():
     op.drop_table("live_website_options")

alembic/versions/rev002.py

@@ -7,6 +7,8 @@
 
 """
 
+import os
+
 import sqlalchemy as sa
 from sqlalchemy.engine.reflection import Inspector
 
@@ -77,7 +79,16 @@ def upgrade():
     op.create_unique_constraint(None, "boathouses", ["name"])
     op.create_foreign_key(None, "boathouses", "reach", ["reach_id"], ["id"])
     op.rename_table("boathouses", "boathouse")
-    with open(QUERIES_DIR + "/override_event_triggers_v2.sql", "r") as f:
+    with open(os.path.join(QUERIES_DIR, "override_event_triggers_v2.sql"), "r") as f:
+        sql = sa.text(f.read())
+        conn.execute(sql)
+    with open(os.path.join(QUERIES_DIR, "define_reach.sql"), "r") as f:
+        sql = sa.text(f.read())
+        conn.execute(sql)
+    with open(os.path.join(QUERIES_DIR, "define_boathouse.sql"), "r") as f:
+        sql = sa.text(f.read())
+        conn.execute(sql)
+    with open(os.path.join(QUERIES_DIR, "define_default_options.sql"), "r") as f:
         sql = sa.text(f.read())
         conn.execute(sql)
 

app/data/database.py

@@ -69,10 +69,6 @@ def init_db():
 
     alembic.config.main(["upgrade", "head"])
 
-    execute_sql_from_file("define_reach.sql")
-    execute_sql_from_file("define_boathouse.sql")
-    execute_sql_from_file("define_default_options.sql")
-
     # Now update the database
     from app.data.processing.core import update_db