sqlmorpheus 0.2.3 → 0.2.5

package/dist/index.d.mts

@@ -347,10 +347,7 @@ declare function ForeignKey<TOther extends TableClassInterface>(toTable: Class<T
     onUpdate?: ForeignKeyActions;
 }): (table: any, context: any) => void;
 
-declare function prepareMigration(db: DatabaseAccess, dbInstructions: DatabaseInstructions, overwriteExisting?: boolean): Promise<void>;
-declare function runPreparedMigrations(db: DatabaseAccess, dbInstructions: DatabaseInstructions): Promise<void>;
-declare function prepareAndRunMigration(db: DatabaseAccess, instructions: DatabaseInstructions, overwriteExisting?: boolean): Promise<void>;
-declare function runMigrationWithoutHistory(db: DatabaseAccess, dbInstructions: DatabaseInstructions): Promise<void>;
+declare function runMigration(db: DatabaseAccess, dbInstructions: DatabaseInstructions): Promise<void>;
 declare function rollback(db: DatabaseAccess, dbInstructions: DatabaseInstructions, toVersion: number): Promise<void>;
 
-export { DataType, type DatabaseAccess, type DatabaseInstructions, ForeignKey, type PublicMigrations, type SqlChanges, TableClass, TableObj, prepareAndRunMigration, prepareMigration, rollback, runMigrationWithoutHistory, runPreparedMigrations };
+export { DataType, type DatabaseAccess, type DatabaseInstructions, ForeignKey, type PublicMigrations, type SqlChanges, TableClass, TableObj, rollback, runMigration };

package/dist/index.d.ts

@@ -347,10 +347,7 @@ declare function ForeignKey<TOther extends TableClassInterface>(toTable: Class<T
     onUpdate?: ForeignKeyActions;
 }): (table: any, context: any) => void;
 
-declare function prepareMigration(db: DatabaseAccess, dbInstructions: DatabaseInstructions, overwriteExisting?: boolean): Promise<void>;
-declare function runPreparedMigrations(db: DatabaseAccess, dbInstructions: DatabaseInstructions): Promise<void>;
-declare function prepareAndRunMigration(db: DatabaseAccess, instructions: DatabaseInstructions, overwriteExisting?: boolean): Promise<void>;
-declare function runMigrationWithoutHistory(db: DatabaseAccess, dbInstructions: DatabaseInstructions): Promise<void>;
+declare function runMigration(db: DatabaseAccess, dbInstructions: DatabaseInstructions): Promise<void>;
 declare function rollback(db: DatabaseAccess, dbInstructions: DatabaseInstructions, toVersion: number): Promise<void>;
 
-export { DataType, type DatabaseAccess, type DatabaseInstructions, ForeignKey, type PublicMigrations, type SqlChanges, TableClass, TableObj, prepareAndRunMigration, prepareMigration, rollback, runMigrationWithoutHistory, runPreparedMigrations };
+export { DataType, type DatabaseAccess, type DatabaseInstructions, ForeignKey, type PublicMigrations, type SqlChanges, TableClass, TableObj, rollback, runMigration };

package/dist/index.js

