| author | Michael Krelin <hacker@klever.net> | 2013-11-27 17:11:26 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2013-11-27 17:11:26 (UTC) |
| commit | 0f1cc2ac41835ee8fa5dded1593fa95092b54bbe (patch) (side-by-side diff) | |
| tree | 8563cd1578aad126c803be452dedd3b9dd9e0921 | |
| parent | b59defff1efe85e43850243910007dd1fe3a4ef2 (diff) | |
| download | clipperz-0f1cc2ac41835ee8fa5dded1593fa95092b54bbe.zip clipperz-0f1cc2ac41835ee8fa5dded1593fa95092b54bbe.tar.gz clipperz-0f1cc2ac41835ee8fa5dded1593fa95092b54bbe.tar.bz2 | |
switched postgresql schema from json type to plaintext
| -rw-r--r-- | backend/node/src/clipperz.js | 20 | ||||
| -rw-r--r-- | backend/node/src/clipperz.schema.sql | 4 |
2 files changed, 13 insertions, 11 deletions
diff --git a/backend/node/src/clipperz.js b/backend/node/src/clipperz.js index b98c00e..b8b4d3e 100644 --- a/backend/node/src/clipperz.js +++ b/backend/node/src/clipperz.js @@ -20,12 +20,14 @@ function clipperz_store(PG) { "SELECT s_data FROM clipperz.thesession WHERE s_id=$1",[sid], - function(e,r) { cb(e,(e||!r.rowCount)?null:r.rows[0].s_data); } + function(e,r) { cb(e,(e||!r.rowCount)?null:JSON.parse(r.rows[0].s_data)); } ) }; - rv.prototype.set = function(sid,data,cb) { PG.Q( - "UPDATE clipperz.thesession SET s_data=$1, s_mtime=current_timestamp" - +" WHERE s_id=$2",[data,sid], function(e,r) { + rv.prototype.set = function(sid,data,cb) { + var d = JSON.stringify(data); + PG.Q( + "UPDATE clipperz.thesession SET s_data=$1, s_mtime=current_timestamp" + +" WHERE s_id=$2",[d,sid], function(e,r) { if(e) return cb(e); if(r.rowCount) return cb(); - PG.Q("INSERT INTO clipperz.thesession (s_id,s_data) VALUES ($1,$2)",[sid,data],cb); - } - ) }; + PG.Q("INSERT INTO clipperz.thesession (s_id,s_data) VALUES ($1,$2)",[sid,d],cb); + }); + }; rv.prototype.destroy = function(sid,cb) { PG.Q( @@ -228,3 +230,3 @@ var CLIPPERZ = module.exports = function(CONFIG) { u: function(cb) { - PG.Q("SELECT u_header::varchar,u_statistics,u_version FROM clipperz.theuser WHERE u_id=$1", + PG.Q("SELECT u_header,u_statistics,u_version FROM clipperz.theuser WHERE u_id=$1", [req.session.u],function(e,r) { @@ -504,3 +506,3 @@ var CLIPPERZ = module.exports = function(CONFIG) { "SELECT" - +" u_name, u_srp_s, u_srp_v, u_authversion, u_header::varchar, u_statistics, u_version" + +" u_name, u_srp_s, u_srp_v, u_authversion, u_header, u_statistics, u_version" +" FROM clipperz.theuser WHERE u_id=$1",[req.session.u],function(e,r) { diff --git a/backend/node/src/clipperz.schema.sql b/backend/node/src/clipperz.schema.sql index 1c2305c..591828a 100644 --- a/backend/node/src/clipperz.schema.sql +++ b/backend/node/src/clipperz.schema.sql @@ -7,3 +7,3 @@ CREATE TABLE clipperz.theuser ( u_srp_v varchar NOT NULL, - u_header json NOT NULL, + u_header varchar NOT NULL, u_statistics varchar NOT NULL, @@ -63,3 +63,3 @@ CREATE TABLE clipperz.thesession ( s_id varchar PRIMARY KEY, - s_data json, + s_data varchar, s_ctime timestamp DEFAULT current_timestamp, |