diff options
Diffstat (limited to 'python/common.py')
| -rw-r--r-- | python/common.py | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/python/common.py b/python/common.py index f0cc3fdf..4124b669 100644 --- a/python/common.py +++ b/python/common.py @@ -11,23 +11,21 @@ conn = psycopg2.connect(database="ET", password="Serenitas1", host="debian") -def query_db(sqlstr, **kwargs): - c = conn.cursor() +def query_db(conn, sqlstr, **kwargs): + params = kwargs.get('params', None) one = kwargs.get('one', True) try: - if params: - c.execute(sqlstr, params) - else: - c.execute(sqlstr) + with conn.cursor() as c: + if params: + c.execute(sqlstr, params) + else: + c.execute(sqlstr) + if one: + return c.fetchone() + else: + return c.fetchall() except psycopg2.Error: c.close() conn.rollback() return None - - if one: - result = c.fetchone() - else: - result = c.fetchall() - c.close() - return result |