@sqb/oracle-dialect 5.0.4 → 5.0.5

package/oracle-serializer.js

@@ -1,4 +1,4 @@
-import { OperatorType, SerializationType, SerializeContext, } from '@sqb/builder';
+import { isParam, OperatorType, SerializationType, SerializeContext, } from '@sqb/builder';
 import { toDateString } from 'valgen';
 const reservedWords = ['comment', 'dual'];
 export class OracleSerializer {
@@ -86,32 +86,26 @@ export class OracleSerializer {
         return defFn(ctx, arr) || 'from dual';
     }
     _serializeComparison(ctx, o, defFn) {
-        if (o.right &&
-            o.right.expression?.startsWith(':') &&
-            Array.isArray(o.right?.value)) {
-            const s = o.right.expression.substring(1);
-            if (ctx.params)
-                delete ctx.params[s];
-            if (ctx.preparedParams)
-                delete ctx.preparedParams[s];
-            if (ctx.paramOptions)
-                delete ctx.paramOptions[s];
-            o.right.expression = ctx.anyToSQL(o.right.value);
-            o.right.isParam = false;
-            if (o.operatorType === 'eq')
-                return defFn(ctx, {
-                    ...o,
-                    operatorType: OperatorType.is,
-                    symbol: 'in',
-                });
-            if (o.operatorType === 'ne')
-                return defFn(ctx, {
-                    ...o,
-                    operatorType: OperatorType.isNot,
-                    symbol: 'not in',
-                });
+        if (isParam(o.orgRight)) {
+            const n = o.orgRight._name;
+            const v = ctx.orgParams?.[n];
+            if (Array.isArray(v)) {
+                o.right.isParam = false;
+                if (o.operatorType === 'eq')
+                    return defFn(ctx, {
+                        ...o,
+                        operatorType: OperatorType.in,
+                        symbol: 'in',
+                    });
+                if (o.operatorType === 'ne')
+                    return defFn(ctx, {
+                        ...o,
+                        operatorType: OperatorType.notIn,
+                        symbol: 'not in',
+                    });
+            }
         }
-        else if ((o.right?.expression && o.right?.expression === 'null') ||
+        if ((o.right?.expression && o.right?.expression === 'null') ||
             (o.right &&
                 o.right?.value == null &&
                 (!o.right.expression || o.right.expression.startsWith(':')))) {
@@ -194,6 +188,10 @@ export class OracleSerializer {
                 ctx.preparedParams[o.name] = toDateString(v).replace('T', ' ');
                 return `TO_DATE(:${o.name}, 'yyyy-mm-dd hh24:mi:ss.SSSSS')`;
             }
+            if (Array.isArray(v)) {
+                delete ctx.params?.[o.name];
+                return ctx.anyToSQL(v);
+            }
         }
         return defFn(ctx, o);
     }

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@sqb/oracle-dialect",
   "description": "SQB serialization extension for Oracle database",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "author": "Panates",
   "license": "Apache-2.0",
   "dependencies": {
-    "valgen": "^6.2.0",
+    "valgen": "^6.2.2",
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@sqb/builder": "^5.0.4"
+    "@sqb/builder": "^5.0.5"
   },
   "type": "module",
   "module": "./index.js",