Merge branch 'master' of asdf.us:swimmer

1 files changed, 11 insertions, 12 deletions

diff --git a/cli/app/sql/common.py b/cli/app/sql/common.py
index c8bd557..8e1d2b3 100644
--- a/cli/app/sql/common.py
+++ b/cli/app/sql/common.py
@@ -2,7 +2,6 @@ import os
 import glob
 import time
 
-# import mysql.connector
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.ext.declarative import declarative_base
@@ -11,16 +10,16 @@ from flask_sqlalchemy import SQLAlchemy
 
 from app.settings import app_cfg
 
-# connection_url = "mysql+mysqlconnector://{}:{}@{}/{}?charset=utf8mb4".format(
-#   os.getenv("DB_USER"),
-#   os.getenv("DB_PASS"),
-#   os.getenv("DB_HOST"),
-#   os.getenv("DB_NAME")
-# )
-
-os.makedirs(app_cfg.DIR_DATABASE, exist_ok=True)
-
-connection_url = "sqlite:///{}".format(os.path.join(app_cfg.DIR_DATABASE, 'swimmer.sqlite3'))
+if app_cfg.USE_SQLITE:
+  os.makedirs(app_cfg.DIR_DATABASE, exist_ok=True)
+  connection_url = "sqlite:///{}".format(os.path.join(app_cfg.DIR_DATABASE, 'swimmer.sqlite3'))
+else:
+  connection_url = "mysql+pymysql://{}:{}@{}/{}?charset=utf8mb4".format(
+    os.getenv("DB_USER"),
+    os.getenv("DB_PASS"),
+    os.getenv("DB_HOST"),
+    os.getenv("DB_NAME")
+  )
 
 engine = create_engine(connection_url, encoding="utf-8", pool_recycle=3600)
 
@@ -31,7 +30,7 @@ Base.metadata.bind = engine
 db = SQLAlchemy()
 
 # include the models in reverse dependency order, so relationships work
+from app.sql.models.upload import Upload
 from app.sql.models.tile import Tile
 from app.sql.models.page import Page
 from app.sql.models.graph import Graph
-from app.sql.models.upload import Upload