diff --git a/steam_chat_viewer/__init__.py b/steam_chat_viewer/__init__.py index 48c3f48..d94798a 100644 --- a/steam_chat_viewer/__init__.py +++ b/steam_chat_viewer/__init__.py @@ -5,18 +5,16 @@ from flask import Flask, request from subprocess import check_output import json -from .pg import query +from .pg import query, select app = Flask(__name__) @app.route('/') def home(): - r = query( + return str('RESULTS:', select( ''' SELECT * FROM messages + ORDER BY date + LIMIT 10 ''' - ) - for row in r.rows: - print(row) - - return str('RESULTS:', r.rowcount) + )) diff --git a/steam_chat_viewer/pg.py b/steam_chat_viewer/pg.py index 23ff61e..2b95abe 100644 --- a/steam_chat_viewer/pg.py +++ b/steam_chat_viewer/pg.py @@ -7,6 +7,7 @@ from flask import g def db(): if not hasattr(g, 'db_connection'): g.db_connection = pg8000.connect( + host=environ['DB_HOST'], database=environ['DB_NAME'], user=environ['DB_USER'], password=environ['DB_PASSWORD'], @@ -20,14 +21,12 @@ def query(query, **params): cursor.paramstyle = "named" cursor.execute(query, params) db().commit() - - columns = [x[0] for x in cursor.description] - rows = [dict(zip(columns, row)) for row in cursor.fetchall()] - - return DBResult( - rows=rows, - rowcount=cursor.rowcount, - ) + return cursor except: db().rollback() raise + +def select(query, **params): + cursor = query(query, **params) + columns = [x[0] for x in cursor.description] + return [dict(zip(columns, row)) for row in cursor.fetchall()]