diff --git a/.example.env b/.example.env index ea2d3c2..294d6b6 100644 --- a/.example.env +++ b/.example.env @@ -19,11 +19,18 @@ APP_PORT=4700 #DATABASE_PORT=5432 #DATABASE_NAME=firstadvancedev -DATABASE_USER=firstadvance -DATABASE_PASSWORD=FirstAdvance! -DATABASE_HOST=dev-data.simbrellang.net -DATABASE_PORT=10532 -DATABASE_NAME=firstadvancedev +DATABASE_USER=system +DATABASE_PASSWORD=FIRSTADV_PASS +DATABASE_HOST=10.10.33.65 +DATABASE_PORT=1521 +DATABASE_SID=FREE + + +# DATABASE_USER=firstadvance +# DATABASE_PASSWORD=FirstAdvance! +# DATABASE_HOST=dev-data.simbrellang.net +# DATABASE_PORT=10532 +# DATABASE_NAME=firstadvancedev #Events if Needed diff --git a/app/config.py b/app/config.py index d1f3065..2e6964f 100644 --- a/app/config.py +++ b/app/config.py @@ -19,8 +19,13 @@ class Config: DATABASE_HOST = os.environ.get("DATABASE_HOST") DATABASE_PORT = os.environ.get("DATABASE_PORT", 10532) DATABASE_NAME = os.environ.get("DATABASE_NAME") + DATABASE_SID = os.environ.get("DATABASE_SID", "FREE") + DNS = f"(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={DATABASE_HOST})(PORT={DATABASE_PORT}))(CONNECT_DATA=(SID={DATABASE_SID})))" + + + # SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}" + SQLALCHEMY_DATABASE_URI = (f"oracle+oracledb://{DATABASE_USER}:{DATABASE_PASSWORD}@{DNS}") - SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}" SQLALCHEMY_TRACK_MODIFICATIONS = False SIMBRELLA_BASE_URL = os.getenv("SIMBRELLA_BASE_URL", "http://127.0.0.1:6337") diff --git a/requirements.txt b/requirements.txt index 7b051ea..9112edc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,7 @@ flask-sqlalchemy flask-migrate psycopg2-binary alembic +oracledb # Schema for validations Flask-Marshmallow==0.15.0