From 5cfac18c5c8edce6a0c085a5b5a4af8dd057e239 Mon Sep 17 00:00:00 2001
From: Julian Rother <julianr@fsmpi.rwth-aachen.de>
Date: Tue, 30 Aug 2016 23:29:43 +0200
Subject: [PATCH] Change db code for compatability with mysql
---
db.py | 6 +++++-
db_schema.sql | 3 +--
server.py | 4 ++--
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/db.py b/db.py
index 9cc7b5d..db07d33 100644
--- a/db.py
+++ b/db.py
@@ -41,7 +41,11 @@ def query(operation, *params):
request.db.execute(operation, params)
else:
return []
- return request.db.fetchall()
+ try:
+ rows = request.db.fetchall()
+ except:
+ rows = []
+ return rows
@app.teardown_request
def commit_db(*args):
diff --git a/db_schema.sql b/db_schema.sql
index e39e009..bb9e81c 100644
--- a/db_schema.sql
+++ b/db_schema.sql
@@ -105,8 +105,7 @@ CREATE TABLE IF NOT EXISTS `log` (
`time` datetime NOT NULL,
`object` varchar(10),
`obj_id` INTEGER,
- `path` varchar(255) NOT NULL,
- PRIMARY KEY (ip, id, time, path)
+ `path` varchar(255) NOT NULL
);
CREATE TABLE IF NOT EXISTS `streams` (
`handle` varchar(32) NOT NULL PRIMARY KEY,
diff --git a/server.py b/server.py
index be1aa86..31bf7f8 100755
--- a/server.py
+++ b/server.py
@@ -161,7 +161,7 @@ def edit():
'site_texts': ('site_texts', 'key', ['value']),
'videos': ('videos_data', 'id', ['visible'])
}
- query('BEGIN TRANSACTION')
+ query('BEGIN')
if request.is_json:
changes = request.get_json().items()
else:
@@ -172,7 +172,7 @@ def edit():
assert column in tabs[table][2]
query('UPDATE %s SET %s = ? WHERE %s = ?'%(tabs[table][0], column,
tabs[table][1]), val, id)
- query('COMMIT TRANSACTION')
+ query('COMMIT')
return "OK", 200
@app.route('/auth')
--
GitLab