velocious 1.0.46 → 1.0.48

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.46",
+  "version": "1.0.48",
   "main": "index.js",
   "scripts": {
     "test": "VELOCIOUS_TEST_DIR=../ cd spec/dummy && npx velocious test",

package/spec/cli/commands/db/migrate-spec.js

@@ -40,15 +40,43 @@ describe("Cli - Commands - db:migrate", () => {
         }
       }
 
-      // It creates unique indexes
+      // It creates the correct index
       const authenticationTokensTable = await dbs.default.getTableByName("authentication_tokens")
-      const tokenColumn = await authenticationTokensTable.getColumnByName("token")
-      const tokenIndex = await tokenColumn.getIndexByName("index_on_token")
+      const indexes = await authenticationTokensTable.getIndexes()
+      const indexesNames = indexes
+        .map((index) => index.getName())
+        .filter((indexName) => indexName != "authentication_tokens_pkey" && indexName != "PRIMARY" && !indexName.startsWith("PK__"))
+        .sort()
+
+      if (defaultDatabaseType == "mysql") {
+        expect(indexesNames).toEqual(["index_on_token","user_id"])
+      } else if (defaultDatabaseType == "sqlite") {
+        expect(indexesNames).toEqual(["index_on_authentication_tokens_token", "index_on_authentication_tokens_user_id"])
+      } else {
+        expect(indexesNames).toEqual(["index_on_token", "index_on_user_id"])
+      }
+
+      // It creates unique indexes
+      let tokenIndexName
+
+      if (defaultDatabaseType == "sqlite") {
+        tokenIndexName = "index_on_authentication_tokens_token"
+      } else {
+        tokenIndexName = "index_on_token"
+      }
 
-      expect(tokenIndex.getName()).toEqual("index_on_token")
+      const tokenColumn = await authenticationTokensTable.getColumnByName("user_token")
+      const tokenIndex = await tokenColumn.getIndexByName(tokenIndexName)
+
+      expect(tokenIndex.getName()).toEqual(tokenIndexName)
       expect(tokenIndex.isPrimaryKey()).toBeFalse()
       expect(tokenIndex.isUnique()).toBeTrue()
 
+      // It creates foreign keys
+      const authTokensTableForeignKeys = await authenticationTokensTable.getForeignKeys()
+
+      expect(authTokensTableForeignKeys.length).toEqual(1)
+
       for (const db of Object.values(dbs)) {
         const schemaMigrations = await db.query("SELECT * FROM schema_migrations ORDER BY version")
 
@@ -64,8 +92,6 @@ describe("Cli - Commands - db:migrate", () => {
       }
     })
 
-
-
     expect(projectForeignKey.getTableName()).toEqual("tasks")
     expect(projectForeignKey.getColumnName()).toEqual("project_id")
     expect(projectForeignKey.getReferencedTableName()).toEqual("projects")
@@ -84,7 +110,16 @@ describe("Cli - Commands - db:migrate", () => {
         ]
       )
 
-      expect(uniqunize(defaultSchemaMigrations.sort())).toEqual(["20230728075328", "20230728075329", "20250605133926", "20250903112845", "20250912183605", "20250912183606"])
+      expect(uniqunize(defaultSchemaMigrations.sort())).toEqual([
+        "20230728075328",
+        "20230728075329",
+        "20250605133926",
+        "20250903112845",
+        "20250912183605",
+        "20250912183606",
+        "20250915085450",
+        "20250916111330"
+      ])
     } else {
       expect(tablesResult.sort()).toEqual(
         [
@@ -99,7 +134,16 @@ describe("Cli - Commands - db:migrate", () => {
         ]
       )
 
-      expect(defaultSchemaMigrations.sort()).toEqual(["20230728075328", "20230728075329", "20250605133926", "20250903112845", "20250912183605", "20250912183606"])
+      expect(defaultSchemaMigrations.sort()).toEqual([
+        "20230728075328",
+        "20230728075329",
+        "20250605133926",
+        "20250903112845",
+        "20250912183605",
+        "20250912183606",
+        "20250915085450",
+        "20250916111330"
+      ])
     }
   })
 })

