@inflector/optima-pg 1.0.7 → 1.0.9

package/dist/index.d.ts

@@ -292,7 +292,7 @@ declare const time: (withTimezone?: boolean) => FluentStep<{
     unique: boolean;
     defaultNow: boolean;
 }>;
-declare const timestamp: (withTimezone?: boolean) => FluentStep<{
+declare const timestamp: (withTimezone?: boolean, noms?: boolean) => FluentStep<{
     default: Date;
     SQlType: string;
     notnull: boolean;
@@ -354,6 +354,7 @@ declare class Table<T extends Record<string, AnyColumn>> {
     private db;
     private listenFn;
     constructor(name: string, schema: T, db: Kysely<any>, listenFn: ListenFn);
+    private serializeDateVal;
     private serializeDateInWhereNodes;
     private serializeDates;
     private getVectorCols;

package/dist/index.js

@@ -270,11 +270,15 @@ var bool = () => {
 };
 var time = (withTimezone = false) => {
   const type = withTimezone ? "time with time zone" : "time";
-  return Column().SQlType(type);
+  return Column().SQlType(
+    type
+  );
 };
-var timestamp = (withTimezone = true) => {
-  const type = withTimezone ? "timestamp with time zone" : "timestamp";
-  return Column().SQlType(type);
+var timestamp = (withTimezone = true, noms = true) => {
+  const type = withTimezone ? "timestamp(0) with time zone" : "timestamp(0)";
+  return Column().SQlType(
+    type
+  );
 };
 var bytea = () => {
   return Column().SQlType("bytea");
@@ -425,6 +429,15 @@ var Table = class {
     this.schema = schema;
     this.listenFn = listenFn;
   }
+  serializeDateVal(v) {
+    if (v instanceof Date) {
+      return v.toISOString().replace("T", " ").replace("Z", "+00");
+    }
+    if (typeof v === "string" && this.isISOTimestamp(v)) {
+      return v.replace("T", " ").replace("Z", "+00");
+    }
+    return v;
+  }
   serializeDateInWhereNodes(nodes) {
     return nodes.map((node) => {
       if ("and" in node) {
@@ -433,17 +446,14 @@ var Table = class {
       if ("or" in node) {
         return { or: this.serializeDateInWhereNodes(node.or) };
       }
-      if ("val" in node && node.val instanceof Date) {
-        return {
-          ...node,
-          val: node.val.toISOString().replace("T", " ").replace("Z", "+00")
-        };
+      if ("val" in node) {
+        return { ...node, val: this.serializeDateVal(node.val) };
       }
       if ("low" in node) {
         return {
           ...node,
-          low: node.low instanceof Date ? node.low.toISOString().replace("T", " ").replace("Z", "+00") : node.low,
-          high: node.high instanceof Date ? node.high.toISOString().replace("T", " ").replace("Z", "+00") : node.high
+          low: this.serializeDateVal(node.low),
+          high: this.serializeDateVal(node.high)
         };
       }
       return node;
@@ -483,6 +493,9 @@ var Table = class {
         if (vectorCols.has(k) && typeof v === "string") {
           return [k, JSON.parse(v)];
         }
+        if (typeof v === "string" && this.isPostgresTimestamp(v)) {
+          return [k, v.replace(" ", "T").replace(/\+\d+(:\d+)?$/, "Z")];
+        }
         return [k, v];
       })
     );
@@ -505,7 +518,10 @@ var Table = class {
         query = query.selectAll();
       }
       if (data.where) {
-        query = applyWhere(query, this.serializeDateInWhereNodes(resolveWhere(data.where)));
+        query = applyWhere(
+          query,
+          this.serializeDateInWhereNodes(resolveWhere(data.where))
+        );
       }
       if (data.distinct) {
         query = query.distinct();
@@ -527,7 +543,10 @@ var Table = class {
     return createFluentBuilder2(async (data) => {
       let query = this.db.selectFrom(this.name);
       if (data.where) {
-        query = applyWhere(query, this.serializeDateInWhereNodes(resolveWhere(data.where)));
+        query = applyWhere(
+          query,
+          this.serializeDateInWhereNodes(resolveWhere(data.where))
+        );
       }
       query = query.limit(1);
       const rows = await query.execute();
@@ -561,7 +580,10 @@ var Table = class {
     return createFluentBuilder2(async (data) => {
       let query = this.db.deleteFrom(this.name);
       if (data.where) {
-        query = applyWhere(query, this.serializeDateInWhereNodes(resolveWhere(data.where)));
+        query = applyWhere(
+          query,
+          this.serializeDateInWhereNodes(resolveWhere(data.where))
+        );
       }
       if (data.returning) {
         return await query.returningAll().execute();
@@ -574,7 +596,10 @@ var Table = class {
     return createFluentBuilder2(async (data) => {
       let query = this.db.updateTable(this.name).set(this.serializeDates(set));
       if (data.where) {
-        query = applyWhere(query, this.serializeDateInWhereNodes(resolveWhere(data.where)));
+        query = applyWhere(
+          query,
+          this.serializeDateInWhereNodes(resolveWhere(data.where))
+        );
       }
       if (data.returning) {
         return await query.returningAll().execute();
@@ -587,7 +612,10 @@ var Table = class {
     return createFluentBuilder2(async (data) => {
       let query = this.db.selectFrom(this.name);
       if (data.where) {
-        query = applyWhere(query, this.serializeDateInWhereNodes(resolveWhere(data.where)));
+        query = applyWhere(
+          query,
+          this.serializeDateInWhereNodes(resolveWhere(data.where))
+        );
       }
       const result = await query.select(this.db.fn.countAll().as("count")).executeTakeFirstOrThrow();
       return Number(result.count);
@@ -597,7 +625,10 @@ var Table = class {
     return createFluentBuilder2(async (data) => {
       let query = this.db.selectFrom(this.name);
       if (data.where) {
-        query = applyWhere(query, this.serializeDateInWhereNodes(resolveWhere(data.where)));
+        query = applyWhere(
+          query,
+          this.serializeDateInWhereNodes(resolveWhere(data.where))
+        );
       }
       const result = await query.selectAll().limit(1).execute();
       return result.length > 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inflector/optima-pg",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "type": "module",
   "author": "Inflector",
   "main": "./dist/index.js",