sqlmorpheus 0.2.5 → 0.2.6

package/dist/index.d.mts

@@ -39,7 +39,7 @@ interface MigrationInstructions {
 
 interface ColumnInfo {
     name: string;
-    type: string;
+    sqlType: string;
     maxLength?: number;
     defaultValue?: string;
     isPrimaryKey: boolean;
@@ -251,7 +251,7 @@ interface SqlChanges {
 }
 
 type NativeDataTypeOptions = "boolean" | "number" | "bigint" | "string";
-type AddedDataTypeOptions = "date" | "time" | "dateTime";
+type AddedDataTypeOptions = "date" | "time" | "dateTime" | "text";
 type DataTypeOptions = NativeDataTypeOptions | AddedDataTypeOptions;
 
 interface InputColumnInfo extends ColumnInfo {
@@ -348,6 +348,6 @@ declare function ForeignKey<TOther extends TableClassInterface>(toTable: Class<T
 }): (table: any, context: any) => void;
 
 declare function runMigration(db: DatabaseAccess, dbInstructions: DatabaseInstructions): Promise<void>;
-declare function rollback(db: DatabaseAccess, dbInstructions: DatabaseInstructions, toVersion: number): Promise<void>;
+declare function rollback(db: DatabaseAccess, dbInstructions: DatabaseInstructions, toVersion: number): Promise<number>;
 
 export { DataType, type DatabaseAccess, type DatabaseInstructions, ForeignKey, type PublicMigrations, type SqlChanges, TableClass, TableObj, rollback, runMigration };

package/dist/index.d.ts

@@ -39,7 +39,7 @@ interface MigrationInstructions {
 
 interface ColumnInfo {
     name: string;
-    type: string;
+    sqlType: string;
     maxLength?: number;
     defaultValue?: string;
     isPrimaryKey: boolean;
@@ -251,7 +251,7 @@ interface SqlChanges {
 }
 
 type NativeDataTypeOptions = "boolean" | "number" | "bigint" | "string";
-type AddedDataTypeOptions = "date" | "time" | "dateTime";
+type AddedDataTypeOptions = "date" | "time" | "dateTime" | "text";
 type DataTypeOptions = NativeDataTypeOptions | AddedDataTypeOptions;
 
 interface InputColumnInfo extends ColumnInfo {
@@ -348,6 +348,6 @@ declare function ForeignKey<TOther extends TableClassInterface>(toTable: Class<T
 }): (table: any, context: any) => void;
 
 declare function runMigration(db: DatabaseAccess, dbInstructions: DatabaseInstructions): Promise<void>;
-declare function rollback(db: DatabaseAccess, dbInstructions: DatabaseInstructions, toVersion: number): Promise<void>;
+declare function rollback(db: DatabaseAccess, dbInstructions: DatabaseInstructions, toVersion: number): Promise<number>;
 
 export { DataType, type DatabaseAccess, type DatabaseInstructions, ForeignKey, type PublicMigrations, type SqlChanges, TableClass, TableObj, rollback, runMigration };

package/dist/index.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -65,7 +75,7 @@ var TableObj = class _TableObj {
   static getEmptyColumnEntry(key) {
     return {
       name: key,
-      type: "",
+      sqlType: "",
       defaultValue: "",
       isPrimaryKey: false
     };
@@ -192,8 +202,8 @@ var TableStructureGenerator = class {
       }
       for (const key in structure.columns) {
         const entry = structure.columns[key];
-        entry.defaultValue = entry.inputDefaultValue === null ? this.dialect.types.null : this.dialect.formatValueToSql(entry.inputDefaultValue, entry.inputType);
-        entry.type = this.dialect.getSqlType(entry.inputType, entry);
+        entry.defaultValue = entry.inputDefaultValue === null ? this.dialect.nullType : this.dialect.formatValueToSql(entry.inputDefaultValue, entry.inputType);
+        entry.sqlType = this.dialect.getSqlType(entry.inputType, entry);
       }
     }
     return tables;
@@ -698,7 +708,7 @@ ${changes.up}
     const queryLines = [];
     for (const key in columns) {
       const columnInfo = columns[key];
-      queryLines.push(this.dialect.columnDefinition(columnInfo.name, columnInfo.type, columnInfo.isPrimaryKey, columnInfo.defaultValue));
+      queryLines.push(this.dialect.columnDefinition(columnInfo.name, columnInfo.sqlType, columnInfo.isPrimaryKey, columnInfo.defaultValue));
     }
     if (foreignKeys) {
       for (const foreignKeyInfo of foreignKeys) {
@@ -870,9 +880,9 @@ ${changes.up}
         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.up += this.dialect.createColumn(tableName, this.dialect.columnDefinition(newColumn.name, newColumn.sqlType, newColumn.isPrimaryKey, newColumn.defaultValue)) + "\n";
           changes.down += this.dialect.dropColumn(tableName, newColumn.name) + "\n";
-        } else if (newColumn.type != oldColumn.type || newColumn.defaultValue != oldColumn.defaultValue) {
+        } else if (newColumn.sqlType != oldColumn.sqlType || newColumn.defaultValue != oldColumn.defaultValue) {
           this.migrations.internalRecreate(newTableDefinition.table, "Table structure was changed");
         }
       }
@@ -882,7 +892,7 @@ ${changes.up}
         if (newColumn == void 0) {
           this.migrations.compareWithAllowedMigration(tableName, "dropColumn");
           changes.up += this.dialect.dropColumn(tableName, oldColumn.name) + "\n";
-          changes.down += this.dialect.createColumn(tableName, this.dialect.columnDefinition(oldColumn.name, oldColumn.type, oldColumn.isPrimaryKey, oldColumn.defaultValue)) + "\n";
+          changes.down += this.dialect.createColumn(tableName, this.dialect.columnDefinition(oldColumn.name, oldColumn.sqlType, oldColumn.isPrimaryKey, oldColumn.defaultValue)) + "\n";
         }
       }
     }
@@ -924,59 +934,6 @@ ${changes.up}
   }
 };
 
-// src/lib/MigrationHistoryManager.ts
-var import_node_fs = require("fs");
-var import_fs = require("fs");
-var FILENAME_UP_PREFIX = "up_to_";
-var FILENAME_DOWN_PREFIX = "down_to_";
-var MigrationHistoryManager = class {
-  configPath;
-  migrationsPath;
-  constructor(configPath) {
-    this.configPath = configPath;
-    this.migrationsPath = `${configPath}/migrations`;
-    (0, import_node_fs.mkdirSync)(this.configPath, { recursive: true });
-    (0, import_node_fs.mkdirSync)(this.migrationsPath, { recursive: true });
-  }
-  /**
-   * Creates migration history files for upgrading and downgrading database schemas.
-   *
-   * @param fromVersion - The current version number of the database.
-   * @param toVersion - The target version number for the migration.
-   * @param changes - An object containing the SQL changes for upgrading (`changes.up`) and downgrading (`changes.down`).
-   * @param overwriteExisting - A flag that determines if existing migration files should be overwritten. Defaults to `false`.
-   */
-  createMigrationHistory(fromVersion, toVersion, changes, overwriteExisting) {
-    const upPath = `${this.migrationsPath}/${FILENAME_UP_PREFIX}${toVersion}.sql`;
-    const downPath = `${this.migrationsPath}/${FILENAME_DOWN_PREFIX}${fromVersion}.sql`;
-    if ((0, import_node_fs.existsSync)(upPath) && !overwriteExisting)
-      throw new Error(`Migration ${upPath} already exists!`);
-    else if ((0, import_node_fs.existsSync)(downPath) && !overwriteExisting)
-      throw new Error(`Migration ${downPath} already exists!`);
-    Logger.log(`Save migrations to ${this.migrationsPath}`);
-    return changes;
-  }
-  /**
-   * Retrieves the SQL migration script for upgrading to the specified version.
-   * If no version is provided, it retrieves the migration script for the latest version in the history.
-   *
-   * @param toVersion - The version of the migration script to retrieve. If not specified, the latest version is used.
-   * @return The content of the SQL migration script as a string.
-   */
-  getUpMigration(toVersion) {
-    return (0, import_fs.readFileSync)(`${this.migrationsPath}/${FILENAME_UP_PREFIX}${toVersion}.sql`, { encoding: "utf-8" });
-  }
-  /**
-   * Retrieves the SQL migration script for downgrading to the specified version.
-   *
-   * @param version - The version number of the migration to retrieve.
-   * @return The SQL script for the down migration.
-   */
-  getDownMigration(version) {
-    return (0, import_fs.readFileSync)(`${this.migrationsPath}/${FILENAME_DOWN_PREFIX}${version}.sql`, { encoding: "utf-8" });
-  }
-};
-
 // src/lib/tableInfo/decorators/TableClass.ts
 var import_polyfill_symbol_metadata = require("polyfill-symbol-metadata");
 function TableClass(tableName, primaryKey) {
@@ -1038,6 +995,7 @@ function ForeignKey(toTable, toColumn, options) {
 }
 
 // src/lib/dialects/DefaultSql.ts
+var import_escape_sql_string = __toESM(require("escape-sql-string"));
 var MIGRATION_DATA_TABLE_NAME = "__sqlmorpheus_migrations";
 var DefaultSql = class {
   db;
@@ -1046,15 +1004,16 @@ var DefaultSql = class {
   canInspectForeignKeys = false;
   canInspectPrimaryKey = false;
   types = {
+    text: "TEXT",
     string: "TEXT",
     number: "INTEGER",
     bigint: "BIGINT",
     boolean: "BOOLEAN",
     date: "DATE",
     time: "TIME",
-    dateTime: "DATETIME",
-    null: "NULL"
+    dateTime: "DATETIME"
   };
+  nullType = "NULL";
   constructor(db) {
     this.db = db;
   }
@@ -1070,6 +1029,7 @@ var DefaultSql = class {
       return value2 instanceof Date ? value2 : new Date(value2);
     }
     switch (type) {
+      case "text":
       case "string":
         return `"${value}"`;
       case "time":
@@ -1239,12 +1199,17 @@ var DefaultSql = class {
    * @param tableName - The name of the database table to select data from.
    * @param select - An array of column names to include in the SELECT clause.
    * @param where - An optional condition.
+   * @param orderBy - Optional. the column to sort by
    * @return The SQL statement as a string.
    */
-  select(tableName, select, where) {
+  select(tableName, select, where, orderBy) {
     let query = `SELECT ${select.join(",")} FROM ${tableName}`;
-    if (where)
+    if (where) {
       query += ` WHERE ${where}`;
+    }
+    if (orderBy) {
+      query += ` ORDER BY ${orderBy}`;
+    }
     return `${query};`;
   }
   /**
@@ -1276,7 +1241,10 @@ var DefaultSql = class {
    */
   migrationTableQuery() {
     return this.createTable(MIGRATION_DATA_TABLE_NAME, [
-      this.columnDefinition("version", this.types.number, false, "0")
+      this.columnDefinition("fromVersion", this.getSqlType("number"), false, "0"),
+      this.columnDefinition("toVersion", this.getSqlType("number"), true, "0"),
+      this.columnDefinition("upChanges", this.getSqlType("text"), false),
+      this.columnDefinition("downChanges", this.getSqlType("text"), false)
     ]);
   }
   /**
@@ -1305,23 +1273,44 @@ var DefaultSql = class {
    */
   async getVersion() {
     await this.createMigrationTableIfNeeded();
-    const query = this.select(MIGRATION_DATA_TABLE_NAME, ["version"]);
+    const query = this.select(MIGRATION_DATA_TABLE_NAME, ["toVersion"], void 0, "toVersion DESC");
     const data = await this.db.runGetStatement(query);
-    return data.length ? data[0].version : 0;
+    return data.length ? data[0].toVersion : 0;
   }
   /**
    * Updates the migration version in the database. If the version entry does not exist, it inserts a new one;
    * if it exists, it updates the version to the specified value.
    *
-   * @param newVersion - The new migration version to set in the database.
+   * @param toVersion - The new migration version to set in the database.
    * @return A promise that resolves when the operation is complete.
    */
-  async setVersion(newVersion) {
-    const query = `${this.migrationTableQuery()};
-INSERT INTO ${MIGRATION_DATA_TABLE_NAME} (version) VALUES ${newVersion} WHERE NOT EXISTS (SELECT 1 FROM ${MIGRATION_DATA_TABLE_NAME})
-UNION ALL
-UPDATE ${MIGRATION_DATA_TABLE_NAME} SET version = ${newVersion} WHERE EXISTS (SELECT 1 FROM ${MIGRATION_DATA_TABLE_NAME});
-`;
+  async rollbackHistory(toVersion) {
+    const query = `${this.migrationTableQuery()}; DELETE FROM ${MIGRATION_DATA_TABLE_NAME} WHERE toVersion > ${toVersion};`;
+    await this.db.runMultipleWriteStatements(query);
+  }
+  async getChanges(version) {
+    await this.createMigrationTableIfNeeded();
+    const query = this.select(MIGRATION_DATA_TABLE_NAME, ["fromVersion", "upChanges", "downChanges"], `toVersion = ${version}`);
+    const data = await this.db.runGetStatement(query);
+    return data ? { up: data[0].upChanges, down: data[0].downChanges, fromVersion: data[0].fromVersion } : null;
+  }
+  async hasChanges(version) {
+    await this.createMigrationTableIfNeeded();
+    const query = this.select(MIGRATION_DATA_TABLE_NAME, ["toVersion"], `toVersion = ${version}`);
+    const data = await this.db.runGetStatement(query);
+    return !!data.length;
+  }
+  /**
+   * Saves the change history to the SQLMorpheus table in the database
+   * Since we save SQL queries in the database, we need to make sure that they are properly escaped.
+   * @param fromVersion
+   * @param toVersion
+   * @param changes
+   */
+  async setChanges(fromVersion, toVersion, changes) {
+    const downChanges = (0, import_escape_sql_string.default)(changes.down);
+    const upChanges = (0, import_escape_sql_string.default)(changes.up);
+    const query = `${this.migrationTableQuery()} ${await this.hasChanges(toVersion) ? `UPDATE ${MIGRATION_DATA_TABLE_NAME} SET fromVersion = '${fromVersion}', upChanges = ${upChanges}, downChanges = ${downChanges} WHERE toVersion = '${toVersion}';` : `INSERT INTO ${MIGRATION_DATA_TABLE_NAME} (fromVersion, toVersion, upChanges, downChanges) VALUES ('${fromVersion}', '${toVersion}', ${upChanges}, ${downChanges})`}`;
     await this.db.runMultipleWriteStatements(query);
   }
 };
@@ -1329,14 +1318,14 @@ UPDATE ${MIGRATION_DATA_TABLE_NAME} SET version = ${newVersion} WHERE EXISTS (SE
 // src/lib/dialects/SqliteDialect.ts
 var SqliteDialect = class extends DefaultSql {
   types = {
+    text: "TEXT",
     string: "TEXT",
     number: "INTEGER",
     bigint: "INTEGER",
     boolean: "INTEGER",
     date: "INTEGER",
     time: "INTEGER",
-    dateTime: "INTEGER",
-    null: "NULL"
+    dateTime: "INTEGER"
   };
   canAlterForeignKeys = false;
   canAlterPrimaryKey = false;
@@ -1354,8 +1343,8 @@ var SqliteDialect = class extends DefaultSql {
     for (const entry of data) {
       output[entry["name"]] = {
         name: entry["name"],
-        type: entry["type"],
-        defaultValue: entry["dflt_value"],
+        sqlType: entry["type"],
+        defaultValue: entry["dflt_value"] ?? this.nullType,
         isPrimaryKey: entry["pk"] == "1"
       };
     }
@@ -1389,12 +1378,17 @@ var SqliteDialect = class extends DefaultSql {
       };
     });
   }
+  async setChanges(fromVersion, toVersion, changes) {
+    await this.db.runMultipleWriteStatements(`PRAGMA user_version = ${toVersion};`);
+    await super.setChanges(fromVersion, toVersion, changes);
+  }
   async getVersion() {
     const output = await this.db.runGetStatement(`PRAGMA user_version;`);
     return output[0].user_version;
   }
-  async setVersion(newVersion) {
-    await this.db.runMultipleWriteStatements(`PRAGMA user_version = ${newVersion};`);
+  async rollbackHistory(toVersion) {
+    await this.db.runMultipleWriteStatements(`PRAGMA user_version = ${toVersion};`);
+    await super.rollbackHistory(toVersion);
   }
 };
 
@@ -1422,7 +1416,7 @@ var PostgresDialect = class extends DefaultSql {
     for (const entry of data) {
       output[entry["name"]] = {
         name: entry["column_name"],
-        type: entry["data_type"],
+        sqlType: entry["data_type"],
         maxLength: 0,
         defaultValue: entry["column_default"],
         isPrimaryKey: false
@@ -1481,7 +1475,7 @@ var MsSqlDialect = class extends DefaultSql {
     for (const entry of data) {
       output[entry["name"]] = {
         name: entry["name"],
-        type: entry["DATA_TYPE"],
+        sqlType: entry["DATA_TYPE"],
         maxLength: 0,
         defaultValue: entry["COLUMN_DEFAULT"],
         isPrimaryKey: entry["pk"] == "1"
@@ -1498,19 +1492,27 @@ var MySqlDialect = class extends DefaultSql {
   canInspectForeignKeys = true;
   canInspectPrimaryKey = true;
   types = {
+    text: "TEXT",
     string: "VARCHAR",
     number: "INT",
     bigint: "BIGINT",
-    boolean: "BOOLEAN",
+    boolean: "TINYINT(1)",
     date: "DATE",
     time: "TIME",
-    dateTime: "DATETIME",
-    null: "NULL"
+    dateTime: "DATETIME"
   };
+  formatValueToSql(value, type) {
+    switch (type) {
+      case "boolean":
+        return value ? "1" : "0";
+      default:
+        return super.formatValueToSql(value, type);
+    }
+  }
   getSqlType(dataType, columnInfo) {
     switch (dataType) {
       case "string":
-        return this.types[dataType] + `(${columnInfo?.maxLength})`;
+        return this.types[dataType] + `(${columnInfo?.maxLength ?? 100})`;
       default:
         return super.getSqlType(dataType, columnInfo);
     }
@@ -1531,13 +1533,27 @@ 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 data3 = await this.db.runGetStatement(
+      `SELECT
+				*
+            	FROM information_schema.KEY_COLUMN_USAGE AS info
+                INNER JOIN information_schema.REFERENTIAL_CONSTRAINTS AS constr ON info.CONSTRAINT_NAME = constr.CONSTRAINT_NAME
+			WHERE info.REFERENCED_TABLE_SCHEMA = (SELECT DATABASE()) AND info.TABLE_NAME = '${tableName}';`
+    );
+    const data = await this.db.runGetStatement(
+      `SELECT
+				info.TABLE_NAME, info.COLUMN_NAME, info.REFERENCED_TABLE_NAME, info.REFERENCED_COLUMN_NAME, constr.UPDATE_RULE, constr.DELETE_RULE
+			FROM information_schema.KEY_COLUMN_USAGE AS info INNER JOIN information_schema.REFERENTIAL_CONSTRAINTS AS constr ON info.CONSTRAINT_NAME = constr.CONSTRAINT_NAME
+			WHERE info.REFERENCED_TABLE_SCHEMA = (SELECT DATABASE()) AND info.TABLE_NAME = '${tableName}';`
+    );
     return data.map((entry) => {
       return {
         fromTable: tableName,
         fromColumn: entry["COLUMN_NAME"],
         toTable: entry["REFERENCED_TABLE_NAME"],
-        toColumn: entry["REFERENCED_COLUMN_NAME"]
+        toColumn: entry["REFERENCED_COLUMN_NAME"],
+        onUpdate: entry["UPDATE_RULE"],
+        onDelete: entry["DELETE_RULE"]
       };
     });
   }
@@ -1549,14 +1565,23 @@ var MySqlDialect = class extends DefaultSql {
     const data = await this.db.runGetStatement(`SHOW COLUMNS FROM ${tableName};`);
     const output = {};
     for (const entry of data) {
-      const lengthMatch = entry["Type"].match(/^\w+\((\d+)\)/);
-      output[entry["Field"]] = {
+      const sqlType = entry["Type"].toUpperCase();
+      const info = {
         name: entry["Field"],
-        type: entry["Type"],
-        maxLength: lengthMatch ? parseInt(lengthMatch[1]) ?? 0 : 0,
-        defaultValue: entry["Default"],
+        sqlType,
         isPrimaryKey: entry["Key"] == "PRI"
       };
+      switch (sqlType.substring(0, 4)) {
+        case "TEXT":
+        case "VARC":
+        case "DATE":
+        case "TIME":
+          info.defaultValue = entry["Default"] ? `"${entry["Default"]}"` : this.nullType;
+          break;
+        default:
+          info.defaultValue = entry["Default"] ?? this.nullType;
+      }
+      output[entry["Field"]] = info;
     }
     return output;
   }
@@ -1585,8 +1610,7 @@ async function runMigration(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 dialect.setChanges(migration.fromVersion, dbInstructions.version, migration.changes);
     await db.createBackup?.(`from_${migration.fromVersion}_to_${dbInstructions.version}`);
     await db.runMultipleWriteStatements(migration.changes.up);
   }
@@ -1595,16 +1619,26 @@ async function rollback(db, dbInstructions, toVersion) {
   Logger.setMode(dbInstructions.loggerMode);
   const dialect = getDialect(db, dbInstructions);
   const fromVersion = await dialect.getVersion();
-  const historyManager = new MigrationHistoryManager(dbInstructions.configPath);
   await db.createBackup?.(`from_${fromVersion}_to_${dbInstructions.version}`);
   Logger.log(`Rolling back from ${fromVersion} to ${toVersion}`);
-  for (let i = fromVersion - 1; i >= toVersion; --i) {
-    const upChanges = historyManager.getDownMigration(i);
-    Logger.debug(upChanges);
-    await db.runMultipleWriteStatements(upChanges);
-    dbInstructions.version = i;
+  let version = fromVersion;
+  while (version > toVersion) {
+    const changes = await dialect.getChanges(version);
+    if (!changes) {
+      throw new Error(`No changes found for version ${version}`);
+    } else if (changes.fromVersion == version) {
+      throw new Error(`Saved changes do not change the database version (${version})`);
+    }
+    Logger.debug(changes.down);
+    await db.runMultipleWriteStatements(changes.down);
+    dbInstructions.version = changes.fromVersion;
+    version = changes.fromVersion;
+  }
+  if (version < toVersion) {
+    Logger.warn(`There was no entry for version ${toVersion}. Rolled back to version ${version}`);
   }
-  await dialect.setVersion(toVersion);
+  await dialect.rollbackHistory(version);
+  return version;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.mjs

@@ -34,7 +34,7 @@ var TableObj = class _TableObj {
   static getEmptyColumnEntry(key) {
     return {
       name: key,
-      type: "",
+      sqlType: "",
       defaultValue: "",
       isPrimaryKey: false
     };
@@ -161,8 +161,8 @@ var TableStructureGenerator = class {
       }
       for (const key in structure.columns) {
         const entry = structure.columns[key];
-        entry.defaultValue = entry.inputDefaultValue === null ? this.dialect.types.null : this.dialect.formatValueToSql(entry.inputDefaultValue, entry.inputType);
-        entry.type = this.dialect.getSqlType(entry.inputType, entry);
+        entry.defaultValue = entry.inputDefaultValue === null ? this.dialect.nullType : this.dialect.formatValueToSql(entry.inputDefaultValue, entry.inputType);
+        entry.sqlType = this.dialect.getSqlType(entry.inputType, entry);
       }
     }
     return tables;
@@ -667,7 +667,7 @@ ${changes.up}
     const queryLines = [];
     for (const key in columns) {
       const columnInfo = columns[key];
-      queryLines.push(this.dialect.columnDefinition(columnInfo.name, columnInfo.type, columnInfo.isPrimaryKey, columnInfo.defaultValue));
+      queryLines.push(this.dialect.columnDefinition(columnInfo.name, columnInfo.sqlType, columnInfo.isPrimaryKey, columnInfo.defaultValue));
     }
     if (foreignKeys) {
       for (const foreignKeyInfo of foreignKeys) {
@@ -839,9 +839,9 @@ ${changes.up}
         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.up += this.dialect.createColumn(tableName, this.dialect.columnDefinition(newColumn.name, newColumn.sqlType, newColumn.isPrimaryKey, newColumn.defaultValue)) + "\n";
           changes.down += this.dialect.dropColumn(tableName, newColumn.name) + "\n";
-        } else if (newColumn.type != oldColumn.type || newColumn.defaultValue != oldColumn.defaultValue) {
+        } else if (newColumn.sqlType != oldColumn.sqlType || newColumn.defaultValue != oldColumn.defaultValue) {
           this.migrations.internalRecreate(newTableDefinition.table, "Table structure was changed");
         }
       }
@@ -851,7 +851,7 @@ ${changes.up}
         if (newColumn == void 0) {
           this.migrations.compareWithAllowedMigration(tableName, "dropColumn");
           changes.up += this.dialect.dropColumn(tableName, oldColumn.name) + "\n";
-          changes.down += this.dialect.createColumn(tableName, this.dialect.columnDefinition(oldColumn.name, oldColumn.type, oldColumn.isPrimaryKey, oldColumn.defaultValue)) + "\n";
+          changes.down += this.dialect.createColumn(tableName, this.dialect.columnDefinition(oldColumn.name, oldColumn.sqlType, oldColumn.isPrimaryKey, oldColumn.defaultValue)) + "\n";
         }
       }
     }
@@ -893,59 +893,6 @@ ${changes.up}
   }
 };
 
-// src/lib/MigrationHistoryManager.ts
-import { existsSync, mkdirSync } from "fs";
-import { readFileSync } from "fs";
-var FILENAME_UP_PREFIX = "up_to_";
-var FILENAME_DOWN_PREFIX = "down_to_";
-var MigrationHistoryManager = class {
-  configPath;
-  migrationsPath;
-  constructor(configPath) {
-    this.configPath = configPath;
-    this.migrationsPath = `${configPath}/migrations`;
-    mkdirSync(this.configPath, { recursive: true });
-    mkdirSync(this.migrationsPath, { recursive: true });
-  }
-  /**
-   * Creates migration history files for upgrading and downgrading database schemas.
-   *
-   * @param fromVersion - The current version number of the database.
-   * @param toVersion - The target version number for the migration.
-   * @param changes - An object containing the SQL changes for upgrading (`changes.up`) and downgrading (`changes.down`).
-   * @param overwriteExisting - A flag that determines if existing migration files should be overwritten. Defaults to `false`.
-   */
-  createMigrationHistory(fromVersion, toVersion, changes, overwriteExisting) {
-    const upPath = `${this.migrationsPath}/${FILENAME_UP_PREFIX}${toVersion}.sql`;
-    const downPath = `${this.migrationsPath}/${FILENAME_DOWN_PREFIX}${fromVersion}.sql`;
-    if (existsSync(upPath) && !overwriteExisting)
-      throw new Error(`Migration ${upPath} already exists!`);
-    else if (existsSync(downPath) && !overwriteExisting)
-      throw new Error(`Migration ${downPath} already exists!`);
-    Logger.log(`Save migrations to ${this.migrationsPath}`);
-    return changes;
-  }
-  /**
-   * Retrieves the SQL migration script for upgrading to the specified version.
-   * If no version is provided, it retrieves the migration script for the latest version in the history.
-   *
-   * @param toVersion - The version of the migration script to retrieve. If not specified, the latest version is used.
-   * @return The content of the SQL migration script as a string.
-   */
-  getUpMigration(toVersion) {
-    return readFileSync(`${this.migrationsPath}/${FILENAME_UP_PREFIX}${toVersion}.sql`, { encoding: "utf-8" });
-  }
-  /**
-   * Retrieves the SQL migration script for downgrading to the specified version.
-   *
-   * @param version - The version number of the migration to retrieve.
-   * @return The SQL script for the down migration.
-   */
-  getDownMigration(version) {
-    return readFileSync(`${this.migrationsPath}/${FILENAME_DOWN_PREFIX}${version}.sql`, { encoding: "utf-8" });
-  }
-};
-
 // src/lib/tableInfo/decorators/TableClass.ts
 import "polyfill-symbol-metadata";
 function TableClass(tableName, primaryKey) {
@@ -1007,6 +954,7 @@ function ForeignKey(toTable, toColumn, options) {
 }
 
 // src/lib/dialects/DefaultSql.ts
+import escapeString from "escape-sql-string";
 var MIGRATION_DATA_TABLE_NAME = "__sqlmorpheus_migrations";
 var DefaultSql = class {
   db;
@@ -1015,15 +963,16 @@ var DefaultSql = class {
   canInspectForeignKeys = false;
   canInspectPrimaryKey = false;
   types = {
+    text: "TEXT",
     string: "TEXT",
     number: "INTEGER",
     bigint: "BIGINT",
     boolean: "BOOLEAN",
     date: "DATE",
     time: "TIME",
-    dateTime: "DATETIME",
-    null: "NULL"
+    dateTime: "DATETIME"
   };
+  nullType = "NULL";
   constructor(db) {
     this.db = db;
   }
@@ -1039,6 +988,7 @@ var DefaultSql = class {
       return value2 instanceof Date ? value2 : new Date(value2);
     }
     switch (type) {
+      case "text":
       case "string":
         return `"${value}"`;
       case "time":
@@ -1208,12 +1158,17 @@ var DefaultSql = class {
    * @param tableName - The name of the database table to select data from.
    * @param select - An array of column names to include in the SELECT clause.
    * @param where - An optional condition.
+   * @param orderBy - Optional. the column to sort by
    * @return The SQL statement as a string.
    */
-  select(tableName, select, where) {
+  select(tableName, select, where, orderBy) {
     let query = `SELECT ${select.join(",")} FROM ${tableName}`;
-    if (where)
+    if (where) {
       query += ` WHERE ${where}`;
+    }
+    if (orderBy) {
+      query += ` ORDER BY ${orderBy}`;
+    }
     return `${query};`;
   }
   /**
@@ -1245,7 +1200,10 @@ var DefaultSql = class {
    */
   migrationTableQuery() {
     return this.createTable(MIGRATION_DATA_TABLE_NAME, [
-      this.columnDefinition("version", this.types.number, false, "0")
+      this.columnDefinition("fromVersion", this.getSqlType("number"), false, "0"),
+      this.columnDefinition("toVersion", this.getSqlType("number"), true, "0"),
+      this.columnDefinition("upChanges", this.getSqlType("text"), false),
+      this.columnDefinition("downChanges", this.getSqlType("text"), false)
     ]);
   }
   /**
@@ -1274,23 +1232,44 @@ var DefaultSql = class {
    */
   async getVersion() {
     await this.createMigrationTableIfNeeded();
-    const query = this.select(MIGRATION_DATA_TABLE_NAME, ["version"]);
+    const query = this.select(MIGRATION_DATA_TABLE_NAME, ["toVersion"], void 0, "toVersion DESC");
     const data = await this.db.runGetStatement(query);
-    return data.length ? data[0].version : 0;
+    return data.length ? data[0].toVersion : 0;
   }
   /**
    * Updates the migration version in the database. If the version entry does not exist, it inserts a new one;
    * if it exists, it updates the version to the specified value.
    *
-   * @param newVersion - The new migration version to set in the database.
+   * @param toVersion - The new migration version to set in the database.
    * @return A promise that resolves when the operation is complete.
    */
-  async setVersion(newVersion) {
-    const query = `${this.migrationTableQuery()};
-INSERT INTO ${MIGRATION_DATA_TABLE_NAME} (version) VALUES ${newVersion} WHERE NOT EXISTS (SELECT 1 FROM ${MIGRATION_DATA_TABLE_NAME})
-UNION ALL
-UPDATE ${MIGRATION_DATA_TABLE_NAME} SET version = ${newVersion} WHERE EXISTS (SELECT 1 FROM ${MIGRATION_DATA_TABLE_NAME});
-`;
+  async rollbackHistory(toVersion) {
+    const query = `${this.migrationTableQuery()}; DELETE FROM ${MIGRATION_DATA_TABLE_NAME} WHERE toVersion > ${toVersion};`;
+    await this.db.runMultipleWriteStatements(query);
+  }
+  async getChanges(version) {
+    await this.createMigrationTableIfNeeded();
+    const query = this.select(MIGRATION_DATA_TABLE_NAME, ["fromVersion", "upChanges", "downChanges"], `toVersion = ${version}`);
+    const data = await this.db.runGetStatement(query);
+    return data ? { up: data[0].upChanges, down: data[0].downChanges, fromVersion: data[0].fromVersion } : null;
+  }
+  async hasChanges(version) {
+    await this.createMigrationTableIfNeeded();
+    const query = this.select(MIGRATION_DATA_TABLE_NAME, ["toVersion"], `toVersion = ${version}`);
+    const data = await this.db.runGetStatement(query);
+    return !!data.length;
+  }
+  /**
+   * Saves the change history to the SQLMorpheus table in the database
+   * Since we save SQL queries in the database, we need to make sure that they are properly escaped.
+   * @param fromVersion
+   * @param toVersion
+   * @param changes
+   */
+  async setChanges(fromVersion, toVersion, changes) {
+    const downChanges = escapeString(changes.down);
+    const upChanges = escapeString(changes.up);
+    const query = `${this.migrationTableQuery()} ${await this.hasChanges(toVersion) ? `UPDATE ${MIGRATION_DATA_TABLE_NAME} SET fromVersion = '${fromVersion}', upChanges = ${upChanges}, downChanges = ${downChanges} WHERE toVersion = '${toVersion}';` : `INSERT INTO ${MIGRATION_DATA_TABLE_NAME} (fromVersion, toVersion, upChanges, downChanges) VALUES ('${fromVersion}', '${toVersion}', ${upChanges}, ${downChanges})`}`;
     await this.db.runMultipleWriteStatements(query);
   }
 };
@@ -1298,14 +1277,14 @@ UPDATE ${MIGRATION_DATA_TABLE_NAME} SET version = ${newVersion} WHERE EXISTS (SE
 // src/lib/dialects/SqliteDialect.ts
 var SqliteDialect = class extends DefaultSql {
   types = {
+    text: "TEXT",
     string: "TEXT",
     number: "INTEGER",
     bigint: "INTEGER",
     boolean: "INTEGER",
     date: "INTEGER",
     time: "INTEGER",
-    dateTime: "INTEGER",
-    null: "NULL"
+    dateTime: "INTEGER"
   };
   canAlterForeignKeys = false;
   canAlterPrimaryKey = false;
@@ -1323,8 +1302,8 @@ var SqliteDialect = class extends DefaultSql {
     for (const entry of data) {
       output[entry["name"]] = {
         name: entry["name"],
-        type: entry["type"],
-        defaultValue: entry["dflt_value"],
+        sqlType: entry["type"],
+        defaultValue: entry["dflt_value"] ?? this.nullType,
         isPrimaryKey: entry["pk"] == "1"
       };
     }
@@ -1358,12 +1337,17 @@ var SqliteDialect = class extends DefaultSql {
       };
     });
   }
+  async setChanges(fromVersion, toVersion, changes) {
+    await this.db.runMultipleWriteStatements(`PRAGMA user_version = ${toVersion};`);
+    await super.setChanges(fromVersion, toVersion, changes);
+  }
   async getVersion() {
     const output = await this.db.runGetStatement(`PRAGMA user_version;`);
     return output[0].user_version;
   }
-  async setVersion(newVersion) {
-    await this.db.runMultipleWriteStatements(`PRAGMA user_version = ${newVersion};`);
+  async rollbackHistory(toVersion) {
+    await this.db.runMultipleWriteStatements(`PRAGMA user_version = ${toVersion};`);
+    await super.rollbackHistory(toVersion);
   }
 };
 
@@ -1391,7 +1375,7 @@ var PostgresDialect = class extends DefaultSql {
     for (const entry of data) {
       output[entry["name"]] = {
         name: entry["column_name"],
-        type: entry["data_type"],
+        sqlType: entry["data_type"],
         maxLength: 0,
         defaultValue: entry["column_default"],
         isPrimaryKey: false
@@ -1450,7 +1434,7 @@ var MsSqlDialect = class extends DefaultSql {
     for (const entry of data) {
       output[entry["name"]] = {
         name: entry["name"],
-        type: entry["DATA_TYPE"],
+        sqlType: entry["DATA_TYPE"],
         maxLength: 0,
         defaultValue: entry["COLUMN_DEFAULT"],
         isPrimaryKey: entry["pk"] == "1"
@@ -1467,19 +1451,27 @@ var MySqlDialect = class extends DefaultSql {
   canInspectForeignKeys = true;
   canInspectPrimaryKey = true;
   types = {
+    text: "TEXT",
     string: "VARCHAR",
     number: "INT",
     bigint: "BIGINT",
-    boolean: "BOOLEAN",
+    boolean: "TINYINT(1)",
     date: "DATE",
     time: "TIME",
-    dateTime: "DATETIME",
-    null: "NULL"
+    dateTime: "DATETIME"
   };
+  formatValueToSql(value, type) {
+    switch (type) {
+      case "boolean":
+        return value ? "1" : "0";
+      default:
+        return super.formatValueToSql(value, type);
+    }
+  }
   getSqlType(dataType, columnInfo) {
     switch (dataType) {
       case "string":
-        return this.types[dataType] + `(${columnInfo?.maxLength})`;
+        return this.types[dataType] + `(${columnInfo?.maxLength ?? 100})`;
       default:
         return super.getSqlType(dataType, columnInfo);
     }
@@ -1500,13 +1492,27 @@ 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 data3 = await this.db.runGetStatement(
+      `SELECT
+				*
+            	FROM information_schema.KEY_COLUMN_USAGE AS info
+                INNER JOIN information_schema.REFERENTIAL_CONSTRAINTS AS constr ON info.CONSTRAINT_NAME = constr.CONSTRAINT_NAME
+			WHERE info.REFERENCED_TABLE_SCHEMA = (SELECT DATABASE()) AND info.TABLE_NAME = '${tableName}';`
+    );
+    const data = await this.db.runGetStatement(
+      `SELECT
+				info.TABLE_NAME, info.COLUMN_NAME, info.REFERENCED_TABLE_NAME, info.REFERENCED_COLUMN_NAME, constr.UPDATE_RULE, constr.DELETE_RULE
+			FROM information_schema.KEY_COLUMN_USAGE AS info INNER JOIN information_schema.REFERENTIAL_CONSTRAINTS AS constr ON info.CONSTRAINT_NAME = constr.CONSTRAINT_NAME
+			WHERE info.REFERENCED_TABLE_SCHEMA = (SELECT DATABASE()) AND info.TABLE_NAME = '${tableName}';`
+    );
     return data.map((entry) => {
       return {
         fromTable: tableName,
         fromColumn: entry["COLUMN_NAME"],
         toTable: entry["REFERENCED_TABLE_NAME"],
-        toColumn: entry["REFERENCED_COLUMN_NAME"]
+        toColumn: entry["REFERENCED_COLUMN_NAME"],
+        onUpdate: entry["UPDATE_RULE"],
+        onDelete: entry["DELETE_RULE"]
       };
     });
   }
@@ -1518,14 +1524,23 @@ var MySqlDialect = class extends DefaultSql {
     const data = await this.db.runGetStatement(`SHOW COLUMNS FROM ${tableName};`);
     const output = {};
     for (const entry of data) {
-      const lengthMatch = entry["Type"].match(/^\w+\((\d+)\)/);
-      output[entry["Field"]] = {
+      const sqlType = entry["Type"].toUpperCase();
+      const info = {
         name: entry["Field"],
-        type: entry["Type"],
-        maxLength: lengthMatch ? parseInt(lengthMatch[1]) ?? 0 : 0,
-        defaultValue: entry["Default"],
+        sqlType,
         isPrimaryKey: entry["Key"] == "PRI"
       };
+      switch (sqlType.substring(0, 4)) {
+        case "TEXT":
+        case "VARC":
+        case "DATE":
+        case "TIME":
+          info.defaultValue = entry["Default"] ? `"${entry["Default"]}"` : this.nullType;
+          break;
+        default:
+          info.defaultValue = entry["Default"] ?? this.nullType;
+      }
+      output[entry["Field"]] = info;
     }
     return output;
   }
@@ -1554,8 +1569,7 @@ async function runMigration(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 dialect.setChanges(migration.fromVersion, dbInstructions.version, migration.changes);
     await db.createBackup?.(`from_${migration.fromVersion}_to_${dbInstructions.version}`);
     await db.runMultipleWriteStatements(migration.changes.up);
   }
@@ -1564,16 +1578,26 @@ async function rollback(db, dbInstructions, toVersion) {
   Logger.setMode(dbInstructions.loggerMode);
   const dialect = getDialect(db, dbInstructions);
   const fromVersion = await dialect.getVersion();
-  const historyManager = new MigrationHistoryManager(dbInstructions.configPath);
   await db.createBackup?.(`from_${fromVersion}_to_${dbInstructions.version}`);
   Logger.log(`Rolling back from ${fromVersion} to ${toVersion}`);
-  for (let i = fromVersion - 1; i >= toVersion; --i) {
-    const upChanges = historyManager.getDownMigration(i);
-    Logger.debug(upChanges);
-    await db.runMultipleWriteStatements(upChanges);
-    dbInstructions.version = i;
+  let version = fromVersion;
+  while (version > toVersion) {
+    const changes = await dialect.getChanges(version);
+    if (!changes) {
+      throw new Error(`No changes found for version ${version}`);
+    } else if (changes.fromVersion == version) {
+      throw new Error(`Saved changes do not change the database version (${version})`);
+    }
+    Logger.debug(changes.down);
+    await db.runMultipleWriteStatements(changes.down);
+    dbInstructions.version = changes.fromVersion;
+    version = changes.fromVersion;
+  }
+  if (version < toVersion) {
+    Logger.warn(`There was no entry for version ${toVersion}. Rolled back to version ${version}`);
   }
-  await dialect.setVersion(toVersion);
+  await dialect.rollbackHistory(version);
+  return version;
 }
 export {
   DataType,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlmorpheus",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "author": "JodliDev",
   "keywords": [],
   "license": "MIT",
@@ -36,6 +36,7 @@
     "vitest": "^3.2.4"
   },
   "dependencies": {
+    "escape-sql-string": "^1.2.2",
     "polyfill-symbol-metadata": "^0.0.2"
   }
 }