Merge branch 'main' into dev

Author: ackava

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@entity-access/entity-access",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "description": "",
   "main": "index.js",
   "scripts": {

package.json

@@ -1,4 +1,4 @@
-import { joinAny, joinMap, prepareAny } from "../../query/ast/IStringTransformer.js";
+import { expandParamArray, joinAny, joinMap, prepareAny } from "../../query/ast/IStringTransformer.js";
 import { NotSupportedError } from "../../query/parser/NotSupportedError.js";
 import Sql from "../../sql/Sql.js";
 import { ISqlHelpers, flattenMethods } from "../ISqlHelpers.js";
@@ -280,8 +280,12 @@ export const PostgreSqlHelper: ISqlHelpers = {
         iLike(text, test) {
             return prepareAny `(${text} iLike ${test})`;
         },
-        iLikeAny(text, test) {
-            return ["(" , text , " iLIKE ANY (ARRAY[", (x)=> joinMap(",", x, test, (item) => [() => item] ), "]))"] as any;
+        iLikeAny(text, input) {
+            return expandParamArray({
+                input,
+                prefix: ["(", text , " iLIKE ANY (ARRAY["],
+                suffix: ["]))"]
+            });
         },
         indexOf(text, test) {
             return prepareAny `(strpos(${text}, ${test}) - 1)`;
@@ -295,8 +299,12 @@ export const PostgreSqlHelper: ISqlHelpers = {
         like(text, test) {
             return prepareAny `(${text} LIKE ${test})`;
         },
-        likeAny(text, test) {
-            return ["(" , text , " LIKE ANY (ARRAY[", (x)=> joinMap(",", x, test, (item) => [() => item] ), "]))"] as any;
+        likeAny(text, input) {
+            return expandParamArray({
+                input,
+                prefix: ["(", text , " LIKE ANY (ARRAY["],
+                suffix: ["]))"]
+            });
         },
         lower(text) {
             return prepareAny `LOWER(${text})`;

src/compiler/postgres/PostgreSqlMethodTransformer.ts

@@ -1,5 +1,5 @@
 
-import { joinAny, joinMap, prepareAny } from "../../query/ast/IStringTransformer.js";
+import { expandParamArray, joinAny, joinMap, prepareAny } from "../../query/ast/IStringTransformer.js";
 import Sql from "../../sql/Sql.js";
 import { ISqlHelpers, flattenMethods } from "../ISqlHelpers.js";
 
@@ -281,8 +281,14 @@ export const SqlServerSqlHelper: ISqlHelpers = {
         iLike(text, test) {
             return prepareAny `(${text} like ${test})`;
         },
-        iLikeAny(text, test) {
-            return ["(", (x)=> joinMap(" OR ", x, test, (item) => [ "(" , text, " like ", () => item , ")" ]), ")"] as any;
+        iLikeAny(text, input) {
+            return expandParamArray({
+                input,
+                sep: " OR ",
+                prefix: ["("],
+                fx: (item) => ["(", text, " like ", () => item, ")" ] as any,
+                suffix: [")"]
+            });
         },
         indexOf(text, test) {
             return prepareAny `(CHARINDEX(${test}, ${text}) - 1)`;

src/compiler/sql-server/SqlServerSqlMethodTransformer.ts

@@ -20,6 +20,37 @@ export class QueryParameter {
     }
 }
 
+export const expandParamArray = ({
+    sep = ",",
+    input,
+    prefix = [],
+    suffix = [],
+    emptyResult = [" false "],
+    fx = (xi) => [() => xi]
+}) => [(p) => {
+    const a = input[0](p);
+    if (!a.length) {
+        return emptyResult;
+    }
+    const r = prefix;
+    let s = "";
+    for (const iterator of a) {
+        if (s) {
+            r.push(s);
+        }
+        s = sep;
+        const items = fx(iterator).flat(2);
+        for (const fi of items) {
+            r.push(fi);
+        }
+    }
+    for(const sx of suffix) {
+        r.push(sx);
+    }
+    return r.flat(2);
+}] as any;
+
+
 export const joinMap = (sep: string, input, a: any, fx: ((item) => any) = (xi) => [() => xi]) => {
     const r = [];
     a = (Array.isArray(a) ? a.map((x) => x(input)) : a(input)).flat(2);

src/query/ast/IStringTransformer.ts

@@ -27,5 +27,8 @@ export default function () {
 
     r = compiler.execute({ names }, (x, p) => Sql.text.iLikeAny(x.firstName, p.names));
     assert.equal(`(x."firstName" iLIKE ANY (ARRAY[$1,$2]))`, r.text);
+
+    r = compiler.execute({ names: [] }, (x, p) => Sql.text.iLikeAny(x.firstName, p.names));
+    assert.equal(` false `, r.text);
 }
 

src/tests/expressions/simple/parse-array.ts

@@ -0,0 +1,30 @@
+import assert from "assert";
+import Sql from "../../../sql/Sql.js";
+import QueryCompiler from "../../../compiler/QueryCompiler.js";
+import SqlServerQueryCompiler from "../../../drivers/sql-server/SqlServerQueryCompiler.js";
+
+export default function () {
+
+    const compiler = new SqlServerQueryCompiler();
+
+    const names = ["Akash", "Simmi"];
+
+    let r = compiler.execute({ names }, (x, p) => Sql.in(x.firstName, p.names));
+    assert.equal(`x.[firstName] IN ($1,$2)`, r.text);
+
+    r = compiler.execute({ names }, (x, p) => x.firstName in p.names);
+    assert.equal(`x.[firstName] IN ($1,$2)`, r.text);
+
+    r = compiler.execute({ names }, (x, p) => x.firstName in ["a", "b"]);
+    assert.equal(`x.[firstName] IN (N'a',N'b')`, r.text);
+
+    r = compiler.execute({ names }, (x, p) => Sql.text.likeAny(x.firstName, p.names));
+    assert.equal(`((x.[firstName] LIKE $1) OR (x.[firstName] LIKE $2))`, r.text);
+
+    r = compiler.execute({ names }, (x, p) => Sql.text.iLikeAny(x.firstName, p.names));
+    assert.equal(`((x.[firstName] like $1) OR (x.[firstName] like $2))`, r.text);
+
+    r = compiler.execute({ names: [] }, (x, p) => Sql.text.iLikeAny(x.firstName, p.names));
+    assert.equal(` false `, r.text);
+}
+