linkgress-orm 0.3.2 → 0.4.0

package/dist/query/query-builder.js

@@ -15,6 +15,7 @@ const cte_builder_1 = require("./cte-builder");
 const collection_strategy_factory_1 = require("./collection-strategy.factory");
 const union_builder_1 = require("./union-builder");
 const future_query_1 = require("./future-query");
+const join_utils_1 = require("./join-utils");
 /**
  * Field type categories for optimized result transformation
  * const enum is inlined at compile time for zero runtime overhead
@@ -1923,7 +1924,7 @@ class SelectQueryBuilder {
                 for (let i = 0; i < join.foreignKeys.length; i++) {
                     const fk = join.foreignKeys[i];
                     const match = join.matches[i];
-                    joinConditions.push(`"${sourceTable}"."${fk}" = "${join.alias}"."${match}"`);
+                    joinConditions.push(`${(0, join_utils_1.formatJoinValue)(sourceTable, fk)} = ${(0, join_utils_1.formatJoinValue)(join.alias, match)}`);
                 }
             }
             // Combine join conditions with the original WHERE clause
@@ -2062,7 +2063,7 @@ class SelectQueryBuilder {
                 for (let i = 0; i < join.foreignKeys.length; i++) {
                     const fk = join.foreignKeys[i];
                     const match = join.matches[i];
-                    joinConditions.push(`"${sourceTable}"."${fk}" = "${join.alias}"."${match}"`);
+                    joinConditions.push(`${(0, join_utils_1.formatJoinValue)(sourceTable, fk)} = ${(0, join_utils_1.formatJoinValue)(join.alias, match)}`);
                 }
             }
             // Combine join conditions with the original WHERE clause
@@ -2399,6 +2400,8 @@ class SelectQueryBuilder {
             // Only add FK to mainTableColumns if the join source is the main table
             if (join.sourceAlias === this.schema.name || !join.sourceAlias) {
                 for (const fk of join.foreignKeys) {
+                    if ((0, join_utils_1.isLiteralKeyPart)(fk))
+                        continue; // Skip literal values
                     const fkDbCol = getFkDbColumnName(this.schema, fk);
                     mainTableColumns.add(fkDbCol);
                 }
@@ -2430,17 +2433,25 @@ class SelectQueryBuilder {
             for (let i = 0; i < join.foreignKeys.length; i++) {
                 const fk = join.foreignKeys[i];
                 const match = join.matches[i] || 'id';
-                if (join.sourceAlias === this.schema.name || !join.sourceAlias) {
+                if ((0, join_utils_1.isLiteralKeyPart)(fk) || (0, join_utils_1.isLiteralKeyPart)(match)) {
+                    // Literal key parts don't need column name resolution
+                    const fkSide = (0, join_utils_1.isLiteralKeyPart)(fk)
+                        ? (0, join_utils_1.formatJoinValue)('', fk)
+                        : `"${join.sourceAlias === this.schema.name || !join.sourceAlias ? '__mutation__' : join.sourceAlias}"."${getFkDbColumnName(this.schema, fk)}"`;
+                    const matchSide = (0, join_utils_1.formatJoinValue)(join.alias, match);
+                    joinConditions.push(`${fkSide} = ${matchSide}`);
+                }
+                else if (join.sourceAlias === this.schema.name || !join.sourceAlias) {
                     // FK is on main table - look up db column name from main schema
                     const fkDbCol = getFkDbColumnName(this.schema, fk);
-                    joinConditions.push(`"__mutation__"."${fkDbCol}" = "${join.alias}"."${match}"`);
+                    joinConditions.push(`"__mutation__"."${fkDbCol}" = ${(0, join_utils_1.formatJoinValue)(join.alias, match)}`);
                 }
                 else {
                     // FK is on an intermediate joined table - look up from its schema
                     const sourceTableName = aliasToSourceTable.get(join.sourceAlias);
                     const sourceSchema = sourceTableName && this.schemaRegistry ? this.schemaRegistry.get(sourceTableName) : undefined;
                     const fkDbCol = sourceSchema ? getFkDbColumnName(sourceSchema, fk) : fk;
-                    joinConditions.push(`"${join.sourceAlias}"."${fkDbCol}" = "${join.alias}"."${match}"`);
+                    joinConditions.push(`"${join.sourceAlias}"."${fkDbCol}" = ${(0, join_utils_1.formatJoinValue)(join.alias, match)}`);
                 }
             }
             const joinType = join.isMandatory ? 'INNER JOIN' : 'LEFT JOIN';
@@ -3559,7 +3570,7 @@ ${joinClauses.join('\n')}`;
             for (let i = 0; i < join.foreignKeys.length; i++) {
                 const fk = join.foreignKeys[i];
                 const match = join.matches[i];
-                onConditions.push(`"${sourceTable}"."${fk}" = "${join.alias}"."${match}"`);
+                onConditions.push(`${(0, join_utils_1.formatJoinValue)(sourceTable, fk)} = ${(0, join_utils_1.formatJoinValue)(join.alias, match)}`);
             }
             // Use schema-qualified table name if schema is specified
             const joinTableName = this.getQualifiedTableName(join.targetTable, join.targetSchema);
@@ -3794,7 +3805,7 @@ ${joinClauses.join('\n')}`;
             for (let i = 0; i < join.foreignKeys.length; i++) {
                 const fk = join.foreignKeys[i];
                 const match = join.matches[i];
-                onConditions.push(`"${sourceTable}"."${fk}" = "${join.alias}"."${match}"`);
+                onConditions.push(`${(0, join_utils_1.formatJoinValue)(sourceTable, fk)} = ${(0, join_utils_1.formatJoinValue)(join.alias, match)}`);
             }
             const joinTableName = this.getQualifiedTableName(join.targetTable, join.targetSchema);
             fromClause += `\n${joinType} ${joinTableName} AS "${join.alias}" ON ${onConditions.join(' AND ')}`;
@@ -4442,7 +4453,7 @@ ${joinClauses.join('\n')}`;
             for (let i = 0; i < join.foreignKeys.length; i++) {
                 const fk = join.foreignKeys[i];
                 const match = join.matches[i];
-                onConditions.push(`"${sourceTable}"."${fk}" = "${join.alias}"."${match}"`);
+                onConditions.push(`${(0, join_utils_1.formatJoinValue)(sourceTable, fk)} = ${(0, join_utils_1.formatJoinValue)(join.alias, match)}`);
             }
             // Use schema-qualified table name if schema is specified
             const joinTableName = this.getQualifiedTableName(join.targetTable, join.targetSchema);