Add support to the new ts-sql-query custom types: customInt, customDouble, customUuid, customLocalDate, customLocalTime, customLocalDateTime

juanluispaz · lorefnon · commit 97ab48e35523 · 2024-02-19T19:13:34.000+05:30
diff --git a/src/field-mappings.ts b/src/field-mappings.ts
@@ -57,7 +57,7 @@ export const GeneratedFieldTypeSchema = z.object({
     /**
      * Specify that this field uses a custom database type or an enum type
      */
-    kind: z.enum(["custom", "customComparable", "enum"]).nullish(),
+    kind: z.enum(["custom", "customComparable", "enum", "customInt", "customDouble", "customUuid", "customLocalDate", "customLocalTime", "customLocalDateTime"]).nullish(),
     /**
      * This name is a database type identifier as expected by ts-sql-query
      *
diff --git a/test/__snapshots__/supports-custom-UUID-field-with-db-type-name.expected.txt b/test/__snapshots__/supports-custom-UUID-field-with-db-type-name.expected.txt
@@ -0,0 +1,28 @@
+// AuthorBooksTable.ts :
+/**
+ * DO NOT EDIT:
+ *
+ * This file has been auto-generated from database schema using ts-sql-codegen.
+ * Any changes will be overwritten.
+ */
+import { View } from "ts-sql-query/View";
+import type { DBConnection } from "../helpers/connection-source";
+import Genre from "./enums/Genre";
+
+class AuthorBooksTable extends View<DBConnection, 'AuthorBooksTable'> {
+    id = this.optionalColumn('id', 'uuid');
+    name = this.optionalColumn('name', 'string');
+    authorId = this.optionalColumn('author_id', 'int');
+    releasedAt = this.optionalColumn('released_at', 'localDate');
+    timeToRead = this.optionalColumn('time_to_read', 'int');
+    genre = this.optionalColumn<Genre, 'genre'>('genre', 'customUuid', 'genre');
+    weightGrams = this.optionalColumn('weight_grams', 'double');
+    authorName = this.optionalColumn('author_name', 'string');
+
+    constructor() {
+        super('author_books');
+    }
+}
+
+export const tAuthorBooks = new AuthorBooksTable();
+
diff --git a/test/__snapshots__/supports-custom-UUID-field.expected.txt b/test/__snapshots__/supports-custom-UUID-field.expected.txt
@@ -0,0 +1,28 @@
+// AuthorBooksTable.ts :
+/**
+ * DO NOT EDIT:
+ *
+ * This file has been auto-generated from database schema using ts-sql-codegen.
+ * Any changes will be overwritten.
+ */
+import { View } from "ts-sql-query/View";
+import type { DBConnection } from "../helpers/connection-source";
+import Genre from "./enums/Genre";
+
+class AuthorBooksTable extends View<DBConnection, 'AuthorBooksTable'> {
+    id = this.optionalColumn('id', 'uuid');
+    name = this.optionalColumn('name', 'string');
+    authorId = this.optionalColumn('author_id', 'int');
+    releasedAt = this.optionalColumn('released_at', 'localDate');
+    timeToRead = this.optionalColumn('time_to_read', 'int');
+    genre = this.optionalColumn<Genre>('genre', 'customUuid', 'genre');
+    weightGrams = this.optionalColumn('weight_grams', 'double');
+    authorName = this.optionalColumn('author_name', 'string');
+
+    constructor() {
+        super('author_books');
+    }
+}
+
+export const tAuthorBooks = new AuthorBooksTable();
+
diff --git a/test/__snapshots__/supports-custom-double-field-with-db-type-name.expected.txt b/test/__snapshots__/supports-custom-double-field-with-db-type-name.expected.txt
@@ -0,0 +1,28 @@
+// AuthorBooksTable.ts :
+/**
+ * DO NOT EDIT:
+ *
+ * This file has been auto-generated from database schema using ts-sql-codegen.
+ * Any changes will be overwritten.
+ */
+import { View } from "ts-sql-query/View";
+import type { DBConnection } from "../helpers/connection-source";
+import Genre from "./enums/Genre";
+
+class AuthorBooksTable extends View<DBConnection, 'AuthorBooksTable'> {
+    id = this.optionalColumn('id', 'uuid');
+    name = this.optionalColumn('name', 'string');
+    authorId = this.optionalColumn('author_id', 'int');
+    releasedAt = this.optionalColumn('released_at', 'localDate');
+    timeToRead = this.optionalColumn('time_to_read', 'int');
+    genre = this.optionalColumn<Genre, 'genre'>('genre', 'customDouble', 'genre');
+    weightGrams = this.optionalColumn('weight_grams', 'double');
+    authorName = this.optionalColumn('author_name', 'string');
+
+    constructor() {
+        super('author_books');
+    }
+}
+
+export const tAuthorBooks = new AuthorBooksTable();
+
diff --git a/test/__snapshots__/supports-custom-double-field.expected.txt b/test/__snapshots__/supports-custom-double-field.expected.txt
@@ -0,0 +1,28 @@
+// AuthorBooksTable.ts :
+/**
+ * DO NOT EDIT:
+ *
+ * This file has been auto-generated from database schema using ts-sql-codegen.
+ * Any changes will be overwritten.
+ */
+import { View } from "ts-sql-query/View";
+import type { DBConnection } from "../helpers/connection-source";
+import Genre from "./enums/Genre";
+
+class AuthorBooksTable extends View<DBConnection, 'AuthorBooksTable'> {
+    id = this.optionalColumn('id', 'uuid');
+    name = this.optionalColumn('name', 'string');
+    authorId = this.optionalColumn('author_id', 'int');
+    releasedAt = this.optionalColumn('released_at', 'localDate');
+    timeToRead = this.optionalColumn('time_to_read', 'int');
+    genre = this.optionalColumn<Genre>('genre', 'customDouble', 'genre');
+    weightGrams = this.optionalColumn('weight_grams', 'double');
+    authorName = this.optionalColumn('author_name', 'string');
+
+    constructor() {
+        super('author_books');
+    }
+}
+
+export const tAuthorBooks = new AuthorBooksTable();
+
diff --git a/test/__snapshots__/supports-custom-int-field-with-db-type-name.expected.txt b/test/__snapshots__/supports-custom-int-field-with-db-type-name.expected.txt
@@ -0,0 +1,28 @@
+// AuthorBooksTable.ts :
+/**
+ * DO NOT EDIT:
+ *
+ * This file has been auto-generated from database schema using ts-sql-codegen.
+ * Any changes will be overwritten.
+ */
+import { View } from "ts-sql-query/View";
+import type { DBConnection } from "../helpers/connection-source";
+import Genre from "./enums/Genre";
+
+class AuthorBooksTable extends View<DBConnection, 'AuthorBooksTable'> {
+    id = this.optionalColumn('id', 'uuid');
+    name = this.optionalColumn('name', 'string');
+    authorId = this.optionalColumn('author_id', 'int');
+    releasedAt = this.optionalColumn('released_at', 'localDate');
+    timeToRead = this.optionalColumn('time_to_read', 'int');
+    genre = this.optionalColumn<Genre, 'genre'>('genre', 'customInt', 'genre');
+    weightGrams = this.optionalColumn('weight_grams', 'double');
+    authorName = this.optionalColumn('author_name', 'string');
+
+    constructor() {
+        super('author_books');
+    }
+}
+
+export const tAuthorBooks = new AuthorBooksTable();
+
diff --git a/test/__snapshots__/supports-custom-int-field.expected.txt b/test/__snapshots__/supports-custom-int-field.expected.txt
@@ -0,0 +1,28 @@
+// AuthorBooksTable.ts :
+/**
+ * DO NOT EDIT:
+ *
+ * This file has been auto-generated from database schema using ts-sql-codegen.
+ * Any changes will be overwritten.
+ */
+import { View } from "ts-sql-query/View";
+import type { DBConnection } from "../helpers/connection-source";
+import Genre from "./enums/Genre";
+
+class AuthorBooksTable extends View<DBConnection, 'AuthorBooksTable'> {
+    id = this.optionalColumn('id', 'uuid');
+    name = this.optionalColumn('name', 'string');
+    authorId = this.optionalColumn('author_id', 'int');
+    releasedAt = this.optionalColumn('released_at', 'localDate');
+    timeToRead = this.optionalColumn('time_to_read', 'int');
+    genre = this.optionalColumn<Genre>('genre', 'customInt', 'genre');
+    weightGrams = this.optionalColumn('weight_grams', 'double');
+    authorName = this.optionalColumn('author_name', 'string');
+
+    constructor() {
+        super('author_books');
+    }
+}
+
+export const tAuthorBooks = new AuthorBooksTable();
+
diff --git a/test/__snapshots__/supports-custom-local-date-field-with-db-type-name.expected.txt b/test/__snapshots__/supports-custom-local-date-field-with-db-type-name.expected.txt
@@ -0,0 +1,28 @@
+// AuthorBooksTable.ts :
+/**
+ * DO NOT EDIT:
+ *
+ * This file has been auto-generated from database schema using ts-sql-codegen.
+ * Any changes will be overwritten.
+ */
+import { View } from "ts-sql-query/View";
+import type { DBConnection } from "../helpers/connection-source";
+import Genre from "./enums/Genre";
+
+class AuthorBooksTable extends View<DBConnection, 'AuthorBooksTable'> {
+    id = this.optionalColumn('id', 'uuid');
+    name = this.optionalColumn('name', 'string');
+    authorId = this.optionalColumn('author_id', 'int');
+    releasedAt = this.optionalColumn('released_at', 'localDate');
+    timeToRead = this.optionalColumn('time_to_read', 'int');
+    genre = this.optionalColumn<Genre, 'genre'>('genre', 'customLocalDate', 'genre');
+    weightGrams = this.optionalColumn('weight_grams', 'double');
+    authorName = this.optionalColumn('author_name', 'string');
+
+    constructor() {
+        super('author_books');
+    }
+}
+
+export const tAuthorBooks = new AuthorBooksTable();
+
diff --git a/test/__snapshots__/supports-custom-local-date-field.expected.txt b/test/__snapshots__/supports-custom-local-date-field.expected.txt
@@ -0,0 +1,28 @@
+// AuthorBooksTable.ts :
+/**
+ * DO NOT EDIT:
+ *
+ * This file has been auto-generated from database schema using ts-sql-codegen.
+ * Any changes will be overwritten.
+ */
+import { View } from "ts-sql-query/View";
+import type { DBConnection } from "../helpers/connection-source";
+import Genre from "./enums/Genre";
+
+class AuthorBooksTable extends View<DBConnection, 'AuthorBooksTable'> {
+    id = this.optionalColumn('id', 'uuid');
+    name = this.optionalColumn('name', 'string');
+    authorId = this.optionalColumn('author_id', 'int');
+    releasedAt = this.optionalColumn('released_at', 'localDate');
+    timeToRead = this.optionalColumn('time_to_read', 'int');
+    genre = this.optionalColumn<Genre>('genre', 'customLocalDate', 'genre');
+    weightGrams = this.optionalColumn('weight_grams', 'double');
+    authorName = this.optionalColumn('author_name', 'string');
+
+    constructor() {
+        super('author_books');
+    }
+}
+
+export const tAuthorBooks = new AuthorBooksTable();
+
diff --git a/test/__snapshots__/supports-custom-local-date-time-field-with-db-type-name.expected.txt b/test/__snapshots__/supports-custom-local-date-time-field-with-db-type-name.expected.txt
@@ -0,0 +1,28 @@
+// AuthorBooksTable.ts :
+/**
+ * DO NOT EDIT:
+ *
+ * This file has been auto-generated from database schema using ts-sql-codegen.
+ * Any changes will be overwritten.
+ */
+import { View } from "ts-sql-query/View";
+import type { DBConnection } from "../helpers/connection-source";
+import Genre from "./enums/Genre";
+
+class AuthorBooksTable extends View<DBConnection, 'AuthorBooksTable'> {
+    id = this.optionalColumn('id', 'uuid');
+    name = this.optionalColumn('name', 'string');
+    authorId = this.optionalColumn('author_id', 'int');
+    releasedAt = this.optionalColumn('released_at', 'localDate');
+    timeToRead = this.optionalColumn('time_to_read', 'int');
+    genre = this.optionalColumn<Genre, 'genre'>('genre', 'customLocalDateTime', 'genre');
+    weightGrams = this.optionalColumn('weight_grams', 'double');
+    authorName = this.optionalColumn('author_name', 'string');
+
+    constructor() {
+        super('author_books');
+    }
+}
+
+export const tAuthorBooks = new AuthorBooksTable();
+
diff --git a/test/__snapshots__/supports-custom-local-date-time-field.expected.txt b/test/__snapshots__/supports-custom-local-date-time-field.expected.txt
@@ -0,0 +1,28 @@
+// AuthorBooksTable.ts :
+/**
+ * DO NOT EDIT:
+ *
+ * This file has been auto-generated from database schema using ts-sql-codegen.
+ * Any changes will be overwritten.
+ */
+import { View } from "ts-sql-query/View";
+import type { DBConnection } from "../helpers/connection-source";
+import Genre from "./enums/Genre";
+
+class AuthorBooksTable extends View<DBConnection, 'AuthorBooksTable'> {
+    id = this.optionalColumn('id', 'uuid');
+    name = this.optionalColumn('name', 'string');
+    authorId = this.optionalColumn('author_id', 'int');
+    releasedAt = this.optionalColumn('released_at', 'localDate');
+    timeToRead = this.optionalColumn('time_to_read', 'int');
+    genre = this.optionalColumn<Genre>('genre', 'customLocalDateTime', 'genre');
+    weightGrams = this.optionalColumn('weight_grams', 'double');
+    authorName = this.optionalColumn('author_name', 'string');
+
+    constructor() {
+        super('author_books');
+    }
+}
+
+export const tAuthorBooks = new AuthorBooksTable();
+
diff --git a/test/__snapshots__/supports-custom-local-time-field-with-db-type-name.expected.txt b/test/__snapshots__/supports-custom-local-time-field-with-db-type-name.expected.txt
@@ -0,0 +1,28 @@
+// AuthorBooksTable.ts :
+/**
+ * DO NOT EDIT:
+ *
+ * This file has been auto-generated from database schema using ts-sql-codegen.
+ * Any changes will be overwritten.
+ */
+import { View } from "ts-sql-query/View";
+import type { DBConnection } from "../helpers/connection-source";
+import Genre from "./enums/Genre";
+
+class AuthorBooksTable extends View<DBConnection, 'AuthorBooksTable'> {
+    id = this.optionalColumn('id', 'uuid');
+    name = this.optionalColumn('name', 'string');
+    authorId = this.optionalColumn('author_id', 'int');
+    releasedAt = this.optionalColumn('released_at', 'localDate');
+    timeToRead = this.optionalColumn('time_to_read', 'int');
+    genre = this.optionalColumn<Genre, 'genre'>('genre', 'customLocalTime', 'genre');
+    weightGrams = this.optionalColumn('weight_grams', 'double');
+    authorName = this.optionalColumn('author_name', 'string');
+
+    constructor() {
+        super('author_books');
+    }
+}
+
+export const tAuthorBooks = new AuthorBooksTable();
+
diff --git a/test/__snapshots__/supports-custom-local-time-field.expected.txt b/test/__snapshots__/supports-custom-local-time-field.expected.txt
@@ -0,0 +1,28 @@
+// AuthorBooksTable.ts :
+/**
+ * DO NOT EDIT:
+ *
+ * This file has been auto-generated from database schema using ts-sql-codegen.
+ * Any changes will be overwritten.
+ */
+import { View } from "ts-sql-query/View";
+import type { DBConnection } from "../helpers/connection-source";
+import Genre from "./enums/Genre";
+
+class AuthorBooksTable extends View<DBConnection, 'AuthorBooksTable'> {
+    id = this.optionalColumn('id', 'uuid');
+    name = this.optionalColumn('name', 'string');
+    authorId = this.optionalColumn('author_id', 'int');
+    releasedAt = this.optionalColumn('released_at', 'localDate');
+    timeToRead = this.optionalColumn('time_to_read', 'int');
+    genre = this.optionalColumn<Genre>('genre', 'customLocalTime', 'genre');
+    weightGrams = this.optionalColumn('weight_grams', 'double');
+    authorName = this.optionalColumn('author_name', 'string');
+
+    constructor() {
+        super('author_books');
+    }
+}
+
+export const tAuthorBooks = new AuthorBooksTable();
+
diff --git a/test/test.ts b/test/test.ts

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ export const GeneratedFieldTypeSchema = z.object({`
`57`	`57`	`/**`
`58`	`58`	`* Specify that this field uses a custom database type or an enum type`
`59`	`59`	`*/`
`60`		`- kind: z.enum(["custom", "customComparable", "enum"]).nullish(),`
	`60`	`+ kind: z.enum(["custom", "customComparable", "enum", "customInt", "customDouble", "customUuid", "customLocalDate", "customLocalTime", "customLocalDateTime"]).nullish(),`
`61`	`61`	`/**`
`62`	`62`	`* This name is a database type identifier as expected by ts-sql-query`
`63`	`63`	`*`