forge-sql-orm 2.1.1 → 2.1.3

package/src/utils/sqlUtils.ts

@@ -57,13 +57,19 @@ export const parseDateTime = (value: string | Date, format: string): Date => {
     if (dt.isValid) {
       result = dt.toJSDate();
     } else {
-      // 2. Try to parse as ISO string
-      const isoDt = DateTime.fromISO(value);
-      if (isoDt.isValid) {
-        result = isoDt.toJSDate();
+      // 2. Try to parse as SQL string
+      const sqlDt = DateTime.fromSQL(value);
+      if (sqlDt.isValid) {
+        result = sqlDt.toJSDate();
       } else {
-        // 3. Fallback: use native Date constructor
-        result = new Date(value);
+        // 3. Try to parse as RFC2822 string
+        const isoDt = DateTime.fromRFC2822(value);
+        if (isoDt.isValid) {
+          result = isoDt.toJSDate();
+        } else {
+          // 4. Fallback: use native Date constructor
+          result = new Date(value);
+        }
       }
     }
   }
@@ -81,39 +87,57 @@ export const parseDateTime = (value: string | Date, format: string): Date => {
  * @returns Formatted date string.
  * @throws Error if value cannot be parsed as a valid date.
  */
-export function formatDateTime(value: Date | string | number, format: string): string {
-    let dt: DateTime|null = null;
-
-    if (value instanceof Date) {
-        dt = DateTime.fromJSDate(value);
-    } else if (typeof value === "string") {
-        // Перебор парсеров
-        for (const parser of [
-            DateTime.fromISO,
-            DateTime.fromRFC2822,
-            DateTime.fromSQL,
-            DateTime.fromHTTP,
-        ]) {
-            dt = parser(value);
-            if (dt.isValid) break;
-        }
-        if (!dt?.isValid) {
-            const parsed = Number(value);
-            if (!isNaN(parsed)) {
-                dt = DateTime.fromMillis(parsed);
-            }
-        }
-    } else if (typeof value === "number") {
-        dt = DateTime.fromMillis(value);
-    } else {
-        throw new Error("Unsupported type");
-    }
+export function formatDateTime(
+  value: Date | string | number,
+  format: string,
+  isTimeStamp: boolean,
+): string {
+  let dt: DateTime | null = null;
 
+  if (value instanceof Date) {
+    dt = DateTime.fromJSDate(value);
+  } else if (typeof value === "string") {
+    for (const parser of [
+      DateTime.fromISO,
+      DateTime.fromRFC2822,
+      DateTime.fromSQL,
+      DateTime.fromHTTP,
+    ]) {
+      dt = parser(value);
+      if (dt.isValid) break;
+    }
     if (!dt?.isValid) {
-        throw new Error("Invalid Date");
+      const parsed = Number(value);
+      if (!isNaN(parsed)) {
+        dt = DateTime.fromMillis(parsed);
+      }
     }
+  } else if (typeof value === "number") {
+    dt = DateTime.fromMillis(value);
+  } else {
+    throw new Error("Unsupported type");
+  }
+
+  if (!dt?.isValid) {
+    throw new Error("Invalid Date");
+  }
+  const minDate = DateTime.fromSeconds(1);
+  const maxDate = DateTime.fromMillis(2147483647 * 1000); // 2038-01-19 03:14:07.999 UTC
+
+  if (isTimeStamp) {
+    if (dt < minDate) {
+      throw new Error(
+        "Atlassian Forge does not support zero or negative timestamps. Allowed range: from '1970-01-01 00:00:01.000000' to '2038-01-19 03:14:07.999999'.",
+      );
+    }
+    if (dt > maxDate) {
+      throw new Error(
+        "Atlassian Forge does not support timestamps beyond 2038-01-19 03:14:07.999999. Please use a smaller date within the supported range.",
+      );
+    }
+  }
 
-    return dt.toFormat(format);
+  return dt.toFormat(format);
 }
 
 /**

package/src/webtriggers/applyMigrationsWebTrigger.ts

@@ -40,13 +40,17 @@ export const applySchemaMigrations = async (
     console.info("Migrations applied:", successfulMigrations);
 
     const migrationList = await migrationRunner.list();
-    const migrationHistory =
-      Array.isArray(migrationList) && migrationList.length > 0
-        ? migrationList
-            .sort((a, b) => a.migratedAt.getTime() - b.migratedAt.getTime())
-            .map((y) => `${y.id}, ${y.name}, ${y.migratedAt.toUTCString()}`)
-            .join("\n")
-        : "No migrations found";
+    let migrationHistory = "No migrations found";
+
+    if (Array.isArray(migrationList) && migrationList.length > 0) {
+      const sortedMigrations = migrationList.toSorted(
+        (a, b) => a.migratedAt.getTime() - b.migratedAt.getTime(),
+      );
+
+      migrationHistory = sortedMigrations
+        .map((y) => `${y.id}, ${y.name}, ${y.migratedAt.toUTCString()}`)
+        .join("\n");
+    }
 
     console.info("Migrations history:\nid, name, migrated_at\n", migrationHistory);
 
@@ -56,13 +60,13 @@ export const applySchemaMigrations = async (
       statusText: "OK",
       body: "Migrations successfully executed",
     };
-  } catch (error) {
-    try {
-      console.error("Error during migration:", JSON.stringify(error));
-    } catch (e) {
-      console.trace("Error stringify:", e);
-      console.error("Error during migration:", error);
-    }
+  } catch (error: any) {
+    const errorMessage =
+      error?.debug?.sqlMessage ??
+      error?.debug?.message ??
+      error.message ??
+      "Unknown error occurred";
+    console.error("Error during migration:", errorMessage);
     return {
       headers: { "Content-Type": ["application/json"] },
       statusCode: 500,

package/src/webtriggers/dropMigrationWebTrigger.ts

@@ -34,7 +34,7 @@ export async function dropSchemaMigrations(): Promise<TriggerResponse<string>> {
 
     // Execute each statement
     for (const statement of dropStatements) {
-      console.warn(statement);
+      console.debug(`execute DDL: ${statement}`);
       await sql.executeDDL(statement);
     }
 
@@ -42,9 +42,13 @@ export async function dropSchemaMigrations(): Promise<TriggerResponse<string>> {
       200,
       "⚠️ All data in these tables has been permanently deleted. This operation cannot be undone.",
     );
-  } catch (error: unknown) {
-    console.error(error);
-    const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+  } catch (error: any) {
+    const errorMessage =
+      error?.debug?.sqlMessage ??
+      error?.debug?.message ??
+      error.message ??
+      "Unknown error occurred";
+    console.error(errorMessage);
     return getHttpResponse<string>(500, errorMessage);
   }
 }

package/src/webtriggers/dropTablesMigrationWebTrigger.ts

@@ -34,7 +34,7 @@ export async function dropTableSchemaMigrations(): Promise<TriggerResponse<strin
 
     // Execute each statement
     for (const statement of dropStatements) {
-      console.warn(statement);
+      console.debug(`execute DDL: ${statement}`);
       await sql.executeDDL(statement);
     }
 
@@ -42,9 +42,13 @@ export async function dropTableSchemaMigrations(): Promise<TriggerResponse<strin
       200,
       "⚠️ All data in these tables has been permanently deleted. This operation cannot be undone.",
     );
-  } catch (error: unknown) {
-    console.error(error);
-    const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+  } catch (error: any) {
+    const errorMessage =
+      error?.debug?.sqlMessage ??
+      error?.debug?.message ??
+      error.message ??
+      "Unknown error occurred";
+    console.error(errorMessage);
     return getHttpResponse<string>(500, errorMessage);
   }
 }

package/src/webtriggers/fetchSchemaWebTrigger.ts

@@ -40,9 +40,13 @@ export async function fetchSchemaWebTrigger(): Promise<TriggerResponse<string>>
     const sqlStatements = wrapWithForeignKeyChecks(createTableStatements);
 
     return getHttpResponse<string>(200, sqlStatements.join(";\n"));
-  } catch (error: unknown) {
-    console.error(JSON.stringify(error));
-    const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+  } catch (error: any) {
+    const errorMessage =
+      error?.debug?.sqlMessage ??
+      error?.debug?.message ??
+      error.message ??
+      "Unknown error occurred";
+    console.error(errorMessage);
     return getHttpResponse<string>(500, errorMessage);
   }
 }