package/spec/dummy/src/database/migrations/20250915085450-change-authentication-tokens-user-id-nullable.js

@@ -0,0 +1,11 @@
+import Migration from "../../../../../src/database/migration/index.js"
+
+export default class ChangeAuthenticationTokensUserIdNullable extends Migration {
+  async up() {
+    await this.changeColumnNull("authentication_tokens", "user_id", true)
+  }
+
+  async down() {
+    await this.changeColumnNull("authentication_tokens", "user_id", false)
+  }
+}

package/spec/dummy/src/database/migrations/20250916111330-rename_authentication_tokens_token_to_user_token.js

@@ -0,0 +1,11 @@
+import Migration from "../../../../../src/database/migration/index.js"
+
+export default class RenameAuthenticationTokensTokenToUserToken extends Migration {
+  async up() {
+    await this.renameColumn("authentication_tokens", "token", "user_token")
+  }
+
+  async down() {
+    await this.renameColumn("authentication_tokens", "user_token", "token")
+  }
+}

package/src/database/drivers/base-column.js

@@ -1,3 +1,6 @@
+import TableColumn from "../table-data/table-column.js"
+import TableData from "../table-data/index.js"
+
 export default class VelociousDatabaseDriversBaseColumn {
   async getIndexByName(indexName) {
     const indexes = await this.getIndexes()
@@ -6,6 +9,21 @@ export default class VelociousDatabaseDriversBaseColumn {
     return index
   }
 
+  async changeNullable(nullable) {
+    const tableData = new TableData(this.getTable().getName())
+    const column = this.getTableDataColumn()
+
+    column.setNull(nullable)
+
+    tableData.addColumn(column)
+
+    const sqls = await this.getDriver().alterTableSql(tableData)
+
+    for (const sql of sqls) {
+      await this.getDriver().query(sql)
+    }
+  }
+
   getDriver() {
     return this.getTable().getDriver()
   }
@@ -19,4 +37,14 @@ export default class VelociousDatabaseDriversBaseColumn {
 
     return this.table
   }
+
+  getTableDataColumn() {
+    return new TableColumn(this.getName(), {
+      default: this.getDefault(),
+      isNewColumn: false,
+      maxLength: this.getMaxLength(),
+      null: this.getNull(),
+      type: this.getType()
+    })
+  }
 }

package/src/database/drivers/base-foreign-key.js

@@ -0,0 +1,31 @@
+import TableForeignKey from "../table-data/table-foreign-key.js"
+
+export default class VelociousDatabaseDriversBaseForeignKey {
+  constructor(data) {
+    this.data = data
+  }
+
+  getDriver() {
+    return this.getTable().getDriver()
+  }
+
+  getOptions() {
+    return this.getDriver().options()
+  }
+
+  getTable() {
+    if (!this.table) throw new Error("No table set on column")
+
+    return this.table
+  }
+
+  getTableDataForeignKey() {
+    return new TableForeignKey({
+      columnName: this.getColumnName(),
+      name: this.getName(),
+      tableName: this.getTableName(),
+      referencedColumnName: this.getReferencedColumnName(),
+      referencedTableName: this.getReferencedTableName()
+    })
+  }
+}

package/src/database/drivers/base-table.js

@@ -1,4 +1,5 @@
 import {digg} from "diggerize"
+import TableData from "../table-data/index.js"
 
 export default class VelociousDatabaseDriversBaseTable {
   async getColumnByName(columnName) {
@@ -18,6 +19,34 @@ export default class VelociousDatabaseDriversBaseTable {
     return this.getDriver().options()
   }
 
+  async getTableData() {
+    const tableData = new TableData(this.getName())
+    const tableDataColumns = []
+
+    for (const column of await this.getColumns()) {
+      const tableDataColumn = column.getTableDataColumn()
+
+      tableData.addColumn(tableDataColumn)
+      tableDataColumns.push(tableDataColumn)
+    }
+
+    for (const foreignKey of await this.getForeignKeys()) {
+      tableData.addForeignKey(foreignKey.getTableDataForeignKey())
+
+      const tableDataColumn = tableDataColumns.find((tableDataColumn) => tableDataColumn.getName() == foreignKey.getColumnName())
+
+      if (!tableDataColumn) throw new Error(`Couldn't find table data column for foreign key: ${foreignKey.getColumnName()}`)
+
+      tableDataColumn.setForeignKey(foreignKey)
+    }
+
+    for (const index of await this.getIndexes()) {
+      tableData.addIndex(index.getTableDataIndex())
+    }
+
+    return tableData
+  }
+
   async rowsCount() {
     const result = await this.getDriver().query(`SELECT COUNT(*) AS count FROM ${this.getOptions().quoteTableName(this.getName())}`)
 

package/src/database/drivers/base.js

@@ -3,6 +3,8 @@ import Query from "../query/index.js"
 import Handler from "../handler.js"
 import strftime from "strftime"
 import UUID from "pure-uuid"
+import TableData from "../table-data/index.js"
+import TableColumn from "../table-data/table-column.js"
 
 export default class VelociousDatabaseDriversBase {
   constructor(config, configuration) {
@@ -42,7 +44,7 @@ export default class VelociousDatabaseDriversBase {
     if (!this.configuration) throw new Error("No configuration set")
 
     return this.configuration
-}
+  }
 
   getIdSeq() {
     return this.idSeq
@@ -203,6 +205,22 @@ export default class VelociousDatabaseDriversBase {
     await this.query(`SAVEPOINT ${savePointName}`)
   }
 
+  async renameColumn(tableName, oldColumnName, newColumnName) {
+    const tableColumn = new TableColumn(oldColumnName)
+
+    tableColumn.setNewName(newColumnName)
+
+    const tableData = new TableData(tableName)
+
+    tableData.addColumn(tableColumn)
+
+    const alterTableSQLs = await this.alterTableSql(tableData)
+
+    for (const alterTableSQL of alterTableSQLs) {
+      await this.query(alterTableSQL)
+    }
+  }
+
   async releaseSavePoint(savePointName) {
     await this.query(`RELEASE SAVEPOINT ${savePointName}`)
   }

package/src/database/drivers/mssql/column.js

@@ -45,7 +45,29 @@ export default class VelociousDatabaseDriversMssqlColumn extends BaseColumn {
     return indexes
   }
 
+  getDefault() {
+    return digg(this, "data", "COLUMN_DEFAULT")
+  }
+
+  getMaxLength() {
+    return digg(this, "data", "CHARACTER_MAXIMUM_LENGTH")
+  }
+
   getName() {
     return digg(this, "data", "COLUMN_NAME")
   }
+
+  getNull() {
+    const nullValue = digg(this, "data", "IS_NULLABLE")
+
+    if (nullValue == "NO") {
+      return false
+    } else {
+      return true
+    }
+  }
+
+  getType() {
+    return digg(this, "data", "DATA_TYPE")
+  }
 }

package/src/database/drivers/mssql/columns-index.js

@@ -1,6 +1,6 @@
 import BaseColumnsIndex from "../base-columns-index.js"
 
-export default class VelociousDatabaseDriversMssqlColumn extends BaseColumnsIndex {
+export default class VelociousDatabaseDriversMssqlColumnsIndex extends BaseColumnsIndex {
   constructor(table, data) {
     super()
     this.data = data

package/src/database/drivers/mssql/foreign-key.js

@@ -1,10 +1,7 @@
+import BaseForeignKey from "../base-foreign-key.js"
 import {digg} from "diggerize"
 
-export default class VelociousDatabaseDriversMssqlForeignKey {
-  constructor(data) {
-    this.data = data
-  }
-
+export default class VelociousDatabaseDriversMssqlForeignKey extends BaseForeignKey {
   getColumnName = () => digg(this, "data", "ParentColumn")
   getName = () => digg(this, "data", "CONSTRAINT_NAME")
   getTableName = () => digg(this, "data", "TableName")

package/src/database/drivers/mssql/index.js

@@ -1,3 +1,4 @@
+import AlterTable from "./sql/alter-table.js"
 import Base from "../base.js"
 import CreateDatabase from "./sql/create-database.js"
 import CreateIndex from "./sql/create-index.js"
@@ -32,6 +33,13 @@ export default class VelociousDatabaseDriversMssql extends Base{
     this.connection = undefined
   }
 
+  async alterTableSql(tableData) {
+    const alterArgs = {tableData, driver: this}
+    const alterTable = new AlterTable(alterArgs)
+
+    return await alterTable.toSqls()
+  }
+
   createDatabaseSql(databaseName, args) {
     const createArgs = Object.assign({databaseName, driver: this}, args)
     const createDatabase = new CreateDatabase(createArgs)
@@ -47,7 +55,7 @@ export default class VelociousDatabaseDriversMssql extends Base{
   }
 
   createTableSql(tableData) {
-    const createArgs = Object.assign({tableData, driver: this, indexInCreateTable: false})
+    const createArgs = {tableData, driver: this, indexInCreateTable: false}
     const createTable = new CreateTable(createArgs)
 
     return createTable.toSql()
@@ -111,9 +119,7 @@ export default class VelociousDatabaseDriversMssql extends Base{
     return new QueryParser({query}).toSql()
   }
 
-  shouldSetAutoIncrementWhenPrimaryKey = () => true
-
-
+  shouldSetAutoIncrementWhenPrimaryKey() { return true }
 
   escape(value) {
     value = this._convertValue(value)
@@ -139,8 +145,12 @@ export default class VelociousDatabaseDriversMssql extends Base{
     return escapeString(value)
   }
 
-  quoteColumn = (string) => this.options().quoteColumnName(string)
-  quoteTable = (string) => this.options().quoteTableName(string)
+  quoteColumn(string) { return this.options().quoteColumnName(string) }
+  quoteTable(string) { return this.options().quoteTableName(string) }
+
+  async renameColumn(tableName, oldColumnName, newColumnName) {
+    await this.query(`EXEC sp_rename ${this.quote(`${tableName}.${oldColumnName}`)}, ${this.quote(newColumnName)}, 'COLUMN'`)
+  }
 
   deleteSql({tableName, conditions}) {
     const deleteInstruction = new Delete({conditions, driver: this, tableName})

package/src/database/drivers/mssql/sql/alter-table.js

@@ -0,0 +1,4 @@
+import AlterTableBase from "../../../query/alter-table-base.js"
+
+export default class VelociousDatabaseConnectionDriversMssqlSqlAlterTable extends AlterTableBase {
+}

package/src/database/drivers/mssql/table.js

@@ -1,5 +1,6 @@
 import BaseTable from "../base-table.js"
 import Column from "./column.js"
+import ColumnsIndex from "./columns-index.js"
 import {digg} from "diggerize"
 import ForeignKey from "./foreign-key.js"
 
@@ -11,7 +12,7 @@ export default class VelociousDatabaseDriversMssqlTable extends BaseTable {
   }
 
   async getColumns() {
-    const result = await this.driver.query(`SELECT [COLUMN_NAME] FROM [INFORMATION_SCHEMA].[COLUMNS] WHERE [TABLE_NAME] = ${this.driver.quote(this.getName())}`)
+    const result = await this.driver.query(`SELECT * FROM [INFORMATION_SCHEMA].[COLUMNS] WHERE [TABLE_NAME] = ${this.driver.quote(this.getName())}`)
     const columns = []
 
     for (const data of result) {
@@ -61,6 +62,41 @@ export default class VelociousDatabaseDriversMssqlTable extends BaseTable {
     return foreignKeys
   }
 
+  async getIndexes() {
+    const options = this.getOptions()
+    const sql = `
+      SELECT
+        sys.tables.name AS TableName,
+        sys.columns.name AS ColumnName,
+        sys.indexes.name AS index_name,
+        sys.indexes.type_desc AS IndexType,
+        sys.index_columns.is_included_column AS IsIncludedColumn,
+        sys.indexes.is_unique,
+        sys.indexes.is_primary_key,
+        sys.indexes.is_unique_constraint
+      FROM sys.indexes
+      INNER JOIN sys.index_columns ON sys.indexes.object_id = sys.index_columns.object_id AND sys.indexes.index_id = sys.index_columns.index_id
+      INNER JOIN sys.columns ON sys.index_columns.object_id = sys.columns.object_id AND sys.index_columns.column_id = sys.columns.column_id
+      INNER JOIN sys.tables ON sys.indexes.object_id = sys.tables.object_id
+      WHERE
+        sys.tables.name = ${options.quote(this.getName())}
+      ORDER BY
+        sys.indexes.name,
+        sys.index_columns.key_ordinal
+    `
+
+    const rows = await this.getDriver().query(sql)
+    const indexes = []
+
+    for (const row of rows) {
+      const index = new ColumnsIndex(this, row)
+
+      indexes.push(index)
+    }
+
+    return indexes
+  }
+
   getName() {
     return digg(this.data, "TABLE_NAME")
   }

package/src/database/drivers/mysql/column.js

@@ -21,9 +21,10 @@ export default class VelociousDatabaseDriversMysqlColumn extends BaseColumn {
         NON_UNIQUE,
         INDEX_TYPE
       FROM INFORMATION_SCHEMA.STATISTICS
-      WHERE TABLE_SCHEMA = DATABASE()
-        AND TABLE_NAME = ${options.quote(this.table.getName())}
-        AND COLUMN_NAME = ${options.quote(this.getName())}
+      WHERE
+        TABLE_SCHEMA = DATABASE() AND
+        TABLE_NAME = ${options.quote(this.table.getName())} AND
+        COLUMN_NAME = ${options.quote(this.getName())}
     `
     const indexesRows = await this.getDriver().query(sql)
     const indexes = []
@@ -49,5 +50,38 @@ export default class VelociousDatabaseDriversMysqlColumn extends BaseColumn {
     return indexes
   }
 
-  getName = () => digg(this, "data", "Field")
+  getDefault() { return digg(this, "data", "Default") }
+
+  getMaxLength() {
+    const type = digg(this, "data", "Type")
+    const match = type.match(/\((\d+)\)$/)
+
+    if (match) {
+      const maxLength = parseInt(match[1])
+
+      return maxLength
+    }
+  }
+
+  getName() { return digg(this, "data", "Field") }
+
+  getNull() {
+    const nullValue = digg(this, "data", "Null")
+
+    if (nullValue == "NO") {
+      return false
+    } else if (nullValue == "YES") {
+      return true
+    } else {
+      throw new Error(`Unknown null value: ${nullValue}`)
+    }
+  }
+
+  getType() {
+    const type = digg(this, "data", "Type")
+    const match = type.match(/^(.+)\((\d+)\)$/)
+    const columnType = match[1]
+
+    return columnType
+  }
 }

package/src/database/drivers/mysql/foreign-key.js

@@ -1,10 +1,7 @@
+import BaseForeignKey from "../base-foreign-key.js"
 import {digg} from "diggerize"
 
-export default class VelociousDatabaseDriversMysqlForeignKey {
-  constructor(data) {
-    this.data = data
-  }
-
+export default class VelociousDatabaseDriversMysqlForeignKey extends BaseForeignKey {
   getColumnName = () => digg(this, "data", "COLUMN_NAME")
   getName = () => digg(this, "data", "CONSTRAINT_NAME")
   getTableName = () => digg(this, "data", "TABLE_NAME")

package/src/database/drivers/mysql/index.js

@@ -1,3 +1,4 @@
+import AlterTable from "./sql/alter-table.js"
 import Base from "../base.js"
 import connectConnection from "./connect-connection.js"
 import CreateDatabase from "./sql/create-database.js"
@@ -41,6 +42,13 @@ export default class VelociousDatabaseDriversMysql extends Base{
     return connectArgs
   }
 
+  async alterTableSql(tableData) {
+    const alterArgs = {tableData, driver: this}
+    const alterTable = new AlterTable(alterArgs)
+
+    return await alterTable.toSqls()
+  }
+
   createDatabaseSql(databaseName, args) {
     const createArgs = Object.assign({databaseName, driver: this}, args)
     const createDatabase = new CreateDatabase(createArgs)
@@ -56,7 +64,7 @@ export default class VelociousDatabaseDriversMysql extends Base{
   }
 
   createTableSql(tableData) {
-    const createArgs = Object.assign({tableData, driver: this})
+    const createArgs = {tableData, driver: this}
     const createTable = new CreateTable(createArgs)
 
     return createTable.toSql()

package/src/database/drivers/mysql/sql/alter-table.js

@@ -0,0 +1,4 @@
+import AlterTableBase from "../../../query/alter-table-base.js"
+
+export default class VelociousDatabaseConnectionDriversMysqlSqlAlterTable extends AlterTableBase {
+}

package/src/database/drivers/mysql/table.js

@@ -1,5 +1,6 @@
 import BaseTable from "../base-table.js"
 import Column from "./column.js"
+import ColumnsIndex from "./columns-index.js"
 import ForeignKey from "./foreign-key.js"
 
 export default class VelociousDatabaseDriversMysqlTable extends BaseTable {
@@ -43,6 +44,46 @@ export default class VelociousDatabaseDriversMysqlTable extends BaseTable {
     return foreignKeys
   }
 
+  async getIndexes() {
+    const options = this.getOptions()
+    const sql = `
+      SELECT
+        TABLE_SCHEMA,
+        TABLE_NAME,
+        INDEX_NAME AS index_name,
+        COLUMN_NAME,
+        SEQ_IN_INDEX,
+        NON_UNIQUE,
+        INDEX_TYPE
+      FROM INFORMATION_SCHEMA.STATISTICS
+      WHERE
+        TABLE_SCHEMA = DATABASE() AND
+        TABLE_NAME = ${options.quote(this.getName())}
+    `
+    const indexesRows = await this.getDriver().query(sql)
+    const indexes = []
+
+    for (const indexRow of indexesRows) {
+      if (indexRow.NON_UNIQUE == 1) {
+        indexRow.is_unique = false
+      } else {
+        indexRow.is_unique = true
+      }
+
+      if (indexRow.index_name == "PRIMARY") {
+        indexRow.is_primary_key = true
+      } else {
+        indexRow.is_primary_key = false
+      }
+
+      const index = new ColumnsIndex(this, indexRow)
+
+      indexes.push(index)
+    }
+
+    return indexes
+  }
+
   getName() {
     return Object.values(this.data)[0]
   }

package/src/database/drivers/pgsql/column.js

@@ -39,7 +39,29 @@ export default class VelociousDatabaseDriversPgsqlColumn extends BaseColumn {
     return indexes
   }
 
+  getDefault() {
+    return digg(this, "data", "column_default")
+  }
+
+  getMaxLength() {
+    return digg(this, "data", "character_maximum_length")
+  }
+
   getName() {
     return digg(this, "data", "column_name")
   }
+
+  getNull() {
+    const nullValue = digg(this, "data", "is_nullable")
+
+    if (nullValue == "NO") {
+      return false
+    } else {
+      return true
+    }
+  }
+
+  getType() {
+    return digg(this, "data", "data_type")
+  }
 }

package/src/database/drivers/pgsql/foreign-key.js

@@ -1,10 +1,7 @@
+import BaseForeignKey from "../base-foreign-key.js"
 import {digg} from "diggerize"
 
-export default class VelociousDatabaseDriversPgsqlForeignKey {
-  constructor(data) {
-    this.data = data
-  }
-
+export default class VelociousDatabaseDriversPgsqlForeignKey extends BaseForeignKey {
   getColumnName = () => digg(this, "data", "column_name")
   getName = () => digg(this, "data", "constraint_name")
   getTableName = () => digg(this, "data", "table_name")