Enhance SelectQueryBuilder to support base table name in order by and join clauses, ensuring correct SQL generation with double quotes for identifiers.

Author: kingRayhan

__tests__/select-builder.test.ts

@@ -134,7 +134,7 @@ describe("SelectQueryBuilder", () => {
       const result = builder.join(join).build();
 
       expect(result.sql).toContain(
-        `INNER JOIN "roles" AS "roles" ON "roles"."id" = "roleId"`
+        `INNER JOIN "roles" AS "roles" ON "roles"."id" = "users"."roleId"`
       );
       expect(result.values).toEqual([]);
     });
@@ -153,9 +153,9 @@ describe("SelectQueryBuilder", () => {
       const result = builder.join(join).build();
 
       expect(result.sql).toContain(
-        "LEFT JOIN roles ON users.role_id = roles.id"
+        `LEFT JOIN "roles" AS "roles" ON "roles"."id" = "users"."roleId"`
       );
-      expect(result.sql).toContain("roles.name,roles.description");
+      expect(result.sql).toContain(`json_build_object('name', "roles"."name", 'description', "roles"."description") AS roles`);
       expect(result.values).toEqual([]);
     });
   });
@@ -169,7 +169,7 @@ describe("SelectQueryBuilder", () => {
 
       const result = builder.orderBy(orderBy).build();
 
-      expect(result.sql).toContain("ORDER BY users.name ASC");
+      expect(result.sql).toContain(`ORDER BY "users"."name" ASC`);
       expect(result.values).toEqual([]);
     });
 
@@ -181,7 +181,7 @@ describe("SelectQueryBuilder", () => {
 
       const result = builder.orderBy(orderBy).build();
 
-      expect(result.sql).toContain("ORDER BY users.name ASC, users.age DESC");
+      expect(result.sql).toContain(`ORDER BY "users"."name" ASC NULLS FIRST, "users"."age" DESC NULLS LAST`);
       expect(result.values).toEqual([]);
     });
   });

src/query-builder/select.ts

@@ -73,9 +73,10 @@ export class SelectQueryBuilder<T> extends BaseQueryBuilder<T> {
       this.tableName
     );
 
-    const orderByClause = buildOrderByClause(this.payload.orderBy);
+    const orderByClause = buildOrderByClause(this.payload.orderBy, this.tableName);
     const { joinConditionClause, joinSelectClause } = buildJoinClause(
-      this.payload.joins
+      this.payload.joins,
+        this.tableName
     );
 
     // Build the SQL query with LIMIT, OFFSET, and ORDER BY

src/utils/clauses.ts

@@ -108,7 +108,7 @@ const processSimpleCondition = <T>(
 /**
  * Builds an ORDER BY clause for SQL queries
  */
-export const buildOrderByClause = <T>(orderBy?: Array<OrderBy<T>>): string => {
+export const buildOrderByClause = <T>(orderBy?: Array<OrderBy<T>>, baseTableName?: string): string => {
   if (!orderBy || orderBy.length === 0) {
     return ""; // No order by clause
   }
@@ -126,7 +126,7 @@ export const buildOrderByClause = <T>(orderBy?: Array<OrderBy<T>>): string => {
     // Add NULLS LAST for better sorting behavior
     const nullsOrder = safeDirection === "DESC" ? "NULLS LAST" : "NULLS FIRST";
 
-    return `${safeColumn} ${safeDirection} ${nullsOrder}`;
+    return `"${baseTableName}".${safeColumn} ${safeDirection} ${nullsOrder}`;
   });
 
   return `ORDER BY ${orderByConditions.join(", ")}`;
@@ -136,7 +136,8 @@ export const buildOrderByClause = <T>(orderBy?: Array<OrderBy<T>>): string => {
  * Builds JOIN clauses for SQL queries
  */
 export const buildJoinClause = <T>(
-  joins?: Array<Join<T, any>>
+  joins?: Array<Join<T, any>>,
+  baseTableName?: string
 ): { joinConditionClause: string; joinSelectClause: string[] } => {
   if (!joins || joins.length === 0) {
     return {
@@ -150,7 +151,7 @@ export const buildJoinClause = <T>(
     const alias = join.as || join.table;
     const foreignField = join.on.foreignField as any;
     const localField = join.on.localField as any;
-    return `${joinType} JOIN "${join.table}" AS "${alias}" ON "${alias}"."${foreignField}" = "${localField}"`;
+    return `${joinType} JOIN "${join.table}" AS "${alias}" ON "${alias}"."${foreignField}" = "${baseTableName}"."${localField}"`;
   });
 
   const joinSelectClause = joins