@sqb/postgres-dialect 4.0.1-beta.8 → 4.0.3

package/dist/PostgresSerializer.js

@@ -18,7 +18,7 @@ class PostgresSerializer {
             case builder_1.SerializationType.COMPARISON_EXPRESSION:
                 return this._serializeComparison(ctx, o, defFn);
             case builder_1.SerializationType.EXTERNAL_PARAMETER:
-                return this._serializeParameter(ctx, o);
+                return this._serializeParameter(ctx, o, defFn);
         }
     }
     _serializeSelect(ctx, o, defFn) {
@@ -32,40 +32,51 @@ class PostgresSerializer {
         return out;
     }
     _serializeComparison(ctx, o, defFn) {
-        if (typeof o.right === 'string') {
-            if (o.operatorType === 'in' && o.right.toLowerCase() === 'null') {
-                o.symbol = '=';
-            }
-            else if (o.right.startsWith('(')) {
+        if (o.right) {
+            if (o.right.expression.toLowerCase() === 'null') {
                 if (o.operatorType === 'eq')
-                    o.symbol = 'in';
+                    return defFn(ctx, { ...o, operatorType: builder_1.OperatorType.is, symbol: 'is' });
                 if (o.operatorType === 'ne')
-                    o.symbol = 'not in';
+                    return defFn(ctx, { ...o, operatorType: builder_1.OperatorType.isNot, symbol: 'is not' });
             }
-            else {
-                if (o.right.substring(0, 1) === '$') {
-                    if (o.operatorType === 'in') {
-                        o.symbol = '=';
-                        o.right = 'ANY(' + o.right + ')';
-                    }
-                    if (o.operatorType === 'notIn') {
-                        o.symbol = '!=';
-                        o.right = 'ANY(' + o.right + ')';
-                    }
+            if (o.left.isParam && o.left.isArray && o.left.value != null && !Array.isArray(o.left.value))
+                o.left.value = [o.left.value];
+            if (o.right.isParam && o.right.isArray && o.right.value != null && !Array.isArray(o.right.value))
+                o.right.value = [o.right.value];
+            if ((o.operatorType === 'in' || o.operatorType === 'notIn')) {
+                if (o.left.isArray && !o.right.isArray && o.right.isParam) {
+                    const left = o.left;
+                    const right = o.right;
+                    left.expression = 'ANY(' + left.expression + ')';
+                    return defFn(ctx, {
+                        ...o,
+                        operatorType: builder_1.OperatorType.eq,
+                        symbol: o.operatorType === 'notIn' ? '!=' : '=',
+                        left: right,
+                        right: left
+                    });
+                }
+                if (o.left.isArray && o.right.isArray) {
+                    if (o.operatorType === 'notIn')
+                        o.left.expression = 'not ' + o.left.expression;
+                    return defFn(ctx, { ...o, symbol: '&&' });
+                }
+                if (!o.left.isArray && o.right.isArray && o.right.isParam) {
+                    o.right.expression = 'ANY(' + o.right.expression + ')';
+                    return defFn(ctx, {
+                        ...o,
+                        operatorType: builder_1.OperatorType.eq,
+                        symbol: o.operatorType === 'notIn' ? '!=' : '='
+                    });
                 }
             }
         }
         return defFn(ctx, o);
     }
-    _serializeParameter(ctx, o) {
-        let prmValue = ctx.params && ctx.params[o.name];
-        if (prmValue === undefined)
-            return 'null';
-        if (o.isArray && !Array.isArray(prmValue))
-            prmValue = [prmValue];
-        ctx.queryParams = ctx.queryParams || [];
-        ctx.queryParams.push(prmValue);
-        return '$' + ctx.queryParams.length;
+    _serializeParameter(ctx, o, defFn) {
+        ctx.preparedParams = ctx.preparedParams || [];
+        defFn(ctx, o);
+        return '$' + ctx.preparedParams.length;
     }
 }
 exports.PostgresSerializer = PostgresSerializer;

package/dist/index.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const builder_1 = require("@sqb/builder");
 const PostgresSerializer_1 = require("./PostgresSerializer");
-builder_1.registerSerializer(new PostgresSerializer_1.PostgresSerializer());
+(0, builder_1.registerSerializer)(new PostgresSerializer_1.PostgresSerializer());

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/postgres-dialect",
   "description": "SQB serialization extension for PostgreSQL database",
-  "version": "4.0.1-beta.8",
+  "version": "4.0.3",
   "author": "Panates Ltd.",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>"
@@ -24,13 +24,13 @@
     "database"
   ],
   "dependencies": {
-    "compare-versions": "^3.6.0"
+    "compare-versions": "^4.1.1"
   },
   "devDependencies": {},
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "engines": {
-    "node": ">= 10.0"
+    "node": ">= 14.0"
   },
   "directories": {
     "lib": "dist",
@@ -45,7 +45,7 @@
     "temp-dir": "./coverage/.nyc_output"
   },
   "scripts": {
-    "test": "ts-mocha -p test/tsconfig.json --paths --reporter spec test/**/*.spec.ts",
+    "test": "TS_NODE_PROJECT='./test/tsconfig.json' mocha -r ts-node/register -r tsconfig-paths/register --reporter spec test/**/*.spec.ts",
     "cover": "nyc --reporter=cobertura --reporter html --reporter text npm run test",
     "build": "tsc -b tsconfig-build.json",
     "compile": "tsc -b tsconfig.json",