fix parse json

biggora · Jan 6, 2016 · 367d304 · 367d304
1 parent f5faab6
commit 367d304
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/lib/adapters/mysql.js b/lib/adapters/mysql.js
@@ -409,7 +409,11 @@ MySQL.prototype.fromDatabase = function (model, data) {
                 val = new Date(val.toString().replace(/GMT.*$/, 'GMT'));
             }
             if ((props[key].type.name || '').toString().toLowerCase() === 'json' && typeof val == "string") {
-                val = JSON.parse(val);
+                try{
+                    val = JSON.parse(val);
+                } catch(err){
+
+                }
             }
         }
         data[key] = val;

diff --git a/lib/adapters/neo4j.js b/lib/adapters/neo4j.js
@@ -439,8 +439,9 @@ Neo4j.prototype.fromDatabase = function (model, data) {
             if (typeof val === 'string') {
                 try {
                     clean[key] = JSON.parse(val);
-                } catch(err){}
-
+                } catch(err){
+                    clean[key] = val;
+                }
             } else {
                 clean[key] = val;
             }

diff --git a/lib/adapters/postgres.js b/lib/adapters/postgres.js
@@ -327,6 +327,13 @@ PG.prototype.fromDatabase = function (model, data) {
     Object.keys(data).forEach(function (key) {
         var val = data[key];
         if (props[key]) {
+            if ((props[key].type.name || '').toString().toLowerCase() === 'json' && typeof val == "string") {
+                try{
+                    val = JSON.parse(val);
+                } catch(err){
+
+                }
+            }
             data[key] = val;
         }
     });

diff --git a/lib/adapters/sqlite3.js b/lib/adapters/sqlite3.js
@@ -241,7 +241,13 @@ SQLite3.prototype.fromDatabase = function (model, data) {
         var val = data[key], type = (props[key].type.name || '').toString().toLowerCase();
         if (props[key]) {
             if (type === 'json' && typeof val == "string") {
-                data[key] = JSON.parse(val);
+                if ((props[key].type.name || '').toString().toLowerCase() === 'json' && typeof val == "string") {
+                    try{
+                        data[key] = JSON.parse(val);
+                    } catch(err){
+                        data[key] = val;
+                    }
+                }
             } else if (type === 'date') {
                 if (!val) {
                     val = null;

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "caminte",
   "description": "ORM for every database: redis, mysql, neo4j, mongodb, rethinkdb, postgres, sqlite, tingodb",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "author": {
     "name": "Aleksej Gordejev",
     "email": "aleksej@gordejev.lv",