@leonardovida-md/drizzle-neo-duckdb 1.1.3 → 1.2.0

package/dist/index.mjs

@@ -15,489 +15,6 @@ import { PgTransaction } from "drizzle-orm/pg-core";
 import { PgPreparedQuery, PgSession } from "drizzle-orm/pg-core/session";
 import { fillPlaceholders, sql } from "drizzle-orm/sql/sql";
 
-// src/sql/query-rewriters.ts
-var OPERATORS = [
-  { token: "@>", fn: "array_has_all" },
-  { token: "<@", fn: "array_has_all", swap: true },
-  { token: "&&", fn: "array_has_any" }
-];
-var isWhitespace = (char) => char !== undefined && /\s/.test(char);
-function scrubForRewrite(query) {
-  let scrubbed = "";
-  let state = "code";
-  for (let i = 0;i < query.length; i += 1) {
-    const char = query[i];
-    const next = query[i + 1];
-    if (state === "code") {
-      if (char === "'") {
-        scrubbed += "'";
-        state = "single";
-        continue;
-      }
-      if (char === '"') {
-        scrubbed += '"';
-        state = "double";
-        continue;
-      }
-      if (char === "-" && next === "-") {
-        scrubbed += "  ";
-        i += 1;
-        state = "lineComment";
-        continue;
-      }
-      if (char === "/" && next === "*") {
-        scrubbed += "  ";
-        i += 1;
-        state = "blockComment";
-        continue;
-      }
-      scrubbed += char;
-      continue;
-    }
-    if (state === "single") {
-      if (char === "'" && next === "'") {
-        scrubbed += "''";
-        i += 1;
-        continue;
-      }
-      scrubbed += char === "'" ? "'" : ".";
-      if (char === "'") {
-        state = "code";
-      }
-      continue;
-    }
-    if (state === "double") {
-      if (char === '"' && next === '"') {
-        scrubbed += '""';
-        i += 1;
-        continue;
-      }
-      scrubbed += char === '"' ? '"' : ".";
-      if (char === '"') {
-        state = "code";
-      }
-      continue;
-    }
-    if (state === "lineComment") {
-      scrubbed += char === `
-` ? `
-` : " ";
-      if (char === `
-`) {
-        state = "code";
-      }
-      continue;
-    }
-    if (state === "blockComment") {
-      if (char === "*" && next === "/") {
-        scrubbed += "  ";
-        i += 1;
-        state = "code";
-      } else {
-        scrubbed += " ";
-      }
-    }
-  }
-  return scrubbed;
-}
-function findNextOperator(scrubbed, start) {
-  for (let idx = start;idx < scrubbed.length; idx += 1) {
-    for (const operator of OPERATORS) {
-      if (scrubbed.startsWith(operator.token, idx)) {
-        return { index: idx, operator };
-      }
-    }
-  }
-  return null;
-}
-function walkLeft(source, scrubbed, start) {
-  let idx = start;
-  while (idx >= 0 && isWhitespace(scrubbed[idx])) {
-    idx -= 1;
-  }
-  let depth = 0;
-  for (;idx >= 0; idx -= 1) {
-    const ch = scrubbed[idx];
-    if (ch === ")" || ch === "]") {
-      depth += 1;
-    } else if (ch === "(" || ch === "[") {
-      if (depth === 0) {
-        return [idx + 1, source.slice(idx + 1, start + 1)];
-      }
-      depth = Math.max(0, depth - 1);
-    } else if (depth === 0 && isWhitespace(ch)) {
-      return [idx + 1, source.slice(idx + 1, start + 1)];
-    }
-  }
-  return [0, source.slice(0, start + 1)];
-}
-function walkRight(source, scrubbed, start) {
-  let idx = start;
-  while (idx < scrubbed.length && isWhitespace(scrubbed[idx])) {
-    idx += 1;
-  }
-  let depth = 0;
-  for (;idx < scrubbed.length; idx += 1) {
-    const ch = scrubbed[idx];
-    if (ch === "(" || ch === "[") {
-      depth += 1;
-    } else if (ch === ")" || ch === "]") {
-      if (depth === 0) {
-        return [idx, source.slice(start, idx)];
-      }
-      depth = Math.max(0, depth - 1);
-    } else if (depth === 0 && isWhitespace(ch)) {
-      return [idx, source.slice(start, idx)];
-    }
-  }
-  return [scrubbed.length, source.slice(start)];
-}
-function adaptArrayOperators(query) {
-  if (query.indexOf("@>") === -1 && query.indexOf("<@") === -1 && query.indexOf("&&") === -1) {
-    return query;
-  }
-  let rewritten = query;
-  let scrubbed = scrubForRewrite(query);
-  let searchStart = 0;
-  while (true) {
-    const next = findNextOperator(scrubbed, searchStart);
-    if (!next)
-      break;
-    const { index, operator } = next;
-    const [leftStart, leftExpr] = walkLeft(rewritten, scrubbed, index - 1);
-    const [rightEnd, rightExpr] = walkRight(rewritten, scrubbed, index + operator.token.length);
-    const left = leftExpr.trim();
-    const right = rightExpr.trim();
-    const replacement = `${operator.fn}(${operator.swap ? right : left}, ${operator.swap ? left : right})`;
-    rewritten = rewritten.slice(0, leftStart) + replacement + rewritten.slice(rightEnd);
-    scrubbed = scrubForRewrite(rewritten);
-    searchStart = leftStart + replacement.length;
-  }
-  return rewritten;
-}
-function extractQuotedIdentifier(original, start) {
-  if (original[start] !== '"') {
-    return null;
-  }
-  let pos = start + 1;
-  while (pos < original.length && original[pos] !== '"') {
-    if (original[pos] === '"' && original[pos + 1] === '"') {
-      pos += 2;
-      continue;
-    }
-    pos++;
-  }
-  if (pos >= original.length) {
-    return null;
-  }
-  return {
-    name: original.slice(start + 1, pos),
-    end: pos + 1
-  };
-}
-function findMainFromClause(scrubbed) {
-  const lowerScrubbed = scrubbed.toLowerCase();
-  let searchStart = 0;
-  const withMatch = /\bwith\s+/i.exec(lowerScrubbed);
-  if (withMatch) {
-    let depth = 0;
-    let pos = withMatch.index + withMatch[0].length;
-    while (pos < scrubbed.length) {
-      const char = scrubbed[pos];
-      if (char === "(") {
-        depth++;
-      } else if (char === ")") {
-        depth--;
-      } else if (depth === 0) {
-        const remaining = lowerScrubbed.slice(pos);
-        if (/^\s*select\s+/i.test(remaining)) {
-          searchStart = pos;
-          break;
-        }
-      }
-      pos++;
-    }
-  }
-  const fromPattern = /\bfrom\s+/gi;
-  fromPattern.lastIndex = searchStart;
-  const fromMatch = fromPattern.exec(lowerScrubbed);
-  return fromMatch ? fromMatch.index + fromMatch[0].length : -1;
-}
-function parseTableSources(original, scrubbed) {
-  const sources = [];
-  const lowerScrubbed = scrubbed.toLowerCase();
-  const fromPos = findMainFromClause(scrubbed);
-  if (fromPos < 0) {
-    return sources;
-  }
-  const fromTable = parseTableRef(original, scrubbed, fromPos);
-  if (fromTable) {
-    sources.push(fromTable);
-  }
-  const joinPattern = /\b(left\s+|right\s+|inner\s+|full\s+|cross\s+)?join\s+/gi;
-  joinPattern.lastIndex = fromPos;
-  let joinMatch;
-  while ((joinMatch = joinPattern.exec(lowerScrubbed)) !== null) {
-    const tableStart = joinMatch.index + joinMatch[0].length;
-    const joinTable = parseTableRef(original, scrubbed, tableStart);
-    if (joinTable) {
-      sources.push(joinTable);
-    }
-  }
-  return sources;
-}
-function parseTableRef(original, scrubbed, start) {
-  let pos = start;
-  while (pos < scrubbed.length && isWhitespace(scrubbed[pos])) {
-    pos++;
-  }
-  if (original[pos] !== '"') {
-    return null;
-  }
-  const nameStart = pos;
-  const firstIdent = extractQuotedIdentifier(original, pos);
-  if (!firstIdent) {
-    return null;
-  }
-  let name = firstIdent.name;
-  pos = firstIdent.end;
-  let afterName = pos;
-  while (afterName < scrubbed.length && isWhitespace(scrubbed[afterName])) {
-    afterName++;
-  }
-  if (scrubbed[afterName] === ".") {
-    afterName++;
-    while (afterName < scrubbed.length && isWhitespace(scrubbed[afterName])) {
-      afterName++;
-    }
-    if (original[afterName] === '"') {
-      const tableIdent = extractQuotedIdentifier(original, afterName);
-      if (tableIdent) {
-        name = tableIdent.name;
-        pos = tableIdent.end;
-      }
-    }
-  }
-  let alias;
-  let aliasPos = pos;
-  while (aliasPos < scrubbed.length && isWhitespace(scrubbed[aliasPos])) {
-    aliasPos++;
-  }
-  const afterTable = scrubbed.slice(aliasPos).toLowerCase();
-  if (afterTable.startsWith("as ")) {
-    aliasPos += 3;
-    while (aliasPos < scrubbed.length && isWhitespace(scrubbed[aliasPos])) {
-      aliasPos++;
-    }
-  }
-  if (original[aliasPos] === '"' && !afterTable.startsWith("on ") && !afterTable.startsWith("left ") && !afterTable.startsWith("right ") && !afterTable.startsWith("inner ") && !afterTable.startsWith("full ") && !afterTable.startsWith("cross ") && !afterTable.startsWith("join ") && !afterTable.startsWith("where ") && !afterTable.startsWith("group ") && !afterTable.startsWith("order ") && !afterTable.startsWith("limit ") && !afterTable.startsWith("as ")) {
-    const aliasIdent = extractQuotedIdentifier(original, aliasPos);
-    if (aliasIdent) {
-      alias = aliasIdent.name;
-    }
-  }
-  return {
-    name,
-    alias,
-    position: nameStart
-  };
-}
-function findJoinClauses(original, scrubbed, sources) {
-  const clauses = [];
-  const lowerScrubbed = scrubbed.toLowerCase();
-  const joinPattern = /\b(left\s+|right\s+|inner\s+|full\s+|cross\s+)?join\s+"[^"]*"(\s*\.\s*"[^"]*")?(\s+as)?(\s+"[^"]*")?\s+on\s+/gi;
-  let match;
-  let sourceIndex = 1;
-  while ((match = joinPattern.exec(lowerScrubbed)) !== null) {
-    const joinType = (match[1] || "").trim().toLowerCase();
-    const joinKeywordEnd = match.index + (match[1] || "").length + "join".length;
-    let tableStart = joinKeywordEnd;
-    while (tableStart < original.length && isWhitespace(original[tableStart])) {
-      tableStart++;
-    }
-    const tableIdent = extractQuotedIdentifier(original, tableStart);
-    if (!tableIdent)
-      continue;
-    let tableName = tableIdent.name;
-    let afterTable = tableIdent.end;
-    let checkPos = afterTable;
-    while (checkPos < scrubbed.length && isWhitespace(scrubbed[checkPos])) {
-      checkPos++;
-    }
-    if (scrubbed[checkPos] === ".") {
-      checkPos++;
-      while (checkPos < scrubbed.length && isWhitespace(scrubbed[checkPos])) {
-        checkPos++;
-      }
-      const realTableIdent = extractQuotedIdentifier(original, checkPos);
-      if (realTableIdent) {
-        tableName = realTableIdent.name;
-        afterTable = realTableIdent.end;
-      }
-    }
-    let tableAlias;
-    let aliasPos = afterTable;
-    while (aliasPos < scrubbed.length && isWhitespace(scrubbed[aliasPos])) {
-      aliasPos++;
-    }
-    const afterTableStr = scrubbed.slice(aliasPos).toLowerCase();
-    if (afterTableStr.startsWith("as ")) {
-      aliasPos += 3;
-      while (aliasPos < scrubbed.length && isWhitespace(scrubbed[aliasPos])) {
-        aliasPos++;
-      }
-    }
-    if (original[aliasPos] === '"' && !afterTableStr.startsWith("on ")) {
-      const aliasIdent = extractQuotedIdentifier(original, aliasPos);
-      if (aliasIdent) {
-        tableAlias = aliasIdent.name;
-      }
-    }
-    const onStart = match.index + match[0].length;
-    const endPattern = /\b(left\s+join|right\s+join|inner\s+join|full\s+join|cross\s+join|join|where|group\s+by|order\s+by|limit|$)/i;
-    const remaining = lowerScrubbed.slice(onStart);
-    const endMatch = endPattern.exec(remaining);
-    const onEnd = endMatch ? onStart + endMatch.index : scrubbed.length;
-    let leftSource = "";
-    if (sourceIndex > 0 && sourceIndex <= sources.length) {
-      const prev = sources[sourceIndex - 1];
-      leftSource = prev?.alias || prev?.name || "";
-    }
-    const rightSource = tableAlias || tableName;
-    clauses.push({
-      joinType,
-      tableName,
-      tableAlias,
-      onStart,
-      onEnd,
-      leftSource,
-      rightSource
-    });
-    sourceIndex++;
-  }
-  return clauses;
-}
-function qualifyJoinColumns(query) {
-  const lowerQuery = query.toLowerCase();
-  if (!lowerQuery.includes("join")) {
-    return query;
-  }
-  const scrubbed = scrubForRewrite(query);
-  const sources = parseTableSources(query, scrubbed);
-  if (sources.length < 2) {
-    return query;
-  }
-  const joinClauses = findJoinClauses(query, scrubbed, sources);
-  if (joinClauses.length === 0) {
-    return query;
-  }
-  let result = query;
-  let offset = 0;
-  for (const join of joinClauses) {
-    const scrubbedOnClause = scrubbed.slice(join.onStart, join.onEnd);
-    const originalOnClause = query.slice(join.onStart, join.onEnd);
-    let clauseResult = originalOnClause;
-    let clauseOffset = 0;
-    let eqPos = -1;
-    while ((eqPos = scrubbedOnClause.indexOf("=", eqPos + 1)) !== -1) {
-      let lhsEnd = eqPos - 1;
-      while (lhsEnd >= 0 && isWhitespace(scrubbedOnClause[lhsEnd])) {
-        lhsEnd--;
-      }
-      if (scrubbedOnClause[lhsEnd] !== '"')
-        continue;
-      let lhsStartPos = lhsEnd - 1;
-      while (lhsStartPos >= 0 && scrubbedOnClause[lhsStartPos] !== '"') {
-        lhsStartPos--;
-      }
-      if (lhsStartPos < 0)
-        continue;
-      const lhsIsQualified = lhsStartPos > 0 && scrubbedOnClause[lhsStartPos - 1] === ".";
-      let rhsStartPos = eqPos + 1;
-      while (rhsStartPos < scrubbedOnClause.length && isWhitespace(scrubbedOnClause[rhsStartPos])) {
-        rhsStartPos++;
-      }
-      const rhsChar = originalOnClause[rhsStartPos];
-      const rhsIsParam = rhsChar === "$";
-      const rhsIsStringLiteral = rhsChar === "'";
-      const rhsIsColumn = rhsChar === '"';
-      if (!rhsIsParam && !rhsIsStringLiteral && !rhsIsColumn)
-        continue;
-      const rhsIsQualified = !rhsIsColumn || rhsStartPos > 0 && scrubbedOnClause[rhsStartPos - 1] === ".";
-      if (lhsIsQualified || rhsIsQualified)
-        continue;
-      const lhsIdent = extractQuotedIdentifier(originalOnClause, lhsStartPos);
-      if (!lhsIdent)
-        continue;
-      let rhsIdent = null;
-      let rhsValue = "";
-      let rhsEnd = rhsStartPos;
-      if (rhsIsParam) {
-        let paramEnd = rhsStartPos + 1;
-        while (paramEnd < originalOnClause.length && /\d/.test(originalOnClause[paramEnd])) {
-          paramEnd++;
-        }
-        rhsValue = originalOnClause.slice(rhsStartPos, paramEnd);
-        rhsEnd = paramEnd;
-      } else if (rhsIsStringLiteral) {
-        let literalEnd = rhsStartPos + 1;
-        while (literalEnd < originalOnClause.length) {
-          if (originalOnClause[literalEnd] === "'") {
-            if (originalOnClause[literalEnd + 1] === "'") {
-              literalEnd += 2;
-              continue;
-            }
-            break;
-          }
-          literalEnd++;
-        }
-        rhsValue = originalOnClause.slice(rhsStartPos, literalEnd + 1);
-        rhsEnd = literalEnd + 1;
-      } else if (rhsIsColumn) {
-        rhsIdent = extractQuotedIdentifier(originalOnClause, rhsStartPos);
-        if (rhsIdent) {
-          if (rhsIdent.end < scrubbedOnClause.length && scrubbedOnClause[rhsIdent.end] === ".") {
-            continue;
-          }
-          rhsValue = `"${rhsIdent.name}"`;
-          rhsEnd = rhsIdent.end;
-        }
-      }
-      if (!rhsValue)
-        continue;
-      if (!rhsIsColumn || !rhsIdent || lhsIdent.name !== rhsIdent.name) {
-        continue;
-      }
-      const lhsOriginal = `"${lhsIdent.name}"`;
-      let newLhs = lhsOriginal;
-      let newRhs = rhsValue;
-      if (!lhsIsQualified && join.leftSource) {
-        newLhs = `"${join.leftSource}"."${lhsIdent.name}"`;
-      }
-      if (!rhsIsQualified && rhsIsColumn && rhsIdent && join.rightSource) {
-        newRhs = `"${join.rightSource}"."${rhsIdent.name}"`;
-      }
-      if (newLhs !== lhsOriginal || newRhs !== rhsValue) {
-        const opStart = lhsIdent.end;
-        let opEnd = opStart;
-        while (opEnd < rhsEnd && (isWhitespace(originalOnClause[opEnd]) || originalOnClause[opEnd] === "=")) {
-          opEnd++;
-        }
-        const operator = originalOnClause.slice(opStart, opEnd);
-        const newExpr = `${newLhs}${operator}${newRhs}`;
-        const oldExprLength = rhsEnd - lhsStartPos;
-        clauseResult = clauseResult.slice(0, lhsStartPos + clauseOffset) + newExpr + clauseResult.slice(lhsStartPos + oldExprLength + clauseOffset);
-        clauseOffset += newExpr.length - oldExprLength;
-      }
-    }
-    if (clauseResult !== originalOnClause) {
-      result = result.slice(0, join.onStart + offset) + clauseResult + result.slice(join.onEnd + offset);
-      offset += clauseResult.length - originalOnClause.length;
-    }
-  }
-  return result;
-}
-
 // src/sql/result-mapper.ts
 import {
   Column,
@@ -1133,24 +650,6 @@ function isSavepointSyntaxError(error) {
   }
   return error.message.toLowerCase().includes("savepoint") && error.message.toLowerCase().includes("syntax error");
 }
