forge-sql-orm 2.0.28 → 2.0.30

package/dist/ForgeSQLORM.mjs

@@ -1,23 +1,26 @@
 import { isTable, sql, eq, and } from "drizzle-orm";
-import moment from "moment";
+import { DateTime } from "luxon";
 import { isSQLWrapper } from "drizzle-orm/sql/sql";
 import { sql as sql$1, migrationRunner } from "@forge/sql";
 import { drizzle } from "drizzle-orm/mysql-proxy";
 import { customType, mysqlTable, timestamp, varchar, bigint } from "drizzle-orm/mysql-core";
-import moment$1 from "moment/moment.js";
 import { getTableName } from "drizzle-orm/table";
 const parseDateTime = (value, format) => {
   let result;
-  const m = moment(value, format, true);
-  if (!m.isValid()) {
-    const momentDate = moment(value);
-    if (momentDate.isValid()) {
-      result = momentDate.toDate();
+  if (value instanceof Date) {
+    result = value;
+  } else {
+    const dt = DateTime.fromFormat(value, format);
+    if (dt.isValid) {
+      result = dt.toJSDate();
     } else {
-      result = new Date(value);
+      const isoDt = DateTime.fromISO(value);
+      if (isoDt.isValid) {
+        result = isoDt.toJSDate();
+      } else {
+        result = new Date(value);
+      }
     }
-  } else {
-    result = m.toDate();
   }
   if (isNaN(result.getTime())) {
     result = new Date(value);
@@ -908,7 +911,7 @@ class ForgeSQLAnalyseOperation {
    * @returns {string} The SQL query for cluster statement history
    */
   buildClusterStatementQuery(tables, from, to) {
-    const formatDateTime = (date) => moment(date).format("YYYY-MM-DDTHH:mm:ss.SSS");
+    const formatDateTime = (date) => DateTime.fromJSDate(date).toFormat("yyyy-LL-dd'T'HH:mm:ss.SSS");
     const tableConditions = tables.map((table) => `TABLE_NAMES LIKE CONCAT(SCHEMA_NAME, '.', '%', '${table}', '%')`).join(" OR ");
     const timeConditions = [];
     if (from) {
@@ -1198,10 +1201,10 @@ const forgeDateTimeString = customType({
     return "datetime";
   },
   toDriver(value) {
-    return moment$1(value).format("YYYY-MM-DDTHH:mm:ss.SSS");
+    return DateTime.fromJSDate(new Date(value)).toFormat("yyyy-LL-dd'T'HH:mm:ss.SSS");
   },
   fromDriver(value) {
-    const format = "YYYY-MM-DDTHH:mm:ss.SSS";
+    const format = "yyyy-LL-dd'T'HH:mm:ss.SSS";
     return parseDateTime(value, format);
   }
 });
@@ -1210,10 +1213,10 @@ const forgeTimestampString = customType({
     return "timestamp";
   },
   toDriver(value) {
-    return moment$1(new Date(value)).format("YYYY-MM-DDTHH:mm:ss.SSS");
+    return DateTime.fromJSDate(value).toFormat("yyyy-LL-dd'T'HH:mm:ss.SSS");
   },
   fromDriver(value) {
-    const format = "YYYY-MM-DDTHH:mm:ss.SSS";
+    const format = "yyyy-LL-dd'T'HH:mm:ss.SSS";
     return parseDateTime(value, format);
   }
 });
@@ -1222,10 +1225,10 @@ const forgeDateString = customType({
     return "date";
   },
   toDriver(value) {
-    return moment$1(value).format("YYYY-MM-DD");
+    return DateTime.fromJSDate(value).toFormat("yyyy-LL-dd");
   },
   fromDriver(value) {
-    const format = "YYYY-MM-DD";
+    const format = "yyyy-LL-dd";
     return parseDateTime(value, format);
   }
 });
@@ -1234,7 +1237,7 @@ const forgeTimeString = customType({
     return "time";
   },
   toDriver(value) {
-    return moment$1(value).format("HH:mm:ss.SSS");
+    return DateTime.fromJSDate(value).toFormat("HH:mm:ss.SSS");
   },
   fromDriver(value) {
     return parseDateTime(value, "HH:mm:ss.SSS");