Enhance test setup by adding 'tags' and 'article_tag_pivot' tables for improved schema testing. Update user table creation to include primary key and default UUID generation. Refactor test assertions for clarity and consistency in SQL output validation.

Author: kingRayhan

__tests__/repository/find-rows.test.ts

@@ -204,7 +204,7 @@ describe("Repository findRows", () => {
     });
   });
 
-  // describe("Logical Operators", () => {
+  describe("Logical Operators", () => {
   //   it("should find rows with and operator", async () => {
   //     const users = await createTestUsers(3);
   //     const minAge = 25;
@@ -261,7 +261,7 @@ describe("Repository findRows", () => {
   //       )
   //     ).toBe(true);
   //   });
-  // });
+  });
   //
   // describe("Sorting Operators", () => {
   //   it("should sort rows with asc operator", async () => {

__tests__/schema.test.ts

@@ -28,19 +28,26 @@ interface Post {
 describe("Schema and Table", () => {
   describe("Table Creation", () => {
     it("should create a table with basic columns", () => {
+      // CREATE TABLE IF NOT EXISTS users (
+      //   "id" UUID PRIMARY KEY NOT NULL DEFAULT gen_random_uuid(),
+      //   "name" VARCHAR(255),
+      //   "email" VARCHAR(255),
+      //   "age" INTEGER,
+      //   "createdAt" TIMESTAMP DEFAULT 'now()'
+      // );
       const table = new Table<User>("users");
-      table.column("id", uuid());
+      table.column("id", uuid()).primaryKey().$defaultUUID();
       table.column("name", varchar(255));
       table.column("email", varchar(255));
       table.column("age", integer());
-      table.column("createdAt", timestamp()).default("now()");
+      table.column("createdAt", timestamp()).$defaultNOW();
       const sql = table.createTableSql();
       expect(sql).toContain("CREATE TABLE IF NOT EXISTS users");
-      expect(sql).toContain('"id" UUID');
+      expect(sql).toContain(`"id" UUID PRIMARY KEY NOT NULL DEFAULT gen_random_uuid()`);
       expect(sql).toContain('"name" VARCHAR(255)');
       expect(sql).toContain('"email" VARCHAR(255)');
       expect(sql).toContain('"age" INTEGER');
-      expect(sql).toContain('"createdAt" TIMESTAMP');
+      expect(sql).toContain(`"createdAt" TIMESTAMP DEFAULT 'now()'`);
     });
 
     it("should create a table with primary key", () => {

__tests__/select-builder.test.ts

@@ -1,4 +1,4 @@
-import {CompositeWhere, Join, OrderBy, SelectQueryBuilder, SimpleWhere, SqlExecutor} from "../src";
+import {and, CompositeWhere, eq, gt, Join, OrderBy, SelectQueryBuilder, SimpleWhere, SqlExecutor} from "../src";
 
 // Mock SqlExecutor
 const mockExecutor: SqlExecutor = {
@@ -28,6 +28,7 @@ describe("SelectQueryBuilder", () => {
   });
 
   describe("Basic Select", () => {
+
     it("should build correct SQL for basic select", () => {
       const result = builder.build();
 

src/schema/column.ts

@@ -34,7 +34,6 @@ export class Column {
   }
 
   $defaultUUID(): this {
-    // @ts-ignore
     this._generateUUID = true;
     return this;
   }

test-setup.ts

@@ -43,9 +43,27 @@ export async function setupTestTables() {
     onDelete: "CASCADE",
   });
 
+  const tagTable = new Table<any>("tags");
+  postTable.column("id", uuid()).primaryKey().$defaultUUID();
+  postTable.column("title", varchar()).notNull();
+
+  const articleTagPivotTable = new Table<any>("article_tag_pivot");
+  articleTagPivotTable.column("article_id", uuid()).notNull().references({
+    table: "articles",
+    column: "id",
+    onDelete: "CASCADE",
+  });
+  articleTagPivotTable.column("tag_id", uuid()).notNull().references({
+    table: "tags",
+    column: "id",
+    onDelete: "CASCADE",
+  });
+
   await pool.query(`
     ${userTable.createTableSql()};
     ${postTable.createTableSql()};
+    ${tagTable.createTableSql()};
+    ${articleTagPivotTable.createTableSql()};
   `);
 }