From b6c0170748e670298a9945564aa0b74218dbaeee Mon Sep 17 00:00:00 2001
From: RunasSudo <runassudo@yingtongli.me>
Date: Mon, 26 Mar 2018 21:20:19 +1100
Subject: [PATCH] Fix sessions for PostgreSQL backend

---
 eosweb/core/main.py | 7 ++++++-
 requirements.txt    | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/eosweb/core/main.py b/eosweb/core/main.py
index fd5e261..68905ac 100644
--- a/eosweb/core/main.py
+++ b/eosweb/core/main.py
@@ -70,7 +70,7 @@ if app.config['DB_TYPE'] == 'mongodb':
 	app.config['SESSION_MONGODB_DB'] = dbinfo.provider.db_name
 elif app.config['DB_TYPE'] == 'postgresql':
 	app.config['SESSION_TYPE'] = 'sqlalchemy'
-	app.config['SQLALCHEMY_DATABASE_URI'] = dbinfo.provider.conn.dsn
+	app.config['SQLALCHEMY_DATABASE_URI'] = app.config['DB_URI'] + app.config['DB_NAME']
 flask_session.Session(app)
 
 # Set configs
@@ -115,6 +115,11 @@ def run_tests(prefix, lang):
 	import eos.tests
 	eos.tests.run_tests(prefix, lang)
 
+# Create the session databases (SQL only)
+@app.cli.command('sessdb')
+def sessdb():
+	app.session_interface.db.create_all()
+
 # TODO: Will remove this once we have a web UI
 @app.cli.command('drop_db_and_setup')
 def setup_test_election():
diff --git a/requirements.txt b/requirements.txt
index bdb7948..60da549 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,6 +3,7 @@ Flask==0.12.2
 Flask-Mail==0.9.1
 Flask-OAuthlib==0.9.4
 Flask-Session==0.3.1
+Flask-SQLAlchemy==2.3.2
 gunicorn==19.7.1
 libsass==0.13.4
 premailer==3.1.1