bigal 15.11.8 → 15.11.10

package/.oxlintrc.json

@@ -16,6 +16,7 @@
   "rules": {
     "eqeqeq": ["error", "smart"],
     "no-console": "error",
+    "no-underscore-dangle": "off",
     "no-nested-ternary": "error",
     "no-await-in-loop": "error",
     "id-length": ["error", { "min": 2, "exceptions": ["e", "i", "j", "q", "x", "y", "_", "A", "D", "K", "P", "T", "U"] }],

package/CHANGELOG.md

@@ -1,8 +1,16 @@
+## [15.11.10](https://github.com/bigalorm/bigal/compare/v15.11.9...v15.11.10) (2026-06-09)
+
+### Bug Fixes
+
+* qualify base-table columns when a query has a join ([#435](https://github.com/bigalorm/bigal/issues/435)) ([667e1f3](https://github.com/bigalorm/bigal/commit/667e1f3d427f73713e30bb7bf18f5f7e61acd206))
+
+## [15.11.9](https://github.com/bigalorm/bigal/compare/v15.11.8...v15.11.9) (2026-05-19)
+
 ## [15.11.8](https://github.com/bigalorm/bigal/compare/v15.11.7...v15.11.8) (2026-05-19)
 
 ### Bug Fixes
 
-* prevent propertyName leak across where-clause iteration ([#403](https://github.com/bigalorm/bigal/issues/403)) ([0454e84](https://github.com/bigalorm/bigal/commit/0454e84d4c6fdf46fc14bdcf57ab409619ea8a03)), closes [#393](https://github.com/bigalorm/bigal/issues/393)
+- prevent propertyName leak across where-clause iteration ([#403](https://github.com/bigalorm/bigal/issues/403)) ([0454e84](https://github.com/bigalorm/bigal/commit/0454e84d4c6fdf46fc14bdcf57ab409619ea8a03)), closes [#393](https://github.com/bigalorm/bigal/issues/393)
 
 ## [15.11.7](https://github.com/bigalorm/bigal/compare/v15.11.6...v15.11.7) (2026-04-26)
 

package/dist/index.cjs

@@ -557,6 +557,9 @@ function assertValidSqlIdentifier(value, context) {
     throw new Error(`Invalid SQL identifier for ${context}: "${value}". Identifiers must start with a letter or underscore and contain only letters, numbers, underscores, and dots.`);
   }
 }
+function getBaseColumnPrefix(model, joins) {
+  return joins?.length ? `${model.qualifiedTableName}.` : "";
+}
 function getSelectQueryAndParams({
   repositoriesByModelNameLowered,
   model,
@@ -599,18 +602,20 @@ function getSelectQueryAndParams({
   }
   let query = "SELECT ";
   if (distinctOn?.length) {
+    const baseColumnPrefix = getBaseColumnPrefix(model, joins);
     const distinctOnColumnNames = distinctOn.map((propertyName) => {
       const column = model.columnsByPropertyName[propertyName];
       if (!column) {
         throw new QueryError(`Unable to find column for DISTINCT ON property: ${propertyName} on ${model.tableName}`, model);
       }
-      return `"${column.name}"`;
+      return `${baseColumnPrefix}"${column.name}"`;
     });
     query += `DISTINCT ON (${distinctOnColumnNames.join(",")}) `;
   }
   query += getColumnsToSelect({
     model,
-    select
+    select,
+    joins
   });
   if (includeCount) {
     query += ',count(*) OVER() AS "__total_count__"';
@@ -1000,7 +1005,8 @@ function getDeleteQueryAndParams({
 }
 function getColumnsToSelect({
   model,
-  select
+  select,
+  joins
 }) {
   let selectColumns;
   if (select) {
@@ -1017,6 +1023,7 @@ function getColumnsToSelect({
       }
     }
   }
+  const baseColumnPrefix = getBaseColumnPrefix(model, joins);
   let query = "";
   for (const [index, propertyName] of Array.from(selectColumns).entries()) {
     const column = model.columnsByPropertyName[propertyName];
@@ -1027,9 +1034,9 @@ function getColumnsToSelect({
       query += ",";
     }
     if (column.name === propertyName) {
-      query += `"${propertyName}"`;
+      query += `${baseColumnPrefix}"${propertyName}"`;
     } else {
-      query += `"${column.name}" AS "${propertyName}"`;
+      query += `${baseColumnPrefix}"${column.name}" AS "${propertyName}"`;
     }
   }
   return query;
@@ -1122,7 +1129,7 @@ function buildSubqueryJoinClause({
       throw new QueryError(`Unable to find property "${mainColumn}" on model "${model.name}" for subquery join`, model);
     }
     assertValidSqlIdentifier(subqueryColumn, "subquery join ON column");
-    onConditions.push(`"${model.tableName}"."${column.name}"="${join.alias}"."${subqueryColumn}"`);
+    onConditions.push(`${model.qualifiedTableName}."${column.name}"="${join.alias}"."${subqueryColumn}"`);
   }
   return ` ${joinType} (${subquerySQL}) AS "${join.alias}" ON ${onConditions.join(" AND ")}`;
 }
@@ -1323,7 +1330,7 @@ function buildOrderStatement({
       if (!column) {
         throw new QueryError(`Property (${propertyName}) not found in model (${model.name}).`, model);
       }
-      orderStatement += `"${column.name}"`;
+      orderStatement += `${getBaseColumnPrefix(model, joins)}"${column.name}"`;
     }
     if (descending) {
       orderStatement += " DESC";
@@ -1498,7 +1505,7 @@ function buildWhere({
           params,
           repositoriesByModelNameLowered
         });
-        return `"${column.name}"${isNegated ? " NOT" : ""} IN (${subquerySQL})`;
+        return `${getBaseColumnPrefix(model, joins)}"${column.name}"${isNegated ? " NOT" : ""} IN (${subquerySQL})`;
       }
       throw new QueryError(`Expected subquery value for 'in' operator. Property (${propertyName ?? ""}) in model (${model.name}).`, model);
     case "exists":
@@ -1575,7 +1582,7 @@ function buildWhere({
           if (arrayColumn) {
             const arrayColumnType = arrayColumn.type ? arrayColumn.type.toLowerCase() : "";
             if (arrayColumnType === "array" || arrayColumnType === "string[]" || arrayColumnType === "integer[]" || arrayColumnType === "float[]" || arrayColumnType === "boolean[]") {
-              return `"${arrayColumn.name}"${isNegated ? "<>" : "="}'{}'`;
+              return `${getBaseColumnPrefix(model, joins)}"${arrayColumn.name}"${isNegated ? "<>" : "="}'{}'`;
             }
           }
           if (isNegated) {
@@ -1685,7 +1692,7 @@ function buildWhere({
                   break;
               }
               params.push(valueWithoutNull);
-              orConstraints.push(`"${columnType.name}"${isNegated ? "<>ALL" : "=ANY"}($${params.length}${castType})`);
+              orConstraints.push(`${getBaseColumnPrefix(model, joins)}"${columnType.name}"${isNegated ? "<>ALL" : "=ANY"}($${params.length}${castType})`);
             }
           }
         }
@@ -1746,6 +1753,7 @@ function buildWhere({
               if (parentColumn?.type?.toLowerCase() === "json") {
                 andValues.push(
                   buildJsonPropertyClause({
+                    tablePrefix: getBaseColumnPrefix(model, joins),
                     columnName: parentColumn.name,
                     path: [key],
                     isNegated,
@@ -1954,7 +1962,7 @@ function buildArrayOrSingleStatement({
       throw new QueryError(`Unable to find property ${propertyName} on model ${model.name}`, model);
     }
     column = localColumn;
-    tablePrefix = "";
+    tablePrefix = getBaseColumnPrefix(model, joins);
   }
   if (value === null) {
     return `${tablePrefix}"${column.name}" ${isNegated ? "IS NOT" : "IS"} NULL`;
@@ -2128,8 +2136,8 @@ function getTypeCastSuffix(value) {
   }
   return "";
 }
-function buildJsonAccessor(columnName, path) {
-  let result = `"${columnName}"`;
+function buildJsonAccessor(tablePrefix, columnName, path) {
+  let result = `${tablePrefix}"${columnName}"`;
   for (let i = 0; i < path.length; i++) {
     const arrow = i === path.length - 1 ? "->>" : "->";
     result += `${arrow}'${path[i]}'`;
@@ -2140,6 +2148,7 @@ function isJsonConstraintOperator(key) {
   return key === "!" || key === "<" || key === "<=" || key === ">" || key === ">=";
 }
 function buildJsonPropertyClause({
+  tablePrefix,
   columnName,
   path,
   isNegated,
@@ -2150,10 +2159,10 @@ function buildJsonPropertyClause({
     assertValidSqlIdentifier(segment, `JSON property name "${segment}"`);
   }
   if (constraint === null) {
-    return `${buildJsonAccessor(columnName, path)} ${isNegated ? "IS NOT" : "IS"} NULL`;
+    return `${buildJsonAccessor(tablePrefix, columnName, path)} ${isNegated ? "IS NOT" : "IS"} NULL`;
   }
   if (Array.isArray(constraint)) {
-    const accessor2 = buildJsonAccessor(columnName, path);
+    const accessor2 = buildJsonAccessor(tablePrefix, columnName, path);
     params.push(constraint);
     return `${accessor2}${isNegated ? "<>ALL" : "=ANY"}($${params.length})`;
   }
@@ -2161,7 +2170,7 @@ function buildJsonPropertyClause({
     const entries = Object.entries(constraint);
     const firstKey = entries[0]?.[0];
     if (firstKey && isJsonConstraintOperator(firstKey)) {
-      const accessor2 = buildJsonAccessor(columnName, path);
+      const accessor2 = buildJsonAccessor(tablePrefix, columnName, path);
       const negatedComparisonOperators = { "<": ">=", "<=": ">", ">": "<=", ">=": "<" };
       const clauses2 = [];
       for (const [operator, operatorValue] of entries) {
@@ -2188,6 +2197,7 @@ function buildJsonPropertyClause({
     for (const [nestedKey, nestedValue] of entries) {
       clauses.push(
         buildJsonPropertyClause({
+          tablePrefix,
           columnName,
           path: [...path, nestedKey],
           isNegated,
@@ -2198,7 +2208,7 @@ function buildJsonPropertyClause({
     }
     return clauses.join(" AND ");
   }
-  const accessor = buildJsonAccessor(columnName, path);
+  const accessor = buildJsonAccessor(tablePrefix, columnName, path);
   params.push(constraint);
   const castSuffix = getTypeCastSuffix(constraint);
   const castAccessor = castSuffix ? `(${accessor})${castSuffix}` : accessor;
@@ -2262,7 +2272,7 @@ function buildComparisonOperatorStatement({
       throw new QueryError(`Unable to find property ${propertyName} on model ${model.name}`, model);
     }
     column = localColumn;
-    tablePrefix = "";
+    tablePrefix = getBaseColumnPrefix(model, joins);
   }
   if (value === null) {
     return `${tablePrefix}"${column.name}" ${isNegated ? "IS NOT" : "IS"} NULL`;

package/dist/index.mjs

@@ -555,6 +555,9 @@ function assertValidSqlIdentifier(value, context) {
     throw new Error(`Invalid SQL identifier for ${context}: "${value}". Identifiers must start with a letter or underscore and contain only letters, numbers, underscores, and dots.`);
   }
 }
+function getBaseColumnPrefix(model, joins) {
+  return joins?.length ? `${model.qualifiedTableName}.` : "";
+}
 function getSelectQueryAndParams({
   repositoriesByModelNameLowered,
   model,
@@ -597,18 +600,20 @@ function getSelectQueryAndParams({
   }
   let query = "SELECT ";
   if (distinctOn?.length) {
+    const baseColumnPrefix = getBaseColumnPrefix(model, joins);
     const distinctOnColumnNames = distinctOn.map((propertyName) => {
       const column = model.columnsByPropertyName[propertyName];
       if (!column) {
         throw new QueryError(`Unable to find column for DISTINCT ON property: ${propertyName} on ${model.tableName}`, model);
       }
-      return `"${column.name}"`;
+      return `${baseColumnPrefix}"${column.name}"`;
     });
     query += `DISTINCT ON (${distinctOnColumnNames.join(",")}) `;
   }
   query += getColumnsToSelect({
     model,
-    select
+    select,
+    joins
   });
   if (includeCount) {
     query += ',count(*) OVER() AS "__total_count__"';
@@ -998,7 +1003,8 @@ function getDeleteQueryAndParams({
 }
 function getColumnsToSelect({
   model,
-  select
+  select,
+  joins
 }) {
   let selectColumns;
   if (select) {
@@ -1015,6 +1021,7 @@ function getColumnsToSelect({
       }
     }
   }
+  const baseColumnPrefix = getBaseColumnPrefix(model, joins);
   let query = "";
   for (const [index, propertyName] of Array.from(selectColumns).entries()) {
     const column = model.columnsByPropertyName[propertyName];
@@ -1025,9 +1032,9 @@ function getColumnsToSelect({
       query += ",";
     }
     if (column.name === propertyName) {
-      query += `"${propertyName}"`;
+      query += `${baseColumnPrefix}"${propertyName}"`;
     } else {
-      query += `"${column.name}" AS "${propertyName}"`;
+      query += `${baseColumnPrefix}"${column.name}" AS "${propertyName}"`;
     }
   }
   return query;
@@ -1120,7 +1127,7 @@ function buildSubqueryJoinClause({
       throw new QueryError(`Unable to find property "${mainColumn}" on model "${model.name}" for subquery join`, model);
     }
     assertValidSqlIdentifier(subqueryColumn, "subquery join ON column");
-    onConditions.push(`"${model.tableName}"."${column.name}"="${join.alias}"."${subqueryColumn}"`);
+    onConditions.push(`${model.qualifiedTableName}."${column.name}"="${join.alias}"."${subqueryColumn}"`);
   }
   return ` ${joinType} (${subquerySQL}) AS "${join.alias}" ON ${onConditions.join(" AND ")}`;
 }
@@ -1321,7 +1328,7 @@ function buildOrderStatement({
       if (!column) {
         throw new QueryError(`Property (${propertyName}) not found in model (${model.name}).`, model);
       }
-      orderStatement += `"${column.name}"`;
+      orderStatement += `${getBaseColumnPrefix(model, joins)}"${column.name}"`;
     }
     if (descending) {
       orderStatement += " DESC";
@@ -1496,7 +1503,7 @@ function buildWhere({
           params,
           repositoriesByModelNameLowered
         });
-        return `"${column.name}"${isNegated ? " NOT" : ""} IN (${subquerySQL})`;
+        return `${getBaseColumnPrefix(model, joins)}"${column.name}"${isNegated ? " NOT" : ""} IN (${subquerySQL})`;
       }
       throw new QueryError(`Expected subquery value for 'in' operator. Property (${propertyName ?? ""}) in model (${model.name}).`, model);
     case "exists":
@@ -1573,7 +1580,7 @@ function buildWhere({
           if (arrayColumn) {
             const arrayColumnType = arrayColumn.type ? arrayColumn.type.toLowerCase() : "";
             if (arrayColumnType === "array" || arrayColumnType === "string[]" || arrayColumnType === "integer[]" || arrayColumnType === "float[]" || arrayColumnType === "boolean[]") {
-              return `"${arrayColumn.name}"${isNegated ? "<>" : "="}'{}'`;
+              return `${getBaseColumnPrefix(model, joins)}"${arrayColumn.name}"${isNegated ? "<>" : "="}'{}'`;
             }
           }
           if (isNegated) {
@@ -1683,7 +1690,7 @@ function buildWhere({
                   break;
               }
               params.push(valueWithoutNull);
-              orConstraints.push(`"${columnType.name}"${isNegated ? "<>ALL" : "=ANY"}($${params.length}${castType})`);
+              orConstraints.push(`${getBaseColumnPrefix(model, joins)}"${columnType.name}"${isNegated ? "<>ALL" : "=ANY"}($${params.length}${castType})`);
             }
           }
         }
@@ -1744,6 +1751,7 @@ function buildWhere({
               if (parentColumn?.type?.toLowerCase() === "json") {
                 andValues.push(
                   buildJsonPropertyClause({
+                    tablePrefix: getBaseColumnPrefix(model, joins),
                     columnName: parentColumn.name,
                     path: [key],
                     isNegated,
@@ -1952,7 +1960,7 @@ function buildArrayOrSingleStatement({
       throw new QueryError(`Unable to find property ${propertyName} on model ${model.name}`, model);
     }
     column = localColumn;
-    tablePrefix = "";
+    tablePrefix = getBaseColumnPrefix(model, joins);
   }
   if (value === null) {
     return `${tablePrefix}"${column.name}" ${isNegated ? "IS NOT" : "IS"} NULL`;
@@ -2126,8 +2134,8 @@ function getTypeCastSuffix(value) {
   }
   return "";
 }
-function buildJsonAccessor(columnName, path) {
-  let result = `"${columnName}"`;
+function buildJsonAccessor(tablePrefix, columnName, path) {
+  let result = `${tablePrefix}"${columnName}"`;
   for (let i = 0; i < path.length; i++) {
     const arrow = i === path.length - 1 ? "->>" : "->";
     result += `${arrow}'${path[i]}'`;
@@ -2138,6 +2146,7 @@ function isJsonConstraintOperator(key) {
   return key === "!" || key === "<" || key === "<=" || key === ">" || key === ">=";
 }
 function buildJsonPropertyClause({
+  tablePrefix,
   columnName,
   path,
   isNegated,
@@ -2148,10 +2157,10 @@ function buildJsonPropertyClause({
     assertValidSqlIdentifier(segment, `JSON property name "${segment}"`);
   }
   if (constraint === null) {
-    return `${buildJsonAccessor(columnName, path)} ${isNegated ? "IS NOT" : "IS"} NULL`;
+    return `${buildJsonAccessor(tablePrefix, columnName, path)} ${isNegated ? "IS NOT" : "IS"} NULL`;
   }
   if (Array.isArray(constraint)) {
-    const accessor2 = buildJsonAccessor(columnName, path);
+    const accessor2 = buildJsonAccessor(tablePrefix, columnName, path);
     params.push(constraint);
     return `${accessor2}${isNegated ? "<>ALL" : "=ANY"}($${params.length})`;
   }
@@ -2159,7 +2168,7 @@ function buildJsonPropertyClause({
     const entries = Object.entries(constraint);
     const firstKey = entries[0]?.[0];
     if (firstKey && isJsonConstraintOperator(firstKey)) {
-      const accessor2 = buildJsonAccessor(columnName, path);
+      const accessor2 = buildJsonAccessor(tablePrefix, columnName, path);
       const negatedComparisonOperators = { "<": ">=", "<=": ">", ">": "<=", ">=": "<" };
       const clauses2 = [];
       for (const [operator, operatorValue] of entries) {
@@ -2186,6 +2195,7 @@ function buildJsonPropertyClause({
     for (const [nestedKey, nestedValue] of entries) {
       clauses.push(
         buildJsonPropertyClause({
+          tablePrefix,
           columnName,
           path: [...path, nestedKey],
           isNegated,
@@ -2196,7 +2206,7 @@ function buildJsonPropertyClause({
     }
     return clauses.join(" AND ");
   }
-  const accessor = buildJsonAccessor(columnName, path);
+  const accessor = buildJsonAccessor(tablePrefix, columnName, path);
   params.push(constraint);
   const castSuffix = getTypeCastSuffix(constraint);
   const castAccessor = castSuffix ? `(${accessor})${castSuffix}` : accessor;
@@ -2260,7 +2270,7 @@ function buildComparisonOperatorStatement({
       throw new QueryError(`Unable to find property ${propertyName} on model ${model.name}`, model);
     }
     column = localColumn;
-    tablePrefix = "";
+    tablePrefix = getBaseColumnPrefix(model, joins);
   }
   if (value === null) {
     return `${tablePrefix}"${column.name}" ${isNegated ? "IS NOT" : "IS"} NULL`;

package/docs/guide/subqueries-and-joins.md

@@ -96,9 +96,9 @@ const products = await productRepository
   .find()
   .join('store')
   .where({ store: { name: 'Acme' } });
-// SQL: SELECT "products".* FROM "products"
-//   INNER JOIN "stores" ON "products"."store_id"="stores"."id"
-//   WHERE "stores"."name"=$1
+// SQL: SELECT "products"."id","products"."name",… FROM "products"
+//   INNER JOIN "stores" AS "store" ON "products"."store_id"="store"."id"
+//   WHERE "store"."name"=$1
 
 // Left join
 const products = await productRepository
@@ -116,6 +116,9 @@ const products = await productRepository
 const products = await productRepository.find().leftJoin('store', 'activeStore', { isActive: true });
 ```
 
+When a query includes any join, BigAl automatically qualifies the base table's own columns (in `SELECT`, `WHERE`, `ORDER BY`, and `DISTINCT ON`) with the base table name.
+This keeps columns that share a name across the base and joined tables (most commonly `id`) from being ambiguous, so `.join()` is safe to use without falling back to raw SQL.
+
 ## Subquery joins
 
 Join to subquery results:
@@ -127,7 +130,7 @@ const productCounts = subquery(productRepository)
 
 // Inner join
 const stores = await storeRepository.find().join(productCounts, 'stats', { on: { id: 'store' } });
-// SQL: SELECT "stores".* FROM "stores"
+// SQL: SELECT "stores"."id","stores"."name" FROM "stores"
 //   INNER JOIN (
 //     SELECT "store_id" AS "store", COUNT(*) AS "productCount"
 //     FROM "products" GROUP BY "store_id"