@@ -24,11 +24,8 @@ __export(index_exports, {
   ForeignKey: () => ForeignKey,
   TableClass: () => TableClass,
   TableObj: () => TableObj,
-  prepareAndRunMigration: () => prepareAndRunMigration,
-  prepareMigration: () => prepareMigration,
   rollback: () => rollback,
-  runMigrationWithoutHistory: () => runMigrationWithoutHistory,
-  runPreparedMigrations: () => runPreparedMigrations
+  runMigration: () => runMigration
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -101,6 +98,7 @@ var TableObj = class _TableObj {
   }
   constructor(tableName, defaultValues) {
     this.tableName = tableName;
+    this.tableStructure.table = tableName;
     for (const key in defaultValues) {
       const value = defaultValues[key];
       const columnEntry = _TableObj.getColumnEntry(key, value);
@@ -110,6 +108,9 @@ var TableObj = class _TableObj {
     }
   }
   primaryKey(key) {
+    if (this.tableStructure.primaryKey) {
+      this.tableStructure.columns[this.tableStructure.primaryKey].isPrimaryKey = false;
+    }
     this.tableStructure.primaryKey = key.toString();
     this.tableStructure.columns[key.toString()].isPrimaryKey = true;
     return this;
@@ -187,7 +188,7 @@ var TableStructureGenerator = class {
       } else {
         const classTable = table;
         structure = getTableStructure(classTable);
-        tables[classTable.name] = getTableStructure(classTable);
+        tables[classTable.name] = structure;
       }
       for (const key in structure.columns) {
         const entry = structure.columns[key];
@@ -510,6 +511,7 @@ var Migrations = class {
     const entry = this.getEntry(table);
     entry.recreate = true;
     Logger.log(`Table ${this.getTableName(table)} will be recreated!`);
+    this.allowMigration(version, table, "recreateTable");
   }
 };
 
@@ -609,17 +611,19 @@ ${foreignKeyOnQuery}`;
     changes.down += `
 
 ${foreignKeyOnQuery}`;
-    const exception = this.migrations.verifyRenamingTasks(this.newTables) ?? this.migrations.verifyAllowedMigrations();
-    if (exception) {
-      Logger.debug(`
+    if (fromVersion != 0) {
+      const exception = this.migrations.verifyRenamingTasks(this.newTables) ?? this.migrations.verifyAllowedMigrations();
+      if (exception) {
+        Logger.debug(`
 Canceled changes:
 ${changes.up}
 `);
-      if (dbInstructions.throwIfNotAllowed)
-        throw exception;
-      else {
-        console.error(exception.message);
-        return null;
+        if (dbInstructions.throwIfNotAllowed)
+          throw exception;
+        else {
+          console.error(exception.message);
+          return null;
+        }
       }
     }
     return {
@@ -858,9 +862,13 @@ ${changes.up}
           this.migrations.internalRecreate(newTableDefinition.table, "Dialect does not support altering primary keys");
         continue;
       }
+      const renamedColumns = this.migrations.getMigrationData()[tableName]?.renamedColumns;
       for (const key in newColumnList) {
         const newColumn = newColumnList[key];
         const oldColumn = oldColumnNewNameIndex[newColumn.name];
+        const willBeRenamed = renamedColumns?.find((entry) => entry.newName);
+        if (willBeRenamed)
+          continue;
         if (oldColumn == void 0) {
           changes.up += this.dialect.createColumn(tableName, this.dialect.columnDefinition(newColumn.name, newColumn.type, newColumn.isPrimaryKey, newColumn.defaultValue)) + "\n";
           changes.down += this.dialect.dropColumn(tableName, newColumn.name) + "\n";
@@ -946,12 +954,7 @@ var MigrationHistoryManager = class {
     else if ((0, import_node_fs.existsSync)(downPath) && !overwriteExisting)
       throw new Error(`Migration ${downPath} already exists!`);
     Logger.log(`Save migrations to ${this.migrationsPath}`);
-    (0, import_node_fs.writeFileSync)(`${this.migrationsPath}/${FILENAME_UP_PREFIX}${toVersion}.sql`, `-- From: Version ${fromVersion}
--- To:   Version ${toVersion}
-${changes.up}`, { encoding: "utf-8" });
-    (0, import_node_fs.writeFileSync)(`${this.migrationsPath}/${FILENAME_DOWN_PREFIX}${fromVersion}.sql`, `-- From: Version ${toVersion}
--- To:   Version ${fromVersion}
-${changes.down}`, { encoding: "utf-8" });
+    return changes;
   }
   /**
    * Retrieves the SQL migration script for upgrading to the specified version.
@@ -988,12 +991,15 @@ function TableClass(tableName, primaryKey) {
           foreignKey.toTable = tableName;
       }
     }
-    for (const key in table) {
-      const value = table[key];
+    const obj = new table();
+    for (const key in obj) {
+      const value = obj[key];
       const existingEntry = tableStructure.columns[key];
       const defaultEntry = TableObj.getColumnEntry(key, value);
       if (!defaultEntry)
         continue;
+      if (key == primaryKey)
+        defaultEntry.isPrimaryKey = true;
       tableStructure.columns[key] = {
         ...defaultEntry,
         ...existingEntry
@@ -1525,7 +1531,7 @@ var MySqlDialect = class extends DefaultSql {
     return `ALTER TABLE ${tableName} PRIMARY KEY;`;
   }
   async getForeignKeys(tableName) {
-    const data = await this.db.runGetStatement(`SELECT TABLE_NAME,COLUMN_NAME,CONSTRAINT_NAME, REFERENCED_TABLE_NAME,REFERENCED_COLUMN_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_SCHEMA = (SELECT DATABASE()) AND REFERENCED_TABLE_NAME = '${tableName}';`);
+    const data = await this.db.runGetStatement(`SELECT TABLE_NAME,COLUMN_NAME,CONSTRAINT_NAME,REFERENCED_TABLE_NAME,REFERENCED_COLUMN_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_SCHEMA = (SELECT DATABASE()) AND REFERENCED_TABLE_NAME = '${tableName}';`);
     return data.map((entry) => {
       return {
         fromTable: tableName,
@@ -1536,19 +1542,20 @@ var MySqlDialect = class extends DefaultSql {
     });
   }
   async getTableNames() {
-    const t = await this.db.runGetStatement("SELECT table_name FROM information_schema.tables;");
-    return (await this.db.runGetStatement("SELECT table_name FROM information_schema.tables;")).map((entry) => entry.name);
+    const entries = await this.db.runGetStatement("SHOW TABLES");
+    return entries.map((entry) => Object.values(entry)[0]);
   }
   async getColumnInformation(tableName) {
     const data = await this.db.runGetStatement(`SHOW COLUMNS FROM ${tableName};`);
     const output = {};
     for (const entry of data) {
-      output[entry["name"]] = {
-        name: entry["name"],
-        type: entry["type"],
-        maxLength: 0,
-        defaultValue: entry["dflt_value"],
-        isPrimaryKey: entry["pk"] == "1"
+      const lengthMatch = entry["Type"].match(/^\w+\((\d+)\)/);
+      output[entry["Field"]] = {
+        name: entry["Field"],
+        type: entry["Type"],
+        maxLength: lengthMatch ? parseInt(lengthMatch[1]) ?? 0 : 0,
+        defaultValue: entry["Default"],
+        isPrimaryKey: entry["Key"] == "PRI"
       };
     }
     return output;
@@ -1572,45 +1579,14 @@ function getDialect(db, dbInstructions) {
 }
 
 // src/index.ts
-async function prepareMigration(db, dbInstructions, overwriteExisting) {
-  Logger.setMode(dbInstructions.loggerMode);
-  const dialect = getDialect(db, dbInstructions);
-  const mm = new MigrationManager(dialect);
-  const migration = await mm.generateSqlChanges(dbInstructions);
-  if (!migration)
-    return;
-  const migrationHistoryManager = new MigrationHistoryManager(dbInstructions.configPath);
-  migrationHistoryManager.createMigrationHistory(migration.fromVersion, dbInstructions.version, migration.changes, overwriteExisting);
-}
-async function runPreparedMigrations(db, dbInstructions) {
-  Logger.setMode(dbInstructions.loggerMode);
-  const historyManager = new MigrationHistoryManager(dbInstructions.configPath);
-  const dialect = getDialect(db, dbInstructions);
-  const fromVersion = await dialect.getVersion();
-  const toVersion = dbInstructions.version;
-  if (fromVersion == toVersion)
-    return;
-  await db.createBackup?.(`from_${fromVersion}_to_${dbInstructions.version}`);
-  Logger.log(`Running migrations from ${fromVersion} to ${toVersion}`);
-  for (let i = fromVersion ? fromVersion + 1 : toVersion; i <= toVersion; ++i) {
-    const upChanges = historyManager.getUpMigration(i);
-    Logger.debug(upChanges);
-    await db.runMultipleWriteStatements(upChanges);
-    dbInstructions.version = i;
-  }
-  await dialect.setVersion(toVersion);
-}
-async function prepareAndRunMigration(db, instructions, overwriteExisting) {
-  Logger.setMode(instructions.loggerMode);
-  await prepareMigration(db, instructions, overwriteExisting);
-  await runPreparedMigrations(db, instructions);
-}
-async function runMigrationWithoutHistory(db, dbInstructions) {
+async function runMigration(db, dbInstructions) {
   Logger.setMode(dbInstructions.loggerMode);
   const dialect = getDialect(db, dbInstructions);
   const mm = new MigrationManager(dialect);
   const migration = await mm.generateSqlChanges(dbInstructions);
   if (migration) {
+    const migrationHistoryManager = new MigrationHistoryManager(dbInstructions.configPath);
+    migrationHistoryManager.createMigrationHistory(migration.fromVersion, dbInstructions.version, migration.changes);
     await db.createBackup?.(`from_${migration.fromVersion}_to_${dbInstructions.version}`);
     await db.runMultipleWriteStatements(migration.changes.up);
   }
@@ -1636,9 +1612,6 @@ async function rollback(db, dbInstructions, toVersion) {
   ForeignKey,
   TableClass,
   TableObj,
-  prepareAndRunMigration,
-  prepareMigration,
   rollback,
-  runMigrationWithoutHistory,
-  runPreparedMigrations
+  runMigration
 });

package/dist/index.mjs

@@ -67,6 +67,7 @@ var TableObj = class _TableObj {
   }
   constructor(tableName, defaultValues) {
     this.tableName = tableName;
+    this.tableStructure.table = tableName;
     for (const key in defaultValues) {
       const value = defaultValues[key];
       const columnEntry = _TableObj.getColumnEntry(key, value);
@@ -76,6 +77,9 @@ var TableObj = class _TableObj {
     }
   }
   primaryKey(key) {
+    if (this.tableStructure.primaryKey) {
+      this.tableStructure.columns[this.tableStructure.primaryKey].isPrimaryKey = false;
+    }
     this.tableStructure.primaryKey = key.toString();
     this.tableStructure.columns[key.toString()].isPrimaryKey = true;
     return this;
@@ -153,7 +157,7 @@ var TableStructureGenerator = class {
       } else {
         const classTable = table;
         structure = getTableStructure(classTable);
-        tables[classTable.name] = getTableStructure(classTable);
+        tables[classTable.name] = structure;
       }
       for (const key in structure.columns) {
         const entry = structure.columns[key];
@@ -476,6 +480,7 @@ var Migrations = class {
     const entry = this.getEntry(table);
     entry.recreate = true;
     Logger.log(`Table ${this.getTableName(table)} will be recreated!`);
+    this.allowMigration(version, table, "recreateTable");
   }
 };
 
@@ -575,17 +580,19 @@ ${foreignKeyOnQuery}`;
     changes.down += `
 
 ${foreignKeyOnQuery}`;
-    const exception = this.migrations.verifyRenamingTasks(this.newTables) ?? this.migrations.verifyAllowedMigrations();
-    if (exception) {
-      Logger.debug(`
+    if (fromVersion != 0) {
+      const exception = this.migrations.verifyRenamingTasks(this.newTables) ?? this.migrations.verifyAllowedMigrations();
+      if (exception) {
+        Logger.debug(`
 Canceled changes:
 ${changes.up}
 `);
-      if (dbInstructions.throwIfNotAllowed)
-        throw exception;
-      else {
-        console.error(exception.message);
-        return null;
+        if (dbInstructions.throwIfNotAllowed)
+          throw exception;
+        else {
+          console.error(exception.message);
+          return null;
+        }
       }
     }
     return {
@@ -824,9 +831,13 @@ ${changes.up}
           this.migrations.internalRecreate(newTableDefinition.table, "Dialect does not support altering primary keys");
         continue;
       }
+      const renamedColumns = this.migrations.getMigrationData()[tableName]?.renamedColumns;
       for (const key in newColumnList) {
         const newColumn = newColumnList[key];
         const oldColumn = oldColumnNewNameIndex[newColumn.name];
+        const willBeRenamed = renamedColumns?.find((entry) => entry.newName);
+        if (willBeRenamed)
+          continue;
         if (oldColumn == void 0) {
           changes.up += this.dialect.createColumn(tableName, this.dialect.columnDefinition(newColumn.name, newColumn.type, newColumn.isPrimaryKey, newColumn.defaultValue)) + "\n";
           changes.down += this.dialect.dropColumn(tableName, newColumn.name) + "\n";
@@ -883,7 +894,7 @@ ${changes.up}
 };
 
 // src/lib/MigrationHistoryManager.ts
-import { existsSync, mkdirSync, writeFileSync } from "fs";
+import { existsSync, mkdirSync } from "fs";
 import { readFileSync } from "fs";
 var FILENAME_UP_PREFIX = "up_to_";
 var FILENAME_DOWN_PREFIX = "down_to_";
@@ -912,12 +923,7 @@ var MigrationHistoryManager = class {
     else if (existsSync(downPath) && !overwriteExisting)
       throw new Error(`Migration ${downPath} already exists!`);
     Logger.log(`Save migrations to ${this.migrationsPath}`);
-    writeFileSync(`${this.migrationsPath}/${FILENAME_UP_PREFIX}${toVersion}.sql`, `-- From: Version ${fromVersion}
--- To:   Version ${toVersion}
-${changes.up}`, { encoding: "utf-8" });
-    writeFileSync(`${this.migrationsPath}/${FILENAME_DOWN_PREFIX}${fromVersion}.sql`, `-- From: Version ${toVersion}
--- To:   Version ${fromVersion}
-${changes.down}`, { encoding: "utf-8" });
+    return changes;
   }
   /**
    * Retrieves the SQL migration script for upgrading to the specified version.
@@ -954,12 +960,15 @@ function TableClass(tableName, primaryKey) {
           foreignKey.toTable = tableName;
       }
     }
-    for (const key in table) {
-      const value = table[key];
+    const obj = new table();
+    for (const key in obj) {
+      const value = obj[key];
       const existingEntry = tableStructure.columns[key];
       const defaultEntry = TableObj.getColumnEntry(key, value);
       if (!defaultEntry)
         continue;
+      if (key == primaryKey)
+        defaultEntry.isPrimaryKey = true;
       tableStructure.columns[key] = {
         ...defaultEntry,
         ...existingEntry
@@ -1491,7 +1500,7 @@ var MySqlDialect = class extends DefaultSql {
     return `ALTER TABLE ${tableName} PRIMARY KEY;`;
   }
   async getForeignKeys(tableName) {
-    const data = await this.db.runGetStatement(`SELECT TABLE_NAME,COLUMN_NAME,CONSTRAINT_NAME, REFERENCED_TABLE_NAME,REFERENCED_COLUMN_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_SCHEMA = (SELECT DATABASE()) AND REFERENCED_TABLE_NAME = '${tableName}';`);
+    const data = await this.db.runGetStatement(`SELECT TABLE_NAME,COLUMN_NAME,CONSTRAINT_NAME,REFERENCED_TABLE_NAME,REFERENCED_COLUMN_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_SCHEMA = (SELECT DATABASE()) AND REFERENCED_TABLE_NAME = '${tableName}';`);
     return data.map((entry) => {
       return {
         fromTable: tableName,
@@ -1502,19 +1511,20 @@ var MySqlDialect = class extends DefaultSql {
     });
   }
   async getTableNames() {
-    const t = await this.db.runGetStatement("SELECT table_name FROM information_schema.tables;");
-    return (await this.db.runGetStatement("SELECT table_name FROM information_schema.tables;")).map((entry) => entry.name);
+    const entries = await this.db.runGetStatement("SHOW TABLES");
+    return entries.map((entry) => Object.values(entry)[0]);
   }
   async getColumnInformation(tableName) {
     const data = await this.db.runGetStatement(`SHOW COLUMNS FROM ${tableName};`);
     const output = {};
     for (const entry of data) {
-      output[entry["name"]] = {
-        name: entry["name"],
-        type: entry["type"],
-        maxLength: 0,
-        defaultValue: entry["dflt_value"],
-        isPrimaryKey: entry["pk"] == "1"
+      const lengthMatch = entry["Type"].match(/^\w+\((\d+)\)/);
+      output[entry["Field"]] = {
+        name: entry["Field"],
+        type: entry["Type"],
+        maxLength: lengthMatch ? parseInt(lengthMatch[1]) ?? 0 : 0,
+        defaultValue: entry["Default"],
+        isPrimaryKey: entry["Key"] == "PRI"
       };
     }
     return output;
@@ -1538,45 +1548,14 @@ function getDialect(db, dbInstructions) {
 }
 
 // src/index.ts
-async function prepareMigration(db, dbInstructions, overwriteExisting) {
-  Logger.setMode(dbInstructions.loggerMode);
-  const dialect = getDialect(db, dbInstructions);
-  const mm = new MigrationManager(dialect);
-  const migration = await mm.generateSqlChanges(dbInstructions);
-  if (!migration)
-    return;
-  const migrationHistoryManager = new MigrationHistoryManager(dbInstructions.configPath);
-  migrationHistoryManager.createMigrationHistory(migration.fromVersion, dbInstructions.version, migration.changes, overwriteExisting);
-}
-async function runPreparedMigrations(db, dbInstructions) {
-  Logger.setMode(dbInstructions.loggerMode);
-  const historyManager = new MigrationHistoryManager(dbInstructions.configPath);
-  const dialect = getDialect(db, dbInstructions);
-  const fromVersion = await dialect.getVersion();
-  const toVersion = dbInstructions.version;
-  if (fromVersion == toVersion)
-    return;
-  await db.createBackup?.(`from_${fromVersion}_to_${dbInstructions.version}`);
-  Logger.log(`Running migrations from ${fromVersion} to ${toVersion}`);
-  for (let i = fromVersion ? fromVersion + 1 : toVersion; i <= toVersion; ++i) {
-    const upChanges = historyManager.getUpMigration(i);
-    Logger.debug(upChanges);
-    await db.runMultipleWriteStatements(upChanges);
-    dbInstructions.version = i;
-  }
-  await dialect.setVersion(toVersion);
-}
-async function prepareAndRunMigration(db, instructions, overwriteExisting) {
-  Logger.setMode(instructions.loggerMode);
-  await prepareMigration(db, instructions, overwriteExisting);
-  await runPreparedMigrations(db, instructions);
-}
-async function runMigrationWithoutHistory(db, dbInstructions) {
+async function runMigration(db, dbInstructions) {
   Logger.setMode(dbInstructions.loggerMode);
   const dialect = getDialect(db, dbInstructions);
   const mm = new MigrationManager(dialect);
   const migration = await mm.generateSqlChanges(dbInstructions);
   if (migration) {
+    const migrationHistoryManager = new MigrationHistoryManager(dbInstructions.configPath);
+    migrationHistoryManager.createMigrationHistory(migration.fromVersion, dbInstructions.version, migration.changes);
     await db.createBackup?.(`from_${migration.fromVersion}_to_${dbInstructions.version}`);
     await db.runMultipleWriteStatements(migration.changes.up);
   }
@@ -1601,9 +1580,6 @@ export {
   ForeignKey,
   TableClass,
   TableObj,
-  prepareAndRunMigration,
-  prepareMigration,
   rollback,
-  runMigrationWithoutHistory,
-  runPreparedMigrations
+  runMigration
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlmorpheus",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "author": "JodliDev",
   "keywords": [],
   "license": "MIT",
@@ -26,9 +26,11 @@
     "build_and_publish": "npm run build && npm publish"
   },
   "devDependencies": {
+    "@testcontainers/mysql": "^11.7.1",
     "@types/better-sqlite3": "^7.6.13",
     "@types/node": "^24.0.13",
     "better-sqlite3": "^12.2.0",
+    "mysql2": "^3.15.2",
     "tsup": "^8.5.0",
     "typescript": "^5.8.3",
     "vitest": "^3.2.4"