velocious 1.0.40 → 1.0.42

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

@@ -26,10 +26,6 @@ export default class VelociousDatabaseDriversMssql extends Base{
     }
   }
 
-  disconnect() {
-    this.connection.end()
-  }
-
   async close() {
     await this.connection.close()
     this.connection = undefined
@@ -50,7 +46,7 @@ export default class VelociousDatabaseDriversMssql extends Base{
   }
 
   createTableSql(tableData) {
-    const createArgs = Object.assign({tableData, driver: this})
+    const createArgs = Object.assign({tableData, driver: this, indexInCreateTable: false})
     const createTable = new CreateTable(createArgs)
 
     return createTable.toSql()
@@ -75,7 +71,7 @@ export default class VelociousDatabaseDriversMssql extends Base{
   primaryKeyType = () => "bigint"
 
   async query(sql) {
-    let result, request
+    let result, request, tries = 0
 
     if (this._currentTransaction) {
       request = new mssql.Request(this._currentTransaction)
@@ -83,11 +79,22 @@ export default class VelociousDatabaseDriversMssql extends Base{
       request = mssql
     }
 
-    try {
-      result = await request.query(sql)
-    } catch (error) {
-      // Re-throw error because the stack-trace is broken and can't be used for app-development.
-      throw new Error(`Query failed '${error.message})': ${sql}`)
+    while (true) {
+      tries++
+
+      try {
+        result = await request.query(sql)
+        break
+      } catch (error) {
+        if (error.message == "No connection is specified for that request." && tries <= 3) {
+          this.logger.log("Reconnecting to database")
+          await this.connect()
+          // Retry
+        } else {
+          // Re-throw error because the stack-trace is broken and can't be used for app-development.
+          throw new Error(`Query failed '${error.message}': ${sql}`)
+        }
+      }
     }
 
     return result.recordsets[0]
@@ -154,12 +161,14 @@ export default class VelociousDatabaseDriversMssql extends Base{
     return tables
   }
 
-  async getTableByName(tableName) {
+  async getTableByName(tableName, args) {
     const result = await this.query(`SELECT [TABLE_NAME] FROM [INFORMATION_SCHEMA].[TABLES] WHERE [TABLE_CATALOG] = DB_NAME() AND [TABLE_SCHEMA] = 'dbo' AND [TABLE_NAME] = ${this.quote(tableName)}`)
 
-    if (!result[0]) throw new Error(`Couldn't find a table by that name: ${tableName}`)
+    if (result[0]) {
+      return new Table(this, result[0])
+    }
 
-    return new Table(this, result[0])
+    if (args?.throwError !== false) throw new Error(`Couldn't find a table by that name: ${tableName}`)
   }
 
   async lastInsertID() {
@@ -184,6 +193,7 @@ export default class VelociousDatabaseDriversMssql extends Base{
     this._currentTransaction = new mssql.Transaction(this.connection)
 
     await this._currentTransaction.begin()
+    this._transactionsCount++
   }
 
   async commitTransaction() {
@@ -191,6 +201,7 @@ export default class VelociousDatabaseDriversMssql extends Base{
 
     await this._currentTransaction.commit()
     this._currentTransaction = null
+    this._transactionsCount--
   }
 
   async rollbackTransaction() {
@@ -199,6 +210,7 @@ export default class VelociousDatabaseDriversMssql extends Base{
     await this._currentTransaction.rollback()
 
     this._currentTransaction = null
+    this._transactionsCount--
   }
 
   async startSavePoint(savePointName) {

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

@@ -1,9 +1,11 @@
+import BaseTable from "../base-table.js"
 import Column from "./column.js"
 import {digg} from "diggerize"
 import ForeignKey from "./foreign-key.js"
 
-export default class VelociousDatabaseDriversMssqlTable {
+export default class VelociousDatabaseDriversMssqlTable extends BaseTable {
   constructor(driver, data) {
+    super()
     this.data = data
     this.driver = driver
   }
@@ -62,4 +64,17 @@ export default class VelociousDatabaseDriversMssqlTable {
   getName() {
     return digg(this.data, "TABLE_NAME")
   }
+
+  async truncate() {
+    try {
+      await this.getDriver().query(`TRUNCATE TABLE ${this.getOptions().quoteTableName(this.getName())}`)
+    } catch (error) {
+      if (error.message.startsWith("Query failed 'Cannot truncate table")) {
+        // Truncate table is really buggy for some reason - fall back to delete all rows instead
+        await this.getDriver().query(`DELETE FROM ${this.getOptions().quoteTableName(this.getName())}`)
+      } else {
+        throw error
+      }
+    }
+  }
 }

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

@@ -1,8 +1,53 @@
-export default class VelociousDatabaseDriversMysqlColumn {
+import BaseColumn from "../base-column.js"
+import ColumnsIndex from "./columns-index.js"
+import {digg} from "diggerize"
+
+export default class VelociousDatabaseDriversMysqlColumn extends BaseColumn {
   constructor(table, data) {
+    super()
     this.data = data
     this.table = table
   }
 
-  getName = () => this.data["Field"]
+  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.table.getName())}
+        AND COLUMN_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.getTable(), indexRow)
+
+      indexes.push(index)
+    }
+
+    return indexes
+  }
+
+  getName = () => digg(this, "data", "Field")
 }

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

@@ -0,0 +1,10 @@
+import BaseColumnsIndex from "../base-columns-index.js"
+import {digg} from "diggerize"
+
+export default class VelociousDatabaseDriversMysqlColumn extends BaseColumnsIndex {
+  constructor(table, data) {
+    super()
+    this.data = data
+    this.table = table
+  }
+}

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

@@ -22,8 +22,9 @@ export default class VelociousDatabaseDriversMysql extends Base{
     this.connection = connection
   }
 
-  disconnect() {
-    this.connection.end()
+  async close() {
+    await this.connection.end()
+    this.connection = undefined
   }
 
   connectArgs() {
@@ -40,11 +41,6 @@ export default class VelociousDatabaseDriversMysql extends Base{
     return connectArgs
   }
 
-  async close() {
-    await this.connection.end()
-    this.connection = undefined
-  }
-
   createDatabaseSql(databaseName, args) {
     const createArgs = Object.assign({databaseName, driver: this}, args)
     const createDatabase = new CreateDatabase(createArgs)
@@ -152,7 +148,8 @@ export default class VelociousDatabaseDriversMysql extends Base{
   }
 
   async startTransaction() {
-    return await this.query("START TRANSACTION")
+    await this.query("START TRANSACTION")
+    this._transactionsCount++
   }
 
   updateSql({conditions, data, tableName}) {

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

@@ -1,8 +1,10 @@
+import BaseTable from "../base-table.js"
 import Column from "./column.js"
 import ForeignKey from "./foreign-key.js"
 
-export default class VelociousDatabaseDriversMysqlTable {
+export default class VelociousDatabaseDriversMysqlTable extends BaseTable {
   constructor(driver, data) {
+    super()
     this.data = data
     this.driver = driver
   }

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

@@ -1,10 +1,45 @@
-export default class VelociousDatabaseDriversPgsqlColumn {
+import BaseColumn from "../base-column.js"
+import ColumnsIndex from "./columns-index.js"
+import {digg} from "diggerize"
+
+export default class VelociousDatabaseDriversPgsqlColumn extends BaseColumn {
   constructor(table, data) {
+    super()
     this.data = data
     this.table = table
   }
 
+  async getIndexes() {
+    const options = this.getOptions()
+
+    const indexesRows = await this.table.getDriver().query(`
+      SELECT
+        pg_attribute.attname AS column_name,
+        pg_index.indexrelid::regclass as index_name,
+        pg_class.relnamespace::regnamespace as schema_name,
+        pg_class.relname as table_name,
+        pg_index.indisprimary as is_primary_key,
+        pg_index.indisunique as is_unique
+      FROM pg_index
+      JOIN pg_class ON pg_class.oid = pg_index.indrelid
+      JOIN pg_attribute ON pg_attribute.attrelid = pg_class.oid AND pg_attribute.attnum = ANY(pg_index.indkey)
+      WHERE
+        pg_attribute.attname = ${options.quote(this.getName())} AND
+        pg_class.relname = ${options.quote(this.getTable().getName())}
+    `)
+
+    const indexes = []
+
+    for (const indexRow of indexesRows) {
+      const columnsIndex = new ColumnsIndex(this.getTable(), indexRow)
+
+      indexes.push(columnsIndex)
+    }
+
+    return indexes
+  }
+
   getName() {
-    return this.data.column_name
+    return digg(this, "data", "column_name")
   }
 }

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

@@ -0,0 +1,4 @@
+import BaseColumnsIndex from "../base-columns-index.js"
+
+export default class VelociousDatabaseDriversPgsqlColumn extends BaseColumnsIndex {
+}

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

@@ -26,8 +26,8 @@ export default class VelociousDatabaseDriversPgsql extends Base{
     this.connection = client
   }
 
-  disconnect() {
-    this.connection.end()
+  async disconnect() {
+    await this.connection.end()
   }
 
   connectArgs() {
@@ -71,11 +71,11 @@ export default class VelociousDatabaseDriversPgsql extends Base{
   }
 
   async disableForeignKeys() {
-    await this.query("SET FOREIGN_KEY_CHECKS = 0")
+    await this.query("SET session_replication_role = 'replica'")
   }
 
   async enableForeignKeys() {
-    await this.query("SET FOREIGN_KEY_CHECKS = 1")
+    await this.query("SET session_replication_role = 'origin'")
   }
 
   dropTableSql(tableName, args = {}) {
@@ -161,7 +161,8 @@ export default class VelociousDatabaseDriversPgsql extends Base{
   }
 
   async startTransaction() {
-    return await this.query("START TRANSACTION")
+    await this.query("START TRANSACTION")
+    this._transactionsCount++
   }
 
   updateSql({conditions, data, tableName}) {

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

@@ -1,8 +1,10 @@
+import BaseTable from "../base-table.js"
 import Column from "./column.js"
 import ForeignKey from "./foreign-key.js"
 
-export default class VelociousDatabaseDriversPgsqlTable {
+export default class VelociousDatabaseDriversPgsqlTable extends BaseTable {
   constructor(driver, data) {
+    super()
     this.data = data
     this.driver = driver
   }

package/src/database/drivers/sqlite/base.js

@@ -54,18 +54,20 @@ export default class VelociousDatabaseDriversSqliteBase extends Base {
   getType = () => "sqlite"
   insertSql = (args) => new Insert(Object.assign({driver: this}, args)).toSql()
 
-  async getTableByName(tableName) {
+  async getTableByName(tableName, args) {
     const result = await this.query(`SELECT name FROM sqlite_master WHERE type = 'table' AND name = ${this.quote(tableName)} LIMIT 1`)
     const row = result[0]
 
-    if (!row) {
+    if (row) {
+      return new Table({driver: this, row})
+    }
+
+    if (args?.throwError !== false) {
       const tables = await this.getTables()
       const tableNames = tables.map((table) => table.getName())
 
       throw new Error(`No table by that name: ${tableName} in ${tableNames.join(", ")}`)
     }
-
-    return new Table({driver: this, row})
   }
 
   async getTables() {

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

@@ -1,7 +1,51 @@
-export default class VelociousDatabaseDriversSqliteColumn {
-  constructor({column, driver}) {
+import BaseColumn from "../base-column.js"
+import ColumnsIndex from "./columns-index.js"
+
+export default class VelociousDatabaseDriversSqliteColumn extends BaseColumn {
+  constructor({column, driver, table}) {
+    super()
     this.column = column
     this.driver = driver
+    this.table = table
+  }
+
+  async getIndexes() {
+    const table = this.getTable()
+    const rows = await this.getDriver().query(`PRAGMA index_list(${this.getOptions().quoteTableName(table.getName())})`)
+    const indexes = []
+
+    for (const row of rows) {
+      const columnsIndex = new ColumnsIndex(table, row)
+      const indexMasterData = await this.getDriver().query(`SELECT * FROM sqlite_master WHERE type = 'index' AND name = ${this.getOptions().quote(columnsIndex.getName())}`)
+
+      columnsIndex.columnNames = this._parseColumnsFromSQL(indexMasterData[0].sql)
+
+      indexes.push(columnsIndex)
+    }
+
+    return indexes
+  }
+
+
+  _parseColumnsFromSQL(sql) {
+    const columnsSQLMatch = sql.match(/\((.+?)\)/)
+    const columnsSQL = columnsSQLMatch[1].split(",")
+    const columnNames = []
+
+    for (const column of columnsSQL) {
+      const matchTicks = column.match(/`(.+)`/)
+      const matchQuotes = column.match(/"(.+)"/)
+
+      if (matchTicks) {
+        columnNames.push(matchTicks[1])
+      } else if (matchQuotes) {
+        columnNames.push(matchQuotes[1])
+      } else{
+        throw new Error(`Couldn't parse column part: ${column}`)
+      }
+    }
+
+    return columnNames
   }
 
   getName() {

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

@@ -0,0 +1,22 @@
+import BaseColumnsIndex from "../base-columns-index.js"
+import {digg} from "diggerize"
+
+export default class VelociousDatabaseDriversSqliteColumn extends BaseColumnsIndex {
+  constructor(table, data) {
+    super()
+    this.data = data
+    this.table = table
+  }
+
+  getName() {
+    return digg(this, "data", "name")
+  }
+
+  isPrimaryKey() {
+    return false
+  }
+
+  isUnique() {
+    return digg(this, "data", "unique") == 1
+  }
+}

package/src/database/drivers/sqlite/connection-sql-js.js

@@ -13,7 +13,7 @@ export default class VelociousDatabaseDriversSqliteConnectionSqlJs {
     this.connection = undefined
   }
 
-  disconnect = () => this.saveDatabase()
+  disconnect = async () => await this.saveDatabase()
 
   async query(sql) {
     const result = await query(this.connection, sql)

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

@@ -1,8 +1,10 @@
+import BaseTable from "../base-table.js"
 import Column from "./column.js"
 import ForeignKey from "./foreign-key.js"
 
-export default class VelociousDatabaseDriversSqliteTable {
+export default class VelociousDatabaseDriversSqliteTable extends BaseTable {
   constructor({driver, row}) {
+    super()
     this.driver = driver
     this.row = row
   }

package/src/database/migrator.js

@@ -44,7 +44,7 @@ export default class VelociousDatabaseMigrator {
   }
 
   async migrateFiles(files, importCallback) {
-    await this.configuration.withConnections(async () => {
+    await this.configuration.ensureConnections(async () => {
       for (const migration of files) {
         await this.runMigrationFile({
           migration,
@@ -90,7 +90,7 @@ export default class VelociousDatabaseMigrator {
       .filter((migration) => Boolean(migration))
       .sort((migration1, migration2) => migration1.date - migration2.date)
 
-    await this.configuration.withConnections(async () => {
+    await this.configuration.ensureConnections(async () => {
       for (const migration of files) {
         await this.runMigrationFile({
           migration,
@@ -120,8 +120,7 @@ export default class VelociousDatabaseMigrator {
   }
 
   async migrationsTableExist(db) {
-    const tables = await db.getTables()
-    const schemaTable = tables.find((table) => table.getName() == "schema_migrations")
+    const schemaTable = await db.getTableByName("schema_migrations", {throwError: false})
 
     if (!schemaTable) return false
 
@@ -166,9 +165,30 @@ export default class VelociousDatabaseMigrator {
       const db = dbs[dbIdentifier]
 
       await db.withDisabledForeignKeys(async () => {
-        for (const table of await db.getTables()) {
-          this.logger.log(`Dropping table ${table.getName()}`)
-          await db.dropTable(table.getName())
+        while (true) {
+          const errors = []
+          let anyTableDropped = false
+
+          try {
+            for (const table of await db.getTables()) {
+              this.logger.log(`Dropping table ${table.getName()}`)
+
+              try {
+                await db.dropTable(table.getName(), {cascade: true})
+                anyTableDropped = true
+              } catch (error) {
+                errors.push(error)
+              }
+            }
+
+            break
+          } catch (error) {
+            if (errors.length > 0 && anyTableDropped) {
+              // Retry
+            } else {
+              throw errors[0]
+            }
+          }
         }
       })
     }

package/src/database/query/create-index-base.js

@@ -17,7 +17,16 @@ export default class VelociousDatabaseQueryCreateIndexBase extends QueryBase {
     for (const columnIndex in this.columns) {
       if (columnIndex > 0) indexName += "_and_"
 
-      indexName += this.columns[columnIndex]
+      const column = this.columns[columnIndex]
+      let columnName
+
+      if (typeof column == "string") {
+        columnName = column
+      } else {
+        columnName = column.getName()
+      }
+
+      indexName += columnName
     }
 
     return indexName

package/src/database/query/create-table-base.js

@@ -1,6 +1,7 @@
 import CreateIndexBase from "./create-index-base.js"
 import * as inflection from "inflection"
 import QueryBase from "./base.js"
+import restArgsError from "../../utils/rest-args-error.js"
 
 export default class VelociousDatabaseQueryCreateTableBase extends QueryBase {
   constructor({driver, ifNotExists, indexInCreateTable = true, tableData}) {
@@ -48,6 +49,9 @@ export default class VelociousDatabaseQueryCreateTableBase extends QueryBase {
 
       if (databaseType == "mssql" && type == "BOOLEAN") {
         type = "BIT"
+      } else if (databaseType == "mssql" && type == "UUID") {
+        type = "VARCHAR"
+        maxlength ||= 36
       }
 
       if (databaseType == "sqlite" && column.getAutoIncrement() && column.getPrimaryKey()) {
@@ -79,7 +83,19 @@ export default class VelociousDatabaseQueryCreateTableBase extends QueryBase {
       }
 
       if (typeof column.getDefault() == "function") {
-        sql += ` DEFAULT (${column.getDefault()()})`
+        const defaultValue = column.getDefault()()
+
+        sql += ` DEFAULT (`
+
+        if (databaseType == "pgsql" && defaultValue == "UUID()") {
+          sql += "gen_random_uuid()"
+        } else if (databaseType == "mssql" && defaultValue == "UUID()") {
+          sql += "NEWID()"
+        } else {
+          sql += defaultValue
+        }
+
+        sql += ")"
       } else if (column.getDefault()) {
         sql += ` DEFAULT ${options.quote(column.getDefault())}`
       }
@@ -125,6 +141,24 @@ export default class VelociousDatabaseQueryCreateTableBase extends QueryBase {
 
         sql += ")"
       }
+
+      for (const column of tableData.getColumns()) {
+        if (!column.getIndex()) continue
+
+        const indexName = `index_on_${column.getName()}`
+
+        sql += ","
+
+        const {unique, ...restIndexArgs} = column.getIndex()
+
+        restArgsError(restIndexArgs)
+
+        if (unique) {
+          sql += " UNIQUE"
+        }
+
+        sql += ` INDEX ${options.quoteIndexName(indexName)} (${options.quoteColumnName(column.getName())})`
+      }
     }
 
     sql += ")"
@@ -147,8 +181,28 @@ export default class VelociousDatabaseQueryCreateTableBase extends QueryBase {
 
         sqls.push(sql)
       }
+
+      for (const column of tableData.getColumns()) {
+        if (!column.getIndex()) continue
+
+        const indexName = `index_on_${column.getName()}`
+        const {unique, ...restIndexArgs} = column.getIndex()
+
+        restArgsError(restIndexArgs)
+
+        const createIndexArgs = {
+          columns: [column.getName()],
+          driver: this.getDriver(),
+          name: indexName,
+          tableName: tableData.getName(),
+          unique
+        }
+        const sql = new CreateIndexBase(createIndexArgs).toSql()
+
+        sqls.push(sql)
+      }
     }
 
-    return [sql]
+    return sqls
   }
 }

package/src/database/query/drop-table-base.js

@@ -1,12 +1,14 @@
+import {digs} from "diggerize"
 import QueryBase from "./base.js"
 import restArgsError from "../../utils/rest-args-error.js"
 
 export default class VelociousDatabaseQueryDropTableBase extends QueryBase {
-  constructor({driver, ifExists, options, tableName, ...restArgs}) {
+  constructor({cascade, driver, ifExists, options, tableName, ...restArgs}) {
     super({driver, options})
 
     restArgsError(restArgs)
 
+    this.cascade = cascade
     this.ifExists = ifExists
     this.tableName = tableName
   }
@@ -14,7 +16,7 @@ export default class VelociousDatabaseQueryDropTableBase extends QueryBase {
   toSql() {
     const databaseType = this.getDatabaseType()
     const options = this.getOptions()
-    const {ifExists, tableName} = this
+    const {cascade, ifExists, tableName} = digs(this, "cascade", "ifExists", "tableName")
     const sqls = []
     let sql = ""
 
@@ -28,6 +30,10 @@ export default class VelociousDatabaseQueryDropTableBase extends QueryBase {
 
     sql += ` ${options.quoteTableName(tableName)}`
 
+    if (cascade && databaseType == "pgsql") {
+      sql += " cascade"
+    }
+
     if (databaseType == "mssql" && ifExists) {
       sql += " END"
     }