prostgles-server 2.0.168 → 2.0.169

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/dist/Filtering.js +1 -1
  2. package/dist/Filtering.js.map +1 -1
  3. package/lib/Filtering.ts +1 -1
  4. package/package.json +1 -1
  5. package/tests/client/PID.txt +1 -1
  6. package/tests/isomorphic_queries.js +5 -0
  7. package/tests/isomorphic_queries.ts +6 -0
  8. package/tests/server/DBoGenerated.d.ts +8 -0
  9. package/tests/server/index.js +1 -0
  10. package/tests/server/index.ts +1 -0
  11. package/tests/server/init.sql +6 -0
  12. package/tests/server/package-lock.json +1 -1
package/dist/Filtering.js CHANGED
@@ -258,7 +258,7 @@ const parseFilterItem = (args) => {
258
258
  else {
259
259
  /** Maybe it's an object key which means it's an equality comparison against a json object */
260
260
  if (selItem?.column_udt_type?.startsWith("json")) {
261
- return leftQ + " = " + parseRightVal(fVal);
261
+ return leftQ + " = " + parseRightVal(rightF);
262
262
  }
263
263
  return mErr("Unrecognised filter operand: " + fOpType + " ");
264
264
  }
package/dist/Filtering.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Filtering.js","sourceRoot":"","sources":["../lib/Filtering.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Filtering.js","sourceRoot":"","sources":["../lib/Filtering.ts"],"names":[],"mappings":";;;AAGA,qDAAmK;AACnK,6CAA6C;AAOtC,MAAM,eAAe,GAAG,CAAC,IAAyB,EAAU,EAAE;IACnE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAErD,IAAG,CAAC,EAAE,IAAI,IAAA,yBAAO,EAAC,EAAE,CAAC;QAAE,OAAO,EAAE,CAAC;IAEjC,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE;QACzB,MAAM,GAAG,GAAG,KAAK,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAA;IAChD,CAAC,EACD,OAAO,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjD,MAAM,KAAK,GAAG,IAAA,yBAAO,EAAC,EAAE,CAAC,CAAA;IACzB,IAAG,KAAK,CAAC,MAAM,KAAK,CAAC,EAAC;QAClB,OAAO,EAAE,CAAC;KACb;SAAM,IAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAC;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,uBAAe,EAAC;YACrC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE;YACxB,MAAM;YACN,UAAU;YACV,GAAG;SACJ,CAAC,CAAC;aACF,IAAI,EAAE,CAAC,wGAAwG;aAC/G,IAAI,CAAC,OAAO,CAAC,CAAA;KACf;IAED,MAAM,IAAI,GAAW,KAAK,CAAC,CAAC,CAAC,CAAC;IAE9B,mBAAmB;IACnB,IAAG,6BAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,EAAC;QAChC,sBAAsB;KACvB;IAED,IAAI,OAA+B,CAAC;IACpC,IAAG,MAAM;QAAE,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC;IACxD,IAAI,MAAM,GAAoB,EAAU,CAAC,IAAI,CAAC,CAAC;IAE/C,MAAM,QAAQ,GAAG,CAAC,MAAkB,EAAE,EAAE;QACtC,IAAG,MAAM,CAAC,IAAI,KAAK,UAAU;YAAE,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;QACxD,OAAO,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC,CAAA;IAED;;QAEI;IACJ,IAAI,KAAyB,CAAC,CAAA,2BAA2B;IAEzD,sDAAsD;IACtD,MAAM,mBAAmB,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACxC,IAAG,CAAC,OAAO,EAAC;QAEV,iEAAiE;QACjE,IAAG,MAAM,EAAC;YACR,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CACxB,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC;gBACxB,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAC1E,CAAC;SACH;QACD,IAAG,CAAC,OAAO,EAAE;YACX,IAAI,CAAC,oDAAoD,CAAC,CAAC;YAC3D,MAAM,GAAG,CAAA;SACV;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEtD,uBAAuB;QACvB,IAAG,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,EAAC;YAC/B,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YAM1B,MAAM,MAAM,GAAG,CAAC,OAAO,GAAG,CAAC,EAAa,EAAE;gBACxC,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;gBAC3C,IAAI,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAChC,IAAI,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAClC,IAAG,GAAG,GAAG,CAAC,CAAC,EAAE;oBACX,yDAAyD;oBACzD,IAAG,GAAG,KAAK,IAAI;wBAAE,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAA;oBAC1D,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAA;iBACzC;gBACD,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC7B,IAAG,GAAG,GAAG,CAAC,CAAC,EAAE;oBACX,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAA;iBAC1C;gBAED,OAAO,SAAS,CAAC;YACnB,CAAC,CAAA;YAGD,IAAI,OAAO,GAAG,MAAM,EAAE,CAAC;YACvB,OAAM,OAAO,EAAC;gBACZ,IAAI,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAEvD,IAAI,OAAO,GAAG,OAAO,CAAA,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC;gBAEzD,oDAAoD;gBACpD,IAAG,OAAO,IAAI,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,KAAK,YAAY,CAAC,MAAM,EAAE;oBAClE,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC;oBAC9B,OAAO,GAAI,SAAS,CAAC;iBACtB;gBAED,oCAAoC;gBACpC,KAAK,IAAI,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;gBAC9F,OAAO,GAAG,OAAO,CAAC;aACnB;YAEH,6DAA6D;SAC5D;aAAM,IAAG,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,EAAC;YACrC,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YAE1B,IAAI,MAAM,GAAG,CAAC,OAAO,GAAG,CAAC,EAAE,EAAE;gBAC3B,MAAM,GAAG,GAAG,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBACrD,IAAG,GAAG,GAAG,CAAC,CAAC;oBAAE,OAAO,OAAO,GAAG,GAAG,CAAC;gBAClC,OAAO,GAAG,CAAC;YACb,CAAC,CAAA;YACD,IAAI,OAAO,GAAG,MAAM,EAAE,CAAC;YACvB,IAAI,GAAG,GAAQ,EAAE,CAAC;YAClB,IAAI,MAAM,GAAG,GAAG,CAAC;YAEjB,OAAM,OAAO,GAAG,CAAC,CAAC,EAAC;gBACjB,IAAI,OAAO,GAAG,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;gBAClC,IAAI,IAAI,GAAG,OAAO,GAAG,CAAC,CAAC,CAAA,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC;gBAEvD,oDAAoD;gBACpD,IAAG,OAAO,GAAG,CAAC,KAAK,YAAY,CAAC,MAAM,EAAE;oBACtC,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC;oBAC3B,OAAO,GAAG,CAAC,CAAC,CAAC;iBACd;gBAED,MAAM,GAAG,GAAG,YAAY,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;gBAClD,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,GAAG,CAAC,CAAC,CAAA,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,EAAU,CAAC,IAAI,CAAC,CAAC;gBACnD,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;gBAErB,OAAO,GAAG,OAAO,CAAC;aACnB;YAED,MAAM,GAAG,GAAG,CAAC;SACd;aAAM;YACL,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;YACjD,IAAI,CAAC,yEAAyE,CAAC,CAAA;SAChF;KAEF;SAAM;QACL,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;KAC3B;IAED,IAAG,CAAC,KAAK;QAAE,IAAI,CAAC,iCAAiC,CAAC,CAAC;IAEnD,uBAAuB;IACvB,IAAG,IAAA,0BAAa,EAAC,MAAM,CAAC,EAAC;QACvB,MAAM,aAAa,GAAG,CAAC,GAAQ,EAAE,SAAiC,IAAI,EAAE,EAAE;YACxE,MAAM,UAAU,GAAG,GAAG,EAAE;gBACtB,IAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;oBAAE,OAAO,IAAI,CAAC,sDAAsD,CAAC,CAAC;YAC9F,CAAC,CAAA;YACD,IAAG,MAAM,KAAK,KAAK,EAAC;gBAClB,UAAU,EAAE,CAAC;gBACb,OAAO,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;aAEzC;iBAAM,IAAG,MAAM,KAAK,OAAO,IAAI,OAAO,IAAI,OAAO,CAAC,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,KAAK,OAAO,EAAC;gBAC1G,UAAU,EAAE,CAAC;gBACb,OAAO,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;aAE/C;YAED,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC,CAAA;QAED,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvC,IAAG,UAAU,CAAC,MAAM,KAAK,CAAC;YAAE,IAAI,CAAC,oCAAoC,CAAC,CAAC;QAEvE,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QAC7B,IAAI,OAA2B,CAAC;QAChC,IAAI,IAAS,CAAC;QAEd,IAAG,IAAI,IAAI,IAAA,0BAAa,EAAC,IAAI,CAAC,EAAC;YAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/B,IAAG,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAC;gBACnC,OAAO,IAAI,CAAC,0DAA0D,CAAC,CAAC;aACzE;YACD,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;SAEtB;QACD,0CAA0C;QAE1C,uDAAuD;QACvD,IAAG,OAAO,EAAE,eAAe,KAAK,MAAM,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC;YACnG,KAAK,IAAI,SAAS,CAAA;SACnB;QAED,sBAAsB;QACtB,IAAG,gCAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,kCAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC;YACnF,oGAAoG;YACpG,IAAG,OAAO,CAAC,WAAW,EAAE,KAAK,iBAAiB;gBAAE,KAAK,IAAI,YAAY,CAAA;YACrE,OAAO,KAAK,GAAG,IAAI,OAAO,GAAG,GAAG,GAAG,OAAO,GAAG,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;SAE3E;aAAM,IAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAC;YACnD,IAAG,IAAI,KAAK,IAAI;gBAAE,OAAO,KAAK,GAAG,WAAW,CAAC;YAC7C,OAAO,KAAK,GAAG,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;SAE5C;aAAM,IAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC;YACxC,IAAG,IAAI,KAAK,IAAI;gBAAE,OAAO,KAAK,GAAG,eAAe,CAAC;YACjD,OAAO,KAAK,GAAG,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;SAE7C;aAAM,IAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC;YACvC,OAAO,KAAK,GAAG,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;SAE5C;aAAM,IAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC;YACvC,OAAO,KAAK,GAAG,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;SAE5C;aAAM,IAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC;YACzC,OAAO,KAAK,GAAG,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;SAE9C;aAAM,IAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC;YACzC,OAAO,KAAK,GAAG,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;SAE7C;aAAM,IAAG,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC;YAClC,IAAG,CAAC,IAAI,EAAE,MAAM,EAAE;gBAChB,OAAO,SAAS,CAAC;aAClB;YAED,IAAI,KAAK,GAAU,IAAI,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;YACvD,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC;YACrB,IAAG,KAAK,CAAC,MAAM;gBAAE,EAAE,GAAG,KAAK,GAAG,MAAM,GAAG,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACnE,IAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAAE,EAAE,GAAG,IAAI,KAAK,WAAW,CAAC;YAClD,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAE7C;aAAM,IAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC;YACnC,IAAG,CAAC,IAAI,EAAE,MAAM,EAAE;gBAChB,OAAO,QAAQ,CAAC;aACjB;YAED,IAAI,KAAK,GAAU,IAAI,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;YACvD,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC;YACrB,IAAG,KAAK,CAAC,MAAM;gBAAE,EAAE,GAAG,KAAK,GAAG,UAAU,GAAG,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACvE,IAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAAE,EAAE,GAAG,IAAI,KAAK,eAAe,CAAC;YACtD,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAE9C;aAAM,IAAG,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC;YACvC,IAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAC;gBAC3C,OAAO,IAAI,CAAC,+CAA+C,CAAC,CAAC;aAC9D;YACD,OAAO,KAAK,GAAG,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SAE5E;aAAM,IAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC;YACrC,OAAO,KAAK,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;SAE1C;aAAM,IAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC;YACpC,OAAO,KAAK,GAAG,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;SAEzC;aAAM,IAAG,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC;YACtC,OAAO,KAAK,GAAG,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;SAE9C;aAAM,IAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC;YACrC,OAAO,KAAK,GAAG,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;YAE9C,+BAA+B;SAC9B;aAAM,IAAG,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC;YAChF,IAAI,OAAO,GAAG,OAAO,KAAK,IAAI,CAAA,CAAC,CAAC,IAAI,CAAA,CAAC;gBACjC,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA,CAAC,CAAC,IAAI,CAAC,CAAC;oBAC7C,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA,CAAC,CAAC,IAAI,CAAC,CAAC;wBAChC,IAAI,CAAC;YAET,oBAAoB;YACpB,IAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAC;gBACrB,OAAO,KAAK,GAAG,OAAO,GAAG,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAExD,cAAc;aACb;iBAAM,IAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,qDAAmC,CAAC,QAAQ,CAAC,OAAQ,CAAC,EAAE;gBAC5F,IAAI,EAAE,GAAG,eAAe,KAAK,SAAS,CAAC;gBACvC,IAAG,OAAO,IAAI,OAAO,CAAC,gBAAgB,KAAK,UAAU;oBAAE,EAAE,GAAG,KAAM,CAAC;gBAEnE,IAAI,GAAG,GAAG,GAAG,EAAE,IAAI,OAAO,GAAG,GAAG,GAAG,OAAO,GAAG,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;gBAE1E,OAAO,GAAG,CAAC;aACZ;iBAAM;gBACL,OAAO,IAAI,CAAC,+BAA+B,GAAG,OAAO,GAAG,GAAG,CAAC,CAAC;aAC9D;SAEF;aAAM;YACL,6FAA6F;YAC7F,IAAG,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,MAAM,CAAC,EAAC;gBAC9C,OAAO,KAAK,GAAG,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;aAC9C;YAED,OAAO,IAAI,CAAC,+BAA+B,GAAG,OAAO,GAAG,GAAG,CAAC,CAAC;SAC9D;KAGF;SAAM;QAEL,wBAAwB;QACxB,IAAG,MAAM,KAAK,IAAI,EAAC;YACjB,OAAO,KAAK,GAAG,WAAW,CAAC;SAC5B;aAAM;YACL,OAAO,KAAK,GAAG,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;SACxC;KACF;AACH,CAAC,CAAA;AA1SY,QAAA,eAAe,mBA0S3B;AAGD,4BAA4B;AAC5B,0CAA0C;AAE1C,kCAAkC;AAClC,wCAAwC;AACxC,4BAA4B;AAC5B,4CAA4C;AAC5C,4CAA4C;AAC5C,sBAAsB;AACtB,wDAAwD;AACxD,oFAAoF;AACpF,QAAQ;AACR,UAAU;AACV,OAAO;AACP,2BAA2B;AAC3B,4BAA4B;AAC5B,4CAA4C;AAC5C,sBAAsB;AACtB,wDAAwD;AACxD,6DAA6D;AAC7D,sDAAsD;AACtD,QAAQ;AACR,MAAM;AACN,KAAK"}
package/lib/Filtering.ts CHANGED
@@ -291,7 +291,7 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
291
291
  } else {
292
292
  /** Maybe it's an object key which means it's an equality comparison against a json object */
293
293
  if(selItem?.column_udt_type?.startsWith("json")){
294
- return leftQ + " = " + parseRightVal(fVal);
294
+ return leftQ + " = " + parseRightVal(rightF);
295
295
  }
296
296
 
297
297
  return mErr("Unrecognised filter operand: " + fOpType + " ");
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "prostgles-server",
3
- "version": "2.0.168",
3
+ "version": "2.0.169",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/tests/client/PID.txt CHANGED
@@ -1 +1 @@
1
- 44563
1
+ 48913
package/tests/isomorphic_queries.js CHANGED
@@ -413,6 +413,11 @@ async function isomorphic(db) {
413
413
  assert_1.strict.deepStrictEqual(d, [{ id: 1, name: 'abc123', public: 'public data2', $rowhash: '9d18ddfbff9e13411d13f82d414644de', added_day: 'monday' }]);
414
414
  console.log("TODO: socket.io stringifies dates");
415
415
  });