-function rewriteQuery(mode, query) {
-  if (mode === "never") {
-    return { sql: query, rewritten: false };
-  }
-  let result = query;
-  let wasRewritten = false;
-  const arrayRewritten = adaptArrayOperators(result);
-  if (arrayRewritten !== result) {
-    result = arrayRewritten;
-    wasRewritten = true;
-  }
-  const joinQualified = qualifyJoinColumns(result);
-  if (joinQualified !== result) {
-    result = joinQualified;
-    wasRewritten = true;
-  }
-  return { sql: result, rewritten: wasRewritten };
-}
 
 class DuckDBPreparedQuery extends PgPreparedQuery {
   client;
@@ -1161,12 +660,11 @@ class DuckDBPreparedQuery extends PgPreparedQuery {
   fields;
   _isResponseInArrayMode;
   customResultMapper;
-  rewriteArraysMode;
   rejectStringArrayLiterals;
   prepareCache;
   warnOnStringArrayLiteral;
   static [entityKind] = "DuckDBPreparedQuery";
-  constructor(client, dialect, queryString, params, logger, fields, _isResponseInArrayMode, customResultMapper, rewriteArraysMode, rejectStringArrayLiterals, prepareCache, warnOnStringArrayLiteral) {
+  constructor(client, dialect, queryString, params, logger, fields, _isResponseInArrayMode, customResultMapper, rejectStringArrayLiterals, prepareCache, warnOnStringArrayLiteral) {
     super({ sql: queryString, params });
     this.client = client;
     this.dialect = dialect;
@@ -1176,7 +674,6 @@ class DuckDBPreparedQuery extends PgPreparedQuery {
     this.fields = fields;
     this._isResponseInArrayMode = _isResponseInArrayMode;
     this.customResultMapper = customResultMapper;
-    this.rewriteArraysMode = rewriteArraysMode;
     this.rejectStringArrayLiterals = rejectStringArrayLiterals;
     this.prepareCache = prepareCache;
     this.warnOnStringArrayLiteral = warnOnStringArrayLiteral;
@@ -1187,20 +684,16 @@ class DuckDBPreparedQuery extends PgPreparedQuery {
       rejectStringArrayLiterals: this.rejectStringArrayLiterals,
       warnOnStringArrayLiteral: this.warnOnStringArrayLiteral ? () => this.warnOnStringArrayLiteral?.(this.queryString) : undefined
     });
-    const { sql: rewrittenQuery, rewritten: didRewrite } = rewriteQuery(this.rewriteArraysMode, this.queryString);
-    if (didRewrite) {
-      this.logger.logQuery(`[duckdb] original query before array rewrite: ${this.queryString}`, params);
-    }
-    this.logger.logQuery(rewrittenQuery, params);
+    this.logger.logQuery(this.queryString, params);
     const { fields, joinsNotNullableMap, customResultMapper } = this;
     if (fields) {
-      const { rows: rows2 } = await executeArraysOnClient(this.client, rewrittenQuery, params, { prepareCache: this.prepareCache });
+      const { rows: rows2 } = await executeArraysOnClient(this.client, this.queryString, params, { prepareCache: this.prepareCache });
       if (rows2.length === 0) {
         return [];
       }
       return customResultMapper ? customResultMapper(rows2) : rows2.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
     }
-    const rows = await executeOnClient(this.client, rewrittenQuery, params, {
+    const rows = await executeOnClient(this.client, this.queryString, params, {
       prepareCache: this.prepareCache
     });
     return rows;
@@ -1220,7 +713,6 @@ class DuckDBSession extends PgSession {
   static [entityKind] = "DuckDBSession";
   dialect;
   logger;
-  rewriteArraysMode;
   rejectStringArrayLiterals;
   prepareCache;
   hasWarnedArrayLiteral = false;
@@ -1232,17 +724,15 @@ class DuckDBSession extends PgSession {
     this.options = options;
     this.dialect = dialect;
     this.logger = options.logger ?? new NoopLogger;
-    this.rewriteArraysMode = options.rewriteArrays ?? "auto";
     this.rejectStringArrayLiterals = options.rejectStringArrayLiterals ?? false;
     this.prepareCache = options.prepareCache;
     this.options = {
       ...options,
-      rewriteArrays: this.rewriteArraysMode,
       prepareCache: this.prepareCache
     };
   }
   prepareQuery(query, fields, name, isResponseInArrayMode, customResultMapper) {
-    return new DuckDBPreparedQuery(this.client, this.dialect, query.sql, query.params, this.logger, fields, isResponseInArrayMode, customResultMapper, this.rewriteArraysMode, this.rejectStringArrayLiterals, this.prepareCache, this.rejectStringArrayLiterals ? undefined : this.warnOnStringArrayLiteral);
+    return new DuckDBPreparedQuery(this.client, this.dialect, query.sql, query.params, this.logger, fields, isResponseInArrayMode, customResultMapper, this.rejectStringArrayLiterals, this.prepareCache, this.rejectStringArrayLiterals ? undefined : this.warnOnStringArrayLiteral);
   }
   execute(query) {
     this.dialect.resetPgJsonFlag();
@@ -1302,12 +792,8 @@ query: ${query}`, []);
       rejectStringArrayLiterals: this.rejectStringArrayLiterals,
       warnOnStringArrayLiteral: this.rejectStringArrayLiterals ? undefined : () => this.warnOnStringArrayLiteral(builtQuery.sql)
     });
-    const { sql: rewrittenQuery, rewritten: didRewrite } = rewriteQuery(this.rewriteArraysMode, builtQuery.sql);
-    if (didRewrite) {
-      this.logger.logQuery(`[duckdb] original query before array rewrite: ${builtQuery.sql}`, params);
-    }
-    this.logger.logQuery(rewrittenQuery, params);
-    return executeInBatches(this.client, rewrittenQuery, params, options);
+    this.logger.logQuery(builtQuery.sql, params);
+    return executeInBatches(this.client, builtQuery.sql, params, options);
   }
   executeBatchesRaw(query, options = {}) {
     this.dialect.resetPgJsonFlag();
@@ -1317,12 +803,8 @@ query: ${query}`, []);
       rejectStringArrayLiterals: this.rejectStringArrayLiterals,
       warnOnStringArrayLiteral: this.rejectStringArrayLiterals ? undefined : () => this.warnOnStringArrayLiteral(builtQuery.sql)
     });
-    const { sql: rewrittenQuery, rewritten: didRewrite } = rewriteQuery(this.rewriteArraysMode, builtQuery.sql);
-    if (didRewrite) {
-      this.logger.logQuery(`[duckdb] original query before array rewrite: ${builtQuery.sql}`, params);
-    }
-    this.logger.logQuery(rewrittenQuery, params);
-    return executeInBatchesRaw(this.client, rewrittenQuery, params, options);
+    this.logger.logQuery(builtQuery.sql, params);
+    return executeInBatchesRaw(this.client, builtQuery.sql, params, options);
   }
   async executeArrow(query) {
     this.dialect.resetPgJsonFlag();
@@ -1332,12 +814,8 @@ query: ${query}`, []);
       rejectStringArrayLiterals: this.rejectStringArrayLiterals,
       warnOnStringArrayLiteral: this.rejectStringArrayLiterals ? undefined : () => this.warnOnStringArrayLiteral(builtQuery.sql)
     });
-    const { sql: rewrittenQuery, rewritten: didRewrite } = rewriteQuery(this.rewriteArraysMode, builtQuery.sql);
-    if (didRewrite) {
-      this.logger.logQuery(`[duckdb] original query before array rewrite: ${builtQuery.sql}`, params);
-    }
-    this.logger.logQuery(rewrittenQuery, params);
-    return executeArrowOnClient(this.client, rewrittenQuery, params);
+    this.logger.logQuery(builtQuery.sql, params);
+    return executeArrowOnClient(this.client, builtQuery.sql, params);
   }
   markRollbackOnly() {
     this.rollbackOnly = true;
@@ -1439,6 +917,335 @@ import {
 import {
   sql as sql2
 } from "drizzle-orm";
+
+// src/sql/ast-transformer.ts
+import nodeSqlParser from "node-sql-parser";
+
+// src/sql/visitors/array-operators.ts
+var OPERATOR_MAP = {
+  "@>": { fn: "array_has_all" },
+  "<@": { fn: "array_has_all", swap: true },
+  "&&": { fn: "array_has_any" }
+};
+function walkExpression(expr, parent, key) {
+  if (!expr || typeof expr !== "object")
+    return false;
+  let transformed = false;
+  const exprObj = expr;
+  if ("type" in expr && exprObj.type === "binary_expr") {
+    const binary = expr;
+    const mapping = OPERATOR_MAP[binary.operator];
+    if (mapping) {
+      const fnExpr = {
+        type: "function",
+        name: { name: [{ type: "default", value: mapping.fn }] },
+        args: {
+          type: "expr_list",
+          value: mapping.swap ? [binary.right, binary.left] : [binary.left, binary.right]
+        }
+      };
+      if (parent && key) {
+        parent[key] = fnExpr;
+      }
+      transformed = true;
+    } else {
+      transformed = walkExpression(binary.left, binary, "left") || transformed;
+      transformed = walkExpression(binary.right, binary, "right") || transformed;
+    }
+  }
+  if ("type" in expr && exprObj.type === "unary_expr") {
+    if ("expr" in exprObj) {
+      transformed = walkExpression(exprObj.expr, exprObj, "expr") || transformed;
+    }
+  }
+  if ("type" in expr && exprObj.type === "case") {
+    if ("expr" in exprObj && exprObj.expr) {
+      transformed = walkExpression(exprObj.expr, exprObj, "expr") || transformed;
+    }
+    if ("args" in exprObj && Array.isArray(exprObj.args)) {
+      for (let i = 0;i < exprObj.args.length; i++) {
+        const whenClause = exprObj.args[i];
+        if (whenClause.cond) {
+          transformed = walkExpression(whenClause.cond, whenClause, "cond") || transformed;
+        }
+        if (whenClause.result) {
+          transformed = walkExpression(whenClause.result, whenClause, "result") || transformed;
+        }
+      }
+    }
+  }
+  if ("args" in expr && exprObj.args) {
+    const args = exprObj.args;
+    if ("value" in args && Array.isArray(args.value)) {
+      for (let i = 0;i < args.value.length; i++) {
+        transformed = walkExpression(args.value[i], args.value, String(i)) || transformed;
+      }
+    } else if ("expr" in args) {
+      transformed = walkExpression(args.expr, args, "expr") || transformed;
+    }
+  }
+  if ("ast" in exprObj && exprObj.ast) {
+    const subAst = exprObj.ast;
+    if (subAst.type === "select") {
+      transformed = walkSelectImpl(subAst) || transformed;
+    }
+  }
+  if ("type" in expr && exprObj.type === "expr_list") {
+    if ("value" in exprObj && Array.isArray(exprObj.value)) {
+      for (let i = 0;i < exprObj.value.length; i++) {
+        transformed = walkExpression(exprObj.value[i], exprObj.value, String(i)) || transformed;
+      }
+    }
+  }
+  return transformed;
+}
+function walkFrom(from) {
+  if (!from || !Array.isArray(from))
+    return false;
+  let transformed = false;
+  for (const f of from) {
+    if ("join" in f) {
+      const join = f;
+      transformed = walkExpression(join.on, join, "on") || transformed;
+    }
+    if ("expr" in f && f.expr && "ast" in f.expr) {
+      transformed = walkSelectImpl(f.expr.ast) || transformed;
+    }
+  }
+  return transformed;
+}
+function walkSelectImpl(select) {
+  let transformed = false;
+  if (select.with) {
+    for (const cte of select.with) {
+      const cteSelect = cte.stmt?.ast ?? cte.stmt;
+      if (cteSelect && cteSelect.type === "select") {
+        transformed = walkSelectImpl(cteSelect) || transformed;
+      }
+    }
+  }
+  if (Array.isArray(select.from)) {
+    transformed = walkFrom(select.from) || transformed;
+  }
+  transformed = walkExpression(select.where, select, "where") || transformed;
+  if (select.having) {
+    if (Array.isArray(select.having)) {
+      for (let i = 0;i < select.having.length; i++) {
+        transformed = walkExpression(select.having[i], select.having, String(i)) || transformed;
+      }
+    } else {
+      transformed = walkExpression(select.having, select, "having") || transformed;
+    }
+  }
+  if (Array.isArray(select.columns)) {
+    for (const col of select.columns) {
+      if ("expr" in col) {
+        transformed = walkExpression(col.expr, col, "expr") || transformed;
+      }
+    }
+  }
+  if (select._next) {
+    transformed = walkSelectImpl(select._next) || transformed;
+  }
+  return transformed;
+}
+function transformArrayOperators(ast) {
+  const statements = Array.isArray(ast) ? ast : [ast];
+  let transformed = false;
+  for (const stmt of statements) {
+    if (stmt.type === "select") {
+      transformed = walkSelectImpl(stmt) || transformed;
+    }
+  }
+  return transformed;
+}
+
+// src/sql/visitors/column-qualifier.ts
+function getTableSource(from) {
+  if ("table" in from && from.table) {
+    return {
+      name: from.table,
+      alias: from.as ?? null
+    };
+  }
+  if ("expr" in from && from.as) {
+    return {
+      name: from.as,
+      alias: from.as
+    };
+  }
+  return null;
+}
+function getQualifier(source) {
+  return source.alias ?? source.name;
+}
+function isUnqualifiedColumnRef(expr) {
+  return typeof expr === "object" && expr !== null && "type" in expr && expr.type === "column_ref" && !(("table" in expr) && expr.table);
+}
+function getColumnName(col) {
+  if (typeof col.column === "string") {
+    return col.column;
+  }
+  if (col.column && "expr" in col.column && col.column.expr?.value) {
+    return String(col.column.expr.value);
+  }
+  return null;
+}
+function walkOnClause(expr, leftSource, rightSource, ambiguousColumns) {
+  if (!expr || typeof expr !== "object")
+    return false;
+  let transformed = false;
+  if (expr.type === "binary_expr") {
+    if (expr.operator === "=") {
+      const left = expr.left;
+      const right = expr.right;
+      if (isUnqualifiedColumnRef(left) && isUnqualifiedColumnRef(right)) {
+        const leftColName = getColumnName(left);
+        const rightColName = getColumnName(right);
+        if (leftColName && rightColName && leftColName === rightColName) {
+          left.table = leftSource;
+          right.table = rightSource;
+          ambiguousColumns.add(leftColName);
+          transformed = true;
+        }
+      }
+    }
+    if (expr.operator === "AND" || expr.operator === "OR") {
+      transformed = walkOnClause(expr.left, leftSource, rightSource, ambiguousColumns) || transformed;
+      transformed = walkOnClause(expr.right, leftSource, rightSource, ambiguousColumns) || transformed;
+    }
+  }
+  return transformed;
+}
+function qualifyAmbiguousInExpression(expr, defaultQualifier, ambiguousColumns) {
+  if (!expr || typeof expr !== "object")
+    return false;
+  let transformed = false;
+  if (isUnqualifiedColumnRef(expr)) {
+    const colName = getColumnName(expr);
+    if (colName && ambiguousColumns.has(colName)) {
+      expr.table = defaultQualifier;
+      transformed = true;
+    }
+    return transformed;
+  }
+  if ("type" in expr && expr.type === "binary_expr") {
+    const binary = expr;
+    transformed = qualifyAmbiguousInExpression(binary.left, defaultQualifier, ambiguousColumns) || transformed;
+    transformed = qualifyAmbiguousInExpression(binary.right, defaultQualifier, ambiguousColumns) || transformed;
+    return transformed;
+  }
+  if ("args" in expr && expr.args) {
+    const args = expr.args;
+    if (args.value && Array.isArray(args.value)) {
+      for (const arg of args.value) {
+        transformed = qualifyAmbiguousInExpression(arg, defaultQualifier, ambiguousColumns) || transformed;
+      }
+    }
+    if (args.expr) {
+      transformed = qualifyAmbiguousInExpression(args.expr, defaultQualifier, ambiguousColumns) || transformed;
+    }
+  }
+  return transformed;
+}
+function walkSelect(select) {
+  let transformed = false;
+  const ambiguousColumns = new Set;
+  if (Array.isArray(select.from) && select.from.length >= 2) {
+    const firstSource = getTableSource(select.from[0]);
+    const defaultQualifier = firstSource ? getQualifier(firstSource) : "";
+    let prevSource = firstSource;
+    for (const from of select.from) {
+      if ("join" in from) {
+        const join = from;
+        const currentSource = getTableSource(join);
+        if (join.on && prevSource && currentSource) {
+          const leftQualifier = getQualifier(prevSource);
+          const rightQualifier = getQualifier(currentSource);
+          transformed = walkOnClause(join.on, leftQualifier, rightQualifier, ambiguousColumns) || transformed;
+        }
+        prevSource = currentSource;
+      } else {
+        const source = getTableSource(from);
+        if (source) {
+          prevSource = source;
+        }
+      }
+      if ("expr" in from && from.expr && "ast" in from.expr) {
+        transformed = walkSelect(from.expr.ast) || transformed;
+      }
+    }
+    if (ambiguousColumns.size > 0 && defaultQualifier) {
+      if (Array.isArray(select.columns)) {
+        for (const col of select.columns) {
+          if ("expr" in col) {
+            transformed = qualifyAmbiguousInExpression(col.expr, defaultQualifier, ambiguousColumns) || transformed;
+          }
+        }
+      }
+      transformed = qualifyAmbiguousInExpression(select.where, defaultQualifier, ambiguousColumns) || transformed;
+      if (Array.isArray(select.orderby)) {
+        for (const order of select.orderby) {
+          if (order.expr) {
+            transformed = qualifyAmbiguousInExpression(order.expr, defaultQualifier, ambiguousColumns) || transformed;
+          }
+        }
+      }
+    }
+  }
+  if (select.with) {
+    for (const cte of select.with) {
+      const cteSelect = cte.stmt?.ast ?? cte.stmt;
+      if (cteSelect && cteSelect.type === "select") {
+        transformed = walkSelect(cteSelect) || transformed;
+      }
+    }
+  }
+  if (select._next) {
+    transformed = walkSelect(select._next) || transformed;
+  }
+  return transformed;
+}
+function qualifyJoinColumns(ast) {
+  const statements = Array.isArray(ast) ? ast : [ast];
+  let transformed = false;
+  for (const stmt of statements) {
+    if (stmt.type === "select") {
+      transformed = walkSelect(stmt) || transformed;
+    }
+  }
+  return transformed;
+}
+
+// src/sql/ast-transformer.ts
+var { Parser } = nodeSqlParser;
+var parser = new Parser;
+function transformSQL(query) {
+  const needsArrayTransform = query.includes("@>") || query.includes("<@") || query.includes("&&");
+  const needsJoinTransform = query.toLowerCase().includes("join");
+  if (!needsArrayTransform && !needsJoinTransform) {
+    return { sql: query, transformed: false };
+  }
+  try {
+    const ast = parser.astify(query, { database: "PostgreSQL" });
+    let transformed = false;
+    if (needsArrayTransform) {
+      transformed = transformArrayOperators(ast) || transformed;
+    }
+    if (needsJoinTransform) {
+      transformed = qualifyJoinColumns(ast) || transformed;
+    }
+    if (!transformed) {
+      return { sql: query, transformed: false };
+    }
+    const transformedSql = parser.sqlify(ast, { database: "PostgreSQL" });
+    return { sql: transformedSql, transformed: true };
+  } catch {
+    return { sql: query, transformed: false };
+  }
+}
+
+// src/dialect.ts
 class DuckDBDialect extends PgDialect {
   static [entityKind2] = "DuckDBPgDialect";
   hasPgJsonColumn = false;
@@ -1515,6 +1322,14 @@ class DuckDBDialect extends PgDialect {
       return "none";
     }
   }
+  sqlToQuery(sqlObj, invokeSource) {
+    const result = super.sqlToQuery(sqlObj, invokeSource);
+    const transformed = transformSQL(result.sql);
+    return {
+      ...result,
+      sql: transformed.sql
+    };
+  }
 }
 
 // src/select-builder.ts
@@ -1525,10 +1340,10 @@ import {
 } from "drizzle-orm/pg-core/query-builders";
 import { Subquery, ViewBaseConfig } from "drizzle-orm";
 import { PgViewBase } from "drizzle-orm/pg-core/view-base";
-import { SQL as SQL4 } from "drizzle-orm/sql/sql";
+import { SQL as SQL5 } from "drizzle-orm/sql/sql";
 
 // src/sql/selection.ts
-import { Column as Column2, SQL as SQL3, getTableName as getTableName2, is as is3, sql as sql3 } from "drizzle-orm";
+import { Column as Column2, SQL as SQL4, getTableName as getTableName2, is as is3, sql as sql3 } from "drizzle-orm";
 function mapEntries(obj, prefix, fullJoin = false) {
   return Object.fromEntries(Object.entries(obj).filter(([key]) => key !== "enableRLS").map(([key, value]) => {
     const qualified = prefix ? `${prefix}.${key}` : key;
@@ -1538,16 +1353,16 @@ function mapEntries(obj, prefix, fullJoin = false) {
         sql3`${value}`.mapWith(value).as(`${getTableName2(value.table)}.${value.name}`)
       ];
     }
-    if (fullJoin && is3(value, SQL3)) {
+    if (fullJoin && is3(value, SQL4)) {
       const col = value.getSQL().queryChunks.find((chunk) => is3(chunk, Column2));
       const tableName = col?.table && getTableName2(col?.table);
       return [key, value.as(tableName ? `${tableName}.${key}` : key)];
     }
-    if (is3(value, SQL3) || is3(value, Column2)) {
-      const aliased = is3(value, SQL3) ? value : sql3`${value}`.mapWith(value);
+    if (is3(value, SQL4) || is3(value, Column2)) {
+      const aliased = is3(value, SQL4) ? value : sql3`${value}`.mapWith(value);
       return [key, aliased.as(qualified)];
     }
-    if (is3(value, SQL3.Aliased)) {
+    if (is3(value, SQL4.Aliased)) {
       return [key, value];
     }
     if (typeof value === "object" && value !== null) {
@@ -1595,7 +1410,7 @@ class DuckDBSelectBuilder extends PgSelectBuilder {
       ]));
     } else if (is4(src, PgViewBase)) {
       fields = src[ViewBaseConfig]?.selectedFields;
-    } else if (is4(src, SQL4)) {
+    } else if (is4(src, SQL5)) {
       fields = {};
     } else {
       fields = aliasFields(getTableColumns(src), !isPartialSelect);
@@ -1786,16 +1601,6 @@ function createDuckDBConnectionPool(instance, options = {}) {
 }
 
 // src/options.ts
-var DEFAULT_REWRITE_ARRAYS_MODE = "auto";
-function resolveRewriteArraysOption(value) {
-  if (value === undefined)
-    return DEFAULT_REWRITE_ARRAYS_MODE;
-  if (value === true)
-    return "auto";
-  if (value === false)
-    return "never";
-  return value;
-}
 var DEFAULT_PREPARED_CACHE_SIZE = 32;
 function resolvePrepareCacheOption(option) {
   if (!option)
@@ -1825,7 +1630,6 @@ class DuckDBDriver {
   createSession(schema) {
     return new DuckDBSession(this.client, this.dialect, schema, {
       logger: this.options.logger,
-      rewriteArrays: this.options.rewriteArrays ?? "auto",
       rejectStringArrayLiterals: this.options.rejectStringArrayLiterals,
       prepareCache: this.options.prepareCache
     });
@@ -1840,7 +1644,6 @@ function isConfigObject(data) {
 }
 function createFromClient(client, config = {}, instance) {
   const dialect = new DuckDBDialect;
-  const rewriteArraysMode = resolveRewriteArraysOption(config.rewriteArrays);
   const prepareCache = resolvePrepareCacheOption(config.prepareCache);
   const logger = config.logger === true ? new DefaultLogger : config.logger || undefined;
   let schema;
@@ -1854,7 +1657,6 @@ function createFromClient(client, config = {}, instance) {
   }
   const driver = new DuckDBDriver(client, dialect, {
     logger,
-    rewriteArrays: rewriteArraysMode,
     rejectStringArrayLiterals: config.rejectStringArrayLiterals,
     prepareCache
   });
@@ -2062,6 +1864,9 @@ var duckDbMap = (name, valueType) => customType({
     return `MAP (STRING, ${valueType})`;
   },
   toDriver(value) {
+    if (Object.keys(value).length === 0) {
+      return buildMapLiteral(value, valueType);
+    }
     return wrapMap(value, valueType);
   },
   fromDriver(value) {
@@ -2811,7 +2616,7 @@ function renderImports(imports, importBasePath) {
 // src/olap.ts
 import { is as is5 } from "drizzle-orm/entity";
 import { sql as sql6 } from "drizzle-orm";
-import { SQL as SQL5 } from "drizzle-orm/sql/sql";
+import { SQL as SQL6 } from "drizzle-orm/sql/sql";
 import { Column as Column3, getTableName as getTableName3 } from "drizzle-orm";
 var countN = (expr = sql6`*`) => sql6`count(${expr})`.mapWith(Number);
 var sumN = (expr) => sql6`sum(${expr})`.mapWith(Number);
@@ -2846,7 +2651,7 @@ var denseRank = (options) => sql6`dense_rank() ${overClause(options)}`.mapWith(N
 var lag = (expr, offset = 1, defaultValue, options) => defaultValue ? sql6`lag(${expr}, ${offset}, ${defaultValue}) ${overClause(options)}` : sql6`lag(${expr}, ${offset}) ${overClause(options)}`;
 var lead = (expr, offset = 1, defaultValue, options) => defaultValue ? sql6`lead(${expr}, ${offset}, ${defaultValue}) ${overClause(options)}` : sql6`lead(${expr}, ${offset}) ${overClause(options)}`;
 function keyAlias(key, fallback) {
-  if (is5(key, SQL5.Aliased)) {
+  if (is5(key, SQL6.Aliased)) {
     return key.fieldAlias ?? fallback;
   }
   if (is5(key, Column3)) {
@@ -2917,6 +2722,17 @@ class OlapBuilder {
   }
 }
 var olap = (db) => new OlapBuilder(db);
+// src/operators.ts
+import { sql as sql7 } from "drizzle-orm";
+function arrayHasAll(column, values) {
+  return sql7`array_has_all(${column}, ${values})`;
+}
+function arrayHasAny(column, values) {
+  return sql7`array_has_any(${column}, ${values})`;
+}
+function arrayContainedBy(column, values) {
+  return sql7`array_has_all(${values}, ${column})`;
+}
 export {
   wrapperToNodeApiValue,
   wrapTimestamp,
@@ -2931,7 +2747,6 @@ export {
   sumDistinctN,
   splitTopLevel,
   rowNumber,
-  resolveRewriteArraysOption,
   resolvePrepareCacheOption,
   resolvePoolSize,
   rank,
@@ -2978,6 +2793,9 @@ export {
   buildListLiteral,
   buildDefault,
   avgN,
+  arrayHasAny,
+  arrayHasAll,
+  arrayContainedBy,
   anyValue,
   POOL_PRESETS,
   OlapBuilder,