fix: jsonb[] column parsing

Author: Laszlo Radics

lib/pgConverters.d.ts

@@ -4,3 +4,4 @@ export declare let arraySplitToNum: (val: any) => any;
 export declare let arraySplitToNumWithValidation: (val: any) => any;
 export declare let stringArrayToNumWithValidation: (val: any) => any;
 export declare let arraySplitToDate: (val: any) => any;
+export declare let arraySplitToJson: (str: any) => any[];

lib/pgConverters.js

@@ -36,6 +36,7 @@ CREATE TABLE IF NOT EXISTS "users" (
     "aCategory" varchar,
 
 	"textList" text[],
+	"jsonbList" jsonb[],
 	"numberList" integer[], -- int4
 	"bigNumberList" bigInt[],  -- int8
 	"timestamptzList" timestamptz[],

lib/pgConverters.js.map

@@ -4,15 +4,15 @@ import * as moment from 'moment';
 export let arraySplit = (str) => {
     if (str == "{}") return [];
     str = str.substring(1, str.length - 1); //cut off {}
-    let e = /(?:"((?:[^"]|\\")*)"|([^,"]*))(?:,|$)/g; //has to be mutable because of exec
+    let e = /(?:("(?:[^"\\]|\\.)*")|([^,"]*))(?:,|$)/g; //has to be mutable because of exec
     let valList = [];
     let parsingResult;
     do {
         parsingResult = e.exec(str);
         let valStr = (parsingResult[2] == 'NULL') ? null :
-            (parsingResult[1] == null ? parsingResult[2] : parsingResult[1].replace(/\\\\/g, '\\')).replace(/\\"/g,'"');
+            (parsingResult[1] == null ? parsingResult[2] : JSON.parse(parsingResult[1])); // for string parsing, escape \
         valList.push(valStr);
-    } while (parsingResult[0].substring(parsingResult[0].length - 1, parsingResult[0].length) == ',');
+    } while (e.lastIndex < str.length);
     return valList;
 };
 export let numWithValidation = val => {
@@ -26,4 +26,7 @@ export let arraySplitToNum = val => val == "{}" ? [] : val.substring(1, val.leng
 export let arraySplitToNumWithValidation = val => val == "{}" ? [] : val.substring(1, val.length - 1).split(',').map(numWithValidation);
 export let stringArrayToNumWithValidation = val => val.map(numWithValidation);
 export let arraySplitToDate = val => val == "{}" ? [] : val.substring(1, val.length - 1).split(',').map(d => moment(d.substring(1, d.length - 1)).toDate());
-
+export let arraySplitToJson = (str) => {
+    let vals = arraySplit(str);
+    return vals.map(s=> typeof s === 'string' ? JSON.parse(s) : s);
+};

lib/pgDb.js

@@ -298,6 +298,7 @@ export class PgDb extends QueryAble {
         }
 
         for (let r of specialTypeFields.rows) {
+            // https://doxygen.postgresql.org/include_2catalog_2pg__type_8h_source.html
             switch (r.typid) {
                 case 114:  // json
                 case 3802: // jsonb
@@ -313,6 +314,13 @@ export class PgDb extends QueryAble {
                 case 1021: // real[] float4[]
                     pg.types.setTypeParser(r.typid, PgConverters.arraySplitToNum);
                     break;
+                case 1009: // text[]
+                case 1015: // varchar[]
+                    pg.types.setTypeParser(r.typid, PgConverters.arraySplit);
+                    break;
+                case 3807:
+                    pg.types.setTypeParser(r.typid, PgConverters.arraySplitToJson);
+                    break;
                 case 1016: // bigInt[] int8[]
                 case 1022: // double[] float8[]
                     //pg.types.setTypeParser(r.typid, arraySplitToNumWithValidation);

lib/pgDb.js.map

@@ -1,6 +1,7 @@
 /// <reference types="jasmine"/>
 import {PgDb} from "../pgDb";
 import {PgTable} from "../pgTable";
+import * as _ from 'lodash';
 
 const util = require('util');
 
@@ -763,14 +764,24 @@ describe("pgdb", () => {
     }));
 
     it("Testing text array parsing", w(async () => {
-        let list = ["'A'", '"A"', '//', '\\', '""', "''", '--', '/*', '<!--'];
+        let list = ["'A'", '"A"', 'normal','//', '\\', '""', "''", '--', '/*', '','<!--', JSON.stringify({a:1,b:"aprocska\"kalapocska'bennecsacskamacskamocska"})];
         await table.insert({name: 'A', textList: list});
         let rec: any = await table.findOne({name: 'A'});
-        // console.log(list + '\n' + rec.textList);
+        console.log(list + '\n' + rec.textList);
         let isDifferent = list.some((v, i) => rec.textList[i] !== v);
         expect(isDifferent).toBeFalsy();
     }));
 
+    it("Testing jsonb array parsing", w(async () => {
+        let list = [{"id":"fl1ace84f744","name":"Wire 2017-09-17 at 11.57.55.png","type":"image/png","path":"/data/files/fl1ace84f744/Wire 2017-09-17 at 11.57.55.png","title":"Wire 2017-09-17 at 11.57.55"}];
+        await table.insert({name: 'A', jsonbList: list});
+        let rec: any = await table.findOne({name: 'A'});
+        console.log('xxx',rec.jsonbList, typeof rec.jsonbList[0]);
+        console.log(JSON.stringify(list) + '\n' + JSON.stringify(rec.jsonbList));
+        let isDifferent = list.some((v, i) => !_.isEqual(rec.jsonbList[i] , v));
+        expect(isDifferent).toBeFalsy();
+    }));
+
     it("Testing distinct", w(async () => {
         await table.insert({name: 'A', aCategory: 'A'});
         await table.insert({name: 'B', aCategory: 'A'});