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

package/dist/duckdb-introspect.mjs

@@ -183,6 +183,328 @@ function adaptArrayOperators(query) {
   }
   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 {
@@ -764,8 +1086,19 @@ function rewriteQuery(mode, query) {
   if (mode === "never") {
     return { sql: query, rewritten: false };
   }
-  const rewritten = adaptArrayOperators(query);
-  return { sql: rewritten, rewritten: rewritten !== query };
+  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 {

package/dist/index.mjs

@@ -175,6 +175,328 @@ function adaptArrayOperators(query) {
   }
   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 {
@@ -815,8 +1137,19 @@ function rewriteQuery(mode, query) {
   if (mode === "never") {
     return { sql: query, rewritten: false };
   }
-  const rewritten = adaptArrayOperators(query);
-  return { sql: rewritten, rewritten: rewritten !== query };
+  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 {

package/dist/sql/query-rewriters.d.ts

@@ -1,2 +1,14 @@
 export declare function scrubForRewrite(query: string): string;
 export declare function adaptArrayOperators(query: string): string;
+/**
+ * Qualifies unqualified column references in JOIN ON clauses.
+ *
+ * Transforms patterns like:
+ *   `left join "b" on "col" = "col"`
+ * To:
+ *   `left join "b" on "a"."col" = "b"."col"`
+ *
+ * This fixes the issue where drizzle-orm generates unqualified column
+ * references when joining CTEs with eq().
+ */
+export declare function qualifyJoinColumns(query: string): string;

package/package.json

@@ -3,7 +3,7 @@
   "module": "./dist/index.mjs",
   "main": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "A drizzle ORM client for use with DuckDB. Based on drizzle's Postgres client.",
   "type": "module",
   "scripts": {

package/src/session.ts

@@ -15,7 +15,10 @@ import type {
 } from 'drizzle-orm/relations';
 import { fillPlaceholders, type Query, SQL, sql } from 'drizzle-orm/sql/sql';
 import type { Assume } from 'drizzle-orm/utils';
-import { adaptArrayOperators } from './sql/query-rewriters.ts';
+import {
+  adaptArrayOperators,
+  qualifyJoinColumns,
+} from './sql/query-rewriters.ts';
 import { mapResultRow } from './sql/result-mapper.ts';
 import { TransactionRollbackError } from 'drizzle-orm/errors';
 import type { DuckDBDialect } from './dialect.ts';
@@ -61,8 +64,24 @@ function rewriteQuery(
     return { sql: query, rewritten: false };
   }
 
-  const rewritten = adaptArrayOperators(query);
-  return { sql: rewritten, rewritten: rewritten !== query };
+  let result = query;
+  let wasRewritten = false;
+
+  // Rewrite Postgres array operators to DuckDB functions
+  const arrayRewritten = adaptArrayOperators(result);
+  if (arrayRewritten !== result) {
+    result = arrayRewritten;
+    wasRewritten = true;
+  }
+
+  // Qualify unqualified column references in JOIN ON clauses
+  const joinQualified = qualifyJoinColumns(result);
+  if (joinQualified !== result) {
+    result = joinQualified;
+    wasRewritten = true;
+  }
+
+  return { sql: result, rewritten: wasRewritten };
 }
 
 export class DuckDBPreparedQuery<

package/src/sql/query-rewriters.ts

@@ -211,3 +211,498 @@ export function adaptArrayOperators(query: string): string {
 
   return rewritten;
 }
+
+// Join column qualification types and helpers
+
+type TableSource = {
+  name: string; // The table/CTE name (without quotes)
+  alias?: string; // Optional alias
+  position: number; // Position in the query where this source was introduced
+};
+
+type JoinClause = {
+  joinType: string; // 'left', 'right', 'inner', 'full', 'cross', ''
+  tableName: string; // The joined table name
+  tableAlias?: string; // Optional alias
+  onStart: number; // Start of ON clause content (after "on ")
+  onEnd: number; // End of ON clause content
+  leftSource: string; // The table/alias on the left side of this join
+  rightSource: string; // The table/alias for the joined table
+};
+
+/**
+ * Extracts the identifier name from a quoted identifier like "foo" -> foo
+ * Uses the original query string, not the scrubbed one.
+ */
+function extractQuotedIdentifier(
+  original: string,
+  start: number
+): { name: string; end: number } | null {
+  if (original[start] !== '"') {
+    return null;
+  }
+
+  let pos = start + 1;
+  while (pos < original.length && original[pos] !== '"') {
+    // Handle escaped quotes
+    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,
+  };
+}
+
+/**
+ * Finds the main SELECT's FROM clause, skipping any FROM inside CTEs.
+ */
+function findMainFromClause(scrubbed: string): number {
+  const lowerScrubbed = scrubbed.toLowerCase();
+
+  // If there's a WITH clause, find where the CTEs end
+  let searchStart = 0;
+  const withMatch = /\bwith\s+/i.exec(lowerScrubbed);
+  if (withMatch) {
+    // Find the main SELECT after the CTEs
+    // CTEs are separated by commas and end with the main SELECT
+    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) {
+        // Check if we're at "select" keyword (main query)
+        const remaining = lowerScrubbed.slice(pos);
+        if (/^\s*select\s+/i.test(remaining)) {
+          searchStart = pos;
+          break;
+        }
+      }
+      pos++;
+    }
+  }
+
+  // Find FROM after the main SELECT
+  const fromPattern = /\bfrom\s+/gi;
+  fromPattern.lastIndex = searchStart;
+  const fromMatch = fromPattern.exec(lowerScrubbed);
+
+  return fromMatch ? fromMatch.index + fromMatch[0].length : -1;
+}
+
+/**
+ * Parses table sources from FROM and JOIN clauses.
+ * Returns an array of table sources in order of appearance.
+ */
+function parseTableSources(original: string, scrubbed: string): TableSource[] {
+  const sources: TableSource[] = [];
+  const lowerScrubbed = scrubbed.toLowerCase();
+
+  // Find the main FROM clause (after CTEs if present)
+  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;
+}
+
+/**
+ * Parses a table reference (potentially with alias) starting at the given position.
+ * Handles: "table", "table" "alias", "table" as "alias", "schema"."table"
+ */
+function parseTableRef(
+  original: string,
+  scrubbed: string,
+  start: number
+): TableSource | null {
+  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;
+
+  // Check for schema.table pattern
+  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: string | undefined;
+  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,
+  };
+}
+
+/**
+ * Finds all JOIN clauses with their ON clause boundaries.
+ */
+function findJoinClauses(
+  original: string,
+  scrubbed: string,
+  sources: TableSource[]
+): JoinClause[] {
+  const clauses: JoinClause[] = [];
+  const lowerScrubbed = scrubbed.toLowerCase();
+
+  // Pattern to find JOINs with ON clauses
+  // Use scrubbed for matching, original for extracting values
+  // Handle optional schema prefix: "schema"."table" or just "table"
+  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; // Start at 1 since index 0 is the FROM table
+
+  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: string | undefined;
+    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;
+
+    // Find the end of the ON clause (next JOIN, WHERE, GROUP, ORDER, LIMIT, or end)
+    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;
+
+    // Determine the left source (previous table/CTE)
+    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;
+}
+
+/**
+ * Qualifies unqualified column references in JOIN ON clauses.
+ *
+ * Transforms patterns like:
+ *   `left join "b" on "col" = "col"`
+ * To:
+ *   `left join "b" on "a"."col" = "b"."col"`
+ *
+ * This fixes the issue where drizzle-orm generates unqualified column
+ * references when joining CTEs with eq().
+ */
+export function qualifyJoinColumns(query: string): string {
+  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: { name: string; end: number } | null = 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) {
+          // Check if this identifier is followed by a dot (meaning it's a table prefix, not the column)
+          if (
+            rhsIdent.end < scrubbedOnClause.length &&
+            scrubbedOnClause[rhsIdent.end] === '.'
+          ) {
+            // This is a qualified reference "table"."column" - skip, it's already qualified
+            continue;
+          }
+          rhsValue = `"${rhsIdent.name}"`;
+          rhsEnd = rhsIdent.end;
+        }
+      }
+
+      if (!rhsValue) continue;
+
+      // Only qualify when both sides are columns with the same name.
+      // Only same-named columns cause "Ambiguous reference" errors in DuckDB.
+      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;
+}