Refactor DeleteQueryBuilder and related tests to use double quotes for table names in SQL queries, ensuring consistency and compatibility with case-sensitive databases. Clean up import statements for improved readability.

Author: kingRayhan

__tests__/delete-builder.test.ts

@@ -1,5 +1,5 @@
 import { DeleteQueryBuilder, SqlExecutor } from "../src";
-import { SimpleWhere, CompositeWhere } from "../src/types/query";
+import { SimpleWhere, CompositeWhere } from "../src";
 
 // Mock SqlExecutor
 const mockExecutor: SqlExecutor = {
@@ -26,15 +26,15 @@ describe("DeleteQueryBuilder", () => {
     it("should build correct SQL for basic delete", () => {
       const result = builder.build();
 
-      expect(result.sql).toContain("DELETE FROM users");
+      expect(result.sql).toContain(`DELETE FROM "users"`);
       expect(result.sql).toContain("RETURNING *");
       expect(result.values).toEqual([]);
     });
 
     it("should build correct SQL for delete with specific returning columns", () => {
       const result = builder.returning(["id", "name"]).build();
 
-      expect(result.sql).toContain("DELETE FROM users");
+      expect(result.sql).toContain(`DELETE FROM "users"`);
       expect(result.sql).toContain("RETURNING id, name");
       expect(result.values).toEqual([]);
     });
@@ -50,7 +50,7 @@ describe("DeleteQueryBuilder", () => {
 
       const result = builder.where(where).build();
 
-      expect(result.sql).toContain("DELETE FROM users");
+      expect(result.sql).toContain(`DELETE FROM "users"`);
       expect(result.sql).toContain(`WHERE "users"."age" > $1`);
       expect(result.sql).toContain("RETURNING *");
       expect(result.values).toEqual([18]);

src/query-builder/delete.ts

@@ -1,6 +1,6 @@
-import { SqlExecutor } from "../types/common";
-import { WhereCondition } from "../types/query";
-import { buildWhereClause } from "../utils/clauses";
+import { SqlExecutor } from "../types";
+import { WhereCondition } from "../types";
+import { buildWhereClause } from "../utils";
 import { BaseQueryBuilder } from "./base";
 
 export class DeleteQueryBuilder<T> extends BaseQueryBuilder<T> {
@@ -36,8 +36,6 @@ export class DeleteQueryBuilder<T> extends BaseQueryBuilder<T> {
       ${whereClause ? `WHERE ${whereClause}` : ""}
       RETURNING ${returning};
     `;
-    console.log(sql);
-    console.log(values);
     return { sql, values };
   }
 }

src/query-builder/select.ts

@@ -1,10 +1,10 @@
-import { SqlExecutor } from "../types/common";
+import { SqlExecutor } from "../types";
 import {
   PaginatedResult,
   PaginationMeta,
   PaginationOptions,
-} from "../types/pagination";
-import { Join, OrderBy, QueryPayload, WhereCondition } from "../types/query";
+} from "../types";
+import { Join, OrderBy, QueryPayload, WhereCondition } from "../types";
 import {
   buildJoinClause,
   buildOrderByClause,
@@ -93,8 +93,6 @@ export class SelectQueryBuilder<T> extends BaseQueryBuilder<T> {
       ${limit ? `LIMIT ${limit}` : ""} ${offset ? `OFFSET ${offset}` : ""};
     `;
 
-    console.log(sql);
-
     return { sql, values };
   }
 
@@ -108,7 +106,7 @@ export class SelectQueryBuilder<T> extends BaseQueryBuilder<T> {
     this.offset(offset);
 
     // Execute the main query for data
-    const result = await this.execute();
+    const result = await this.commit();
     const nodes = result.rows as T[];
 
     // Execute count query for pagination metadata

src/utils/index.ts

@@ -1,3 +1,2 @@
 export * from "./clauses";
 export * from "./formatting";
-export * from "./infer-model";