summaryrefslogtreecommitdiffstats
path: root/server/database.py
diff options
context:
space:
mode:
Diffstat (limited to 'server/database.py')
-rw-r--r--server/database.py17
1 files changed, 10 insertions, 7 deletions
diff --git a/server/database.py b/server/database.py
index 36eebcc..617798b 100644
--- a/server/database.py
+++ b/server/database.py
@@ -122,13 +122,16 @@ class Database(object):
curs = self.conn.cursor()
# Query
- sql = "SELECT %s FROM %s %s %s" % (
- ",".join(fields),
- table,
- joins and "%s" % joins or "",
- where and "WHERE %s" % " AND ".join(["%s = %%(%s)s" % (k,k) for (k,v) in where.items()] or "")
- )
- curs.execute(sql, where)
+ try:
+ sql = "SELECT %s FROM %s %s %s" % (
+ ",".join(fields),
+ table,
+ joins and "%s" % joins or "",
+ where and "WHERE %s" % " AND ".join(["%s = %%(%s)s" % (k,k) for (k,v) in where.items()] or "")
+ )
+ curs.execute(sql, where)
+ except Exception, err:
+ raise Exception, "** SQL ERROR *** %s\n** SQL ERROR ** Message: %s" % ((sql % where), str(err))
# Extract field names
fields = []