@querypanel/node-sdk 1.2.6 → 1.2.7

package/dist/index.js

@@ -338,10 +338,15 @@ var ClickHouseAdapter = class {
       return;
     }
     const allowedSet = new Set(this.allowedTables);
-    const tablePattern = /(?:FROM|JOIN)\s+(?:FINAL\s+)?(?:(?:[a-zA-Z_][a-zA-Z0-9_]*)\.)?(["'`]?[a-zA-Z_][a-zA-Z0-9_]*["'`]?)/gi;
+    const tablePattern = /\b(FROM|JOIN)\s+(?:FINAL\s+)?(?:(?:[a-zA-Z_][a-zA-Z0-9_]*)\.)?(["'`]?[a-zA-Z_][a-zA-Z0-9_]*["'`]?)/gi;
     const matches = sql.matchAll(tablePattern);
     for (const match of matches) {
-      const table = match[1]?.replace(/["'`]/g, "");
+      const clause = match[1]?.toUpperCase();
+      const matchIndex = match.index ?? -1;
+      if (clause === "JOIN" && matchIndex >= 0 && isArrayJoinClause(sql, matchIndex)) {
+        continue;
+      }
+      const table = match[2]?.replace(/["'`]/g, "");
       if (table) {
         if (!allowedSet.has(table)) {
           throw new Error(
@@ -409,6 +414,11 @@ function normalizeTableFilter2(tables) {
   }
   return normalized;
 }
+function isArrayJoinClause(sql, joinIndex) {
+  const beforeJoin = sql.slice(0, joinIndex);
+  const previousToken = beforeJoin.trim().split(/\s+/).pop()?.toUpperCase();
+  return previousToken === "ARRAY";
+}
 function transformColumnRow(row) {
   const unwrappedType = unwrapTypeModifiers(row.type);
   const column = {