416
+ await tryRun("JSONB filtering", async () => {
417
+ const row = await db.obj_table.insert({ obj: { propName: 3232 } }, { returning: "*" });
418
+ const sameRow = await db.obj_table.findOne({ obj: { propName: 3232 } });
419
+ assert_1.strict.deepStrictEqual(row, sameRow);
420
+ });
416
421
  await tryRun("Postgis examples", async () => {
417
422
  await db.shapes.delete();
418
423
  const p1 = { ST_GeomFromText: ["POINT(-1 1)", 4326] }, p2 = { ST_GeomFromText: ["POINT(-2 2)", 4326] };
package/tests/isomorphic_queries.ts CHANGED
@@ -467,6 +467,12 @@ export default async function isomorphic(db: Partial<DbHandler> | Partial<DBHand
467
467
  console.log("TODO: socket.io stringifies dates")
468
468
  });
469
469
 
470
+ await tryRun("JSONB filtering", async () => {
471
+ const row = await db.obj_table.insert({obj: { propName: 3232 }}, { returning: "*" });
472
+ const sameRow = await db.obj_table.findOne({obj: { propName: 3232 }});
473
+ assert.deepStrictEqual(row, sameRow)
474
+ })
475
+
470
476
  await tryRun("Postgis examples", async () => {
471
477
  await db.shapes.delete();
472
478
  const p1 = { ST_GeomFromText: ["POINT(-1 1)", 4326] },
package/tests/server/DBoGenerated.d.ts CHANGED
@@ -100,6 +100,10 @@ export type Media = {
100
100
  "signed_url_expires"?: number;
101
101
  "url"?: string;
102
102
  }
103
+ export type Obj_table = {
104
+ "id"?: number;
105
+ "obj"?: Object;
106
+ }
103
107
  export type Planes = {
104
108
  "flight_number"?: string;
105
109
  "id"?: number;
@@ -188,6 +192,7 @@ export type DBObj = {
188
192
  "items_with_one_media": TableHandler<Items_with_one_media>
189
193
  "lookup_col1": TableHandler<Lookup_col1>
190
194
  "media": TableHandler<Media>
195
+ "obj_table": TableHandler<Obj_table>
191
196
  "planes": TableHandler<Planes>
192
197
  "prostgles_lookup_media_items_with_media": TableHandler<Prostgles_lookup_media_items_with_media>
193
198
  "prostgles_lookup_media_items_with_one_media": TableHandler<Prostgles_lookup_media_items_with_one_media>
@@ -254,6 +259,9 @@ export type I18N_DBO_CONFIG<LANG_IDS = { en: 1, fr: 1 }> = {
254
259
  "media": {
255
260
  [key in "content_type" | "description" | "etag" | "extension" | "id" | "name" | "original_name" | "s3_url" | "signed_url" | "signed_url_expires" | "url"]: { [lang_id in keyof LANG_IDS]: string };
256
261
  };
262
+ "obj_table": {
263
+ [key in "id" | "obj"]: { [lang_id in keyof LANG_IDS]: string };
264
+ };
257
265
  "planes": {
258
266
  [key in "flight_number" | "id" | "last_updated" | "x" | "y"]: { [lang_id in keyof LANG_IDS]: string };
259
267
  };
package/tests/server/index.js CHANGED
@@ -246,6 +246,7 @@ const dbConnection = {
246
246
  insert: "*",
247
247
  update: "*",
248
248
  },
249
+ obj_table: "*",
249
250
  media: "*",
250
251
  items_with_one_media: "*",
251
252
  items_with_media: "*",
package/tests/server/index.ts CHANGED
@@ -269,6 +269,7 @@ const dbConnection = {
269
269
  insert: "*",
270
270
  update: "*",
271
271
  },
272
+ obj_table: "*",
272
273
  media: "*",
273
274
  items_with_one_media: "*",
274
275
  items_with_media: "*",
package/tests/server/init.sql CHANGED
@@ -156,6 +156,12 @@ CREATE TABLE IF NOT EXISTS tr2 (
156
156
  UNIQUE(id, t1)
157
157
  );
158
158
 
159
+ DROP TABLE IF EXISTS obj_table CASCADE;
160
+ CREATE TABLE IF NOT EXISTS obj_table (
161
+ id SERIAL PRIMARY KEY,
162
+ obj JSONB
163
+ );
164
+
159
165
  /*
160
166
 
161
167
  SELECT
package/tests/server/package-lock.json CHANGED
@@ -21,7 +21,7 @@
21
21
  },
22
22
  "../..": {
23
23
  "name": "prostgles-server",
24
- "version": "2.0.167",
24
+ "version": "2.0.168",
25
25
  "license": "MIT",
26
26
  "dependencies": {
27
27
  "@aws-sdk/client-s3": "^3.95.0",