forge-sql-orm 2.0.17 → 2.0.19

package/src/utils/sqlUtils.ts

@@ -47,23 +47,24 @@ interface ConfigBuilderData {
  * @returns Date object
  */
 export const parseDateTime = (value: string, format: string): Date => {
+  let result: Date;
   const m = moment(value, format, true);
   if (!m.isValid()) {
-    return moment(value).toDate();
+    const momentDate = moment(value);
+    if (momentDate.isValid()) {
+      result = momentDate.toDate();
+    } else {
+      result = new Date(value);
+    }
+  } else {
+    result = m.toDate();
+  }
+  if (isNaN(result.getTime())) {
+    result = new Date(value);
   }
-  return m.toDate();
+  return result;
 };
 
-/**
- * Extracts the alias from a SQL query
- * @param query - The SQL query to extract the alias from
- * @returns The extracted alias or the original query if no alias found
- */
-export function extractAlias(query: string): string {
-  const match = query.match(/\bas\s+(['"`]?)([\w*]+)\1$/i);
-  return match ? match[2] : query;
-}
-
 /**
  * Gets primary keys from the schema.
  * @template T - The type of the table schema
@@ -144,7 +145,7 @@ function processForeignKeys(
         const configBuilders = Array.isArray(configBuilderData)
           ? configBuilderData
           : Object.values(configBuilderData).map(
-              (item) => (item as ConfigBuilderData).value || item,
+              (item) => (item as ConfigBuilderData).value ?? item,
             );
 
         configBuilders.forEach((builder) => {
@@ -198,7 +199,7 @@ export function getTableMetadata(table: AnyMySqlTable): MetadataInfo {
         const configBuilders = Array.isArray(configBuilderData)
           ? configBuilderData
           : Object.values(configBuilderData).map(
-              (item) => (item as ConfigBuilderData).value || item,
+              (item) => (item as ConfigBuilderData).value ?? item,
             );
 
         // Process each builder
@@ -239,28 +240,26 @@ export function getTableMetadata(table: AnyMySqlTable): MetadataInfo {
 
 /**
  * Generates SQL statements to drop tables
- * @param tables - Array of table schemas
+ * @param tables - Array of table names
  * @returns Array of SQL statements for dropping tables
  */
-export function generateDropTableStatements(tables: AnyMySqlTable[]): string[] {
+export function generateDropTableStatements(tables: string[]): string[] {
   const dropStatements: string[] = [];
 
-  tables.forEach((table) => {
-    const tableMetadata = getTableMetadata(table);
-    if (tableMetadata.tableName) {
-      dropStatements.push(`DROP TABLE IF EXISTS \`${tableMetadata.tableName}\`;`);
-    }
+  tables.forEach((tableName) => {
+    dropStatements.push(`DROP TABLE IF EXISTS \`${tableName}\`;`);
   });
 
-  // Add statement to clear migrations table
-  dropStatements.push(`DELETE FROM __migrations;`);
-
   return dropStatements;
 }
 
 type AliasColumnMap = Record<string, AnyColumn>;
 
-function mapSelectTableToAlias(table: MySqlTable,uniqPrefix:string, aliasMap: AliasColumnMap): any {
+function mapSelectTableToAlias(
+  table: MySqlTable,
+  uniqPrefix: string,
+  aliasMap: AliasColumnMap,
+): any {
   const { columns, tableName } = getTableMetadata(table);
   const selectionsTableFields: Record<string, unknown> = {};
   Object.keys(columns).forEach((name) => {
@@ -280,7 +279,7 @@ function isDrizzleColumn(column: any): boolean {
 export function mapSelectAllFieldsToAlias(
   selections: any,
   name: string,
-  uniqName:string,
+  uniqName: string,
   fields: any,
   aliasMap: AliasColumnMap,
 ): any {
@@ -312,7 +311,7 @@ export function mapSelectFieldsWithAlias<TSelection extends SelectedFields>(
   const aliasMap: AliasColumnMap = {};
   const selections: any = {};
   Object.entries(fields).forEach(([name, fields]) => {
-    mapSelectAllFieldsToAlias(selections, name,name, fields, aliasMap);
+    mapSelectAllFieldsToAlias(selections, name, name, fields, aliasMap);
   });
   return { selections, aliasMap };
 }
@@ -327,9 +326,9 @@ function getAliasFromDrizzleAlias(value: unknown): string | undefined {
       const aliasNameChunk = queryChunks[queryChunks.length - 2];
       if (isSQLWrapper(aliasNameChunk) && "queryChunks" in aliasNameChunk) {
         const aliasNameChunkSql = aliasNameChunk as SQL;
-        if (aliasNameChunkSql && aliasNameChunkSql.queryChunks.length === 1) {
+        if (aliasNameChunkSql.queryChunks?.length === 1 && aliasNameChunkSql.queryChunks[0]) {
           const queryChunksStringChunc = aliasNameChunkSql.queryChunks[0];
-          if (queryChunksStringChunc && "value" in queryChunksStringChunc) {
+          if ("value" in queryChunksStringChunc) {
             const values = (queryChunksStringChunc as StringChunk).value;
             if (values && values.length === 1) {
               return values[0];
@@ -402,7 +401,12 @@ export function applyFromDriverTransform<T, TSelection>(
 }
 
 function processNullBranches(obj: Record<string, unknown>): Record<string, unknown> | null {
-  if (obj === null || typeof obj !== 'object' || obj===undefined) {
+  if (obj === null || typeof obj !== "object") {
+    return obj;
+  }
+
+  // Skip built-in objects like Date, Array, etc.
+  if (obj.constructor && obj.constructor.name !== "Object") {
     return obj;
   }
 
@@ -410,12 +414,12 @@ function processNullBranches(obj: Record<string, unknown>): Record<string, unkno
   let allNull = true;
 
   for (const [key, value] of Object.entries(obj)) {
-    if (value === null || value===undefined) {
+    if (value === null || value === undefined) {
       result[key] = null;
       continue;
     }
 
-    if (typeof value === 'object' && (value !== null || value !== undefined) ) {
+    if (typeof value === "object") {
       const processed = processNullBranches(value as Record<string, unknown>);
       result[key] = processed;
       if (processed !== null) {

package/src/webtriggers/applyMigrationsWebTrigger.ts

@@ -27,23 +27,39 @@ import { MigrationRunner } from "@forge/sql/out/migration";
 export const applySchemaMigrations = async (
   migration: (migrationRunner: MigrationRunner) => Promise<MigrationRunner>,
 ) => {
-  console.log("Provisioning the database");
-  await sql._provision();
-  console.info("Running schema migrations");
-  const migrations = await migration(migrationRunner);
-  const successfulMigrations = await migrations.run();
-  console.info("Migrations applied:", successfulMigrations);
+  try {
+    if (typeof migration !== "function") {
+      throw new Error("migration is not a function");
+    }
 
-  const migrationHistory = (await migrationRunner.list())
-    .map((y) => `${y.id}, ${y.name}, ${y.migratedAt.toUTCString()}`)
-    .join("\n");
+    console.log("Provisioning the database");
+    await sql._provision();
+    console.info("Running schema migrations");
+    const migrations = await migration(migrationRunner);
+    const successfulMigrations = await migrations.run();
+    console.info("Migrations applied:", successfulMigrations);
 
-  console.info("Migrations history:\nid, name, migrated_at\n", migrationHistory);
+    const migrationList = await migrationRunner.list();
+    const migrationHistory =
+      Array.isArray(migrationList) && migrationList.length > 0
+        ? migrationList.map((y) => `${y.id}, ${y.name}, ${y.migratedAt.toUTCString()}`).join("\n")
+        : "No migrations found";
 
-  return {
-    headers: { "Content-Type": ["application/json"] },
-    statusCode: 200,
-    statusText: "OK",
-    body: "Migrations successfully executed",
-  };
+    console.info("Migrations history:\nid, name, migrated_at\n", migrationHistory);
+
+    return {
+      headers: { "Content-Type": ["application/json"] },
+      statusCode: 200,
+      statusText: "OK",
+      body: "Migrations successfully executed",
+    };
+  } catch (error) {
+    console.error("Error during migration:", error);
+    return {
+      headers: { "Content-Type": ["application/json"] },
+      statusCode: 500,
+      statusText: "Internal Server Error",
+      body: error instanceof Error ? error.message : "Unknown error during migration",
+    };
+  }
 };

package/src/webtriggers/dropMigrationWebTrigger.ts

@@ -1,7 +1,7 @@
 import { sql } from "@forge/sql";
-import { AnyMySqlTable } from "drizzle-orm/mysql-core";
 import { generateDropTableStatements as generateStatements } from "../utils/sqlUtils";
 import { getHttpResponse, TriggerResponse } from "./index";
+import { getTables } from "../core/SystemTables";
 
 /**
  * ⚠️ DEVELOPMENT ONLY WEB TRIGGER ⚠️
@@ -15,7 +15,6 @@ import { getHttpResponse, TriggerResponse } from "./index";
  * - It may affect application functionality
  * - It could lead to data loss and system instability
  *
- * @param tables - Array of table schemas to drop
  * @returns {Promise<TriggerResponse<string>>} A response containing:
  * - On success: 200 status with warning message about permanent deletion
  * - On failure: 500 status with error message
@@ -23,14 +22,13 @@ import { getHttpResponse, TriggerResponse } from "./index";
  * @example
  * ```typescript
  * // Example usage in development only
- * await dropSchemaMigrations([users, orders]);
+ * await dropSchemaMigrations();
  * // ⚠️ Warning: This will permanently delete all data in users and orders tables
  * ```
  */
-export async function dropSchemaMigrations(
-  tables: AnyMySqlTable[],
-): Promise<TriggerResponse<string>> {
+export async function dropSchemaMigrations(): Promise<TriggerResponse<string>> {
   try {
+    const tables = await getTables();
     // Generate drop statements
     const dropStatements = generateStatements(tables);
 
@@ -45,6 +43,7 @@ export async function dropSchemaMigrations(
       "⚠️ 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";
     return getHttpResponse<string>(500, errorMessage);
   }

package/src/webtriggers/fetchSchemaWebTrigger.ts

@@ -1,6 +1,6 @@
 import { sql } from "@forge/sql";
 import { getHttpResponse, TriggerResponse } from "./index";
-import { forgeSystemTables } from "../core/SystemTables";
+import { forgeSystemTables, getTables } from "../core/SystemTables";
 import { getTableName } from "drizzle-orm/table";
 
 interface CreateTableRow {
@@ -47,14 +47,6 @@ export async function fetchSchemaWebTrigger(): Promise<TriggerResponse<string>>
   }
 }
 
-/**
- * Retrieves all tables from the database
- */
-async function getTables(): Promise<string[]> {
-  const tables = await sql.executeDDL<string>("SHOW TABLES");
-  return tables.rows.flatMap((tableInfo) => Object.values(tableInfo));
-}
-
 /**
  * Generates CREATE TABLE statements for each table
  */
@@ -62,7 +54,7 @@ async function generateCreateTableStatements(tables: string[]): Promise<string[]
   const statements: string[] = [];
 
   for (const table of tables) {
-    const createTableResult = await sql.executeDDL<CreateTableRow>(`SHOW CREATE TABLE ${table}`);
+    const createTableResult = await sql.executeDDL<CreateTableRow>(`SHOW CREATE TABLE "${table}"`);
 
     const createTableStatements = createTableResult.rows
       .filter((row) => !isSystemTable(row.Table))