velocious 1.0.48 → 1.0.49

package/package.json

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

package/spec/database/drivers/columns-spec.js

@@ -0,0 +1,27 @@
+import dummyConfiguration from "../../dummy/src/config/configuration.js"
+
+describe("database - drivers - columns", () => {
+  it("runs migrations", {databaseCleaning: {transaction: false}}, async () => {
+    await dummyConfiguration.ensureConnections(async (dbs) => {
+      // Authentication tokens table is important because it will be totally re-created in SQLite because the renaming of the token column to user-column
+      const authenticationTokensTable = await dbs.default.getTableByName("authentication_tokens")
+      const authenticationTokensIDColumn = await authenticationTokensTable.getColumnByName("id")
+
+      expect(authenticationTokensIDColumn.getAutoIncrement()).toBeTrue()
+      expect(authenticationTokensIDColumn.getPrimaryKey()).toBeTrue()
+      expect(authenticationTokensIDColumn.getNull()).toBeFalse()
+
+      const projectsTable = await dbs.default.getTableByName("projects")
+      const projectsCreatedAtColumn = await projectsTable.getColumnByName("created_at")
+      const projectsIDColumn = await projectsTable.getColumnByName("id")
+
+      expect(projectsIDColumn.getAutoIncrement()).toBeTrue()
+      expect(projectsIDColumn.getPrimaryKey()).toBeTrue()
+      expect(projectsIDColumn.getNull()).toBeFalse()
+
+      expect(projectsCreatedAtColumn.getAutoIncrement()).toBeFalse()
+      expect(projectsCreatedAtColumn.getPrimaryKey()).toBeFalse()
+      expect(projectsCreatedAtColumn.getNull()).toBeTrue()
+    })
+  })
+})

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

@@ -40,10 +40,12 @@ export default class VelociousDatabaseDriversBaseColumn {
 
   getTableDataColumn() {
     return new TableColumn(this.getName(), {
+      autoIncrement: this.getAutoIncrement(),
       default: this.getDefault(),
       isNewColumn: false,
       maxLength: this.getMaxLength(),
       null: this.getNull(),
+      primaryKey: this.getPrimaryKey(),
       type: this.getType()
     })
   }

package/src/database/drivers/base.js

@@ -5,6 +5,7 @@ import strftime from "strftime"
 import UUID from "pure-uuid"
 import TableData from "../table-data/index.js"
 import TableColumn from "../table-data/table-column.js"
+import TableForeignKey from "../table-data/table-foreign-key.js"
 
 export default class VelociousDatabaseDriversBase {
   constructor(config, configuration) {
@@ -14,6 +15,30 @@ export default class VelociousDatabaseDriversBase {
     this._transactionsCount = 0
   }
 
+  async addForeignKey(tableName, columnName, referencedTableName, referencedColumnName, args) {
+    console.log("ADD FOREIGN KEY")
+
+    const tableForeignKeyArgs = Object.assign(
+      {
+        columnName,
+        tableName,
+        referencedColumnName,
+        referencedTableName
+      },
+      args
+    )
+    const tableForeignKey = new TableForeignKey(tableForeignKeyArgs)
+    const tableData = new TableData(tableName)
+
+    tableData.addForeignKey(tableForeignKey)
+
+    const alterTableSQLs = await this.alterTableSql(tableData)
+
+    for (const alterTableSQL of alterTableSQLs) {
+      await this.query(alterTableSQL)
+    }
+  }
+
   async createTable(...args) {
     const sqls = this.createTableSql(...args)
 

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

@@ -9,6 +9,8 @@ export default class VelociousDatabaseDriversMssqlColumn extends BaseColumn {
     this.table = table
   }
 
+  getAutoIncrement() { return digg(this, "data", "isIdentity") === 1 }
+
   async getIndexes() {
     const options = this.getOptions()
     const sql = `
@@ -45,17 +47,9 @@ 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")
-  }
+  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")
@@ -67,7 +61,6 @@ export default class VelociousDatabaseDriversMssqlColumn extends BaseColumn {
     }
   }
 
-  getType() {
-    return digg(this, "data", "DATA_TYPE")
-  }
+  getPrimaryKey() { return digg(this, "data", "isIdentity") === 1 }
+  getType() { return digg(this, "data", "DATA_TYPE") }
 }

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

@@ -12,7 +12,13 @@ export default class VelociousDatabaseDriversMssqlTable extends BaseTable {
   }
 
   async getColumns() {
-    const result = await this.driver.query(`SELECT * FROM [INFORMATION_SCHEMA].[COLUMNS] WHERE [TABLE_NAME] = ${this.driver.quote(this.getName())}`)
+    const result = await this.driver.query(`
+      SELECT
+        *,
+        COLUMNPROPERTY(object_id(TABLE_SCHEMA + '.' + TABLE_NAME), COLUMN_NAME, 'IsIdentity') AS isIdentity
+      FROM [INFORMATION_SCHEMA].[COLUMNS]
+      WHERE [TABLE_NAME] = ${this.driver.quote(this.getName())}
+    `)
     const columns = []
 
     for (const data of result) {

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

@@ -9,6 +9,8 @@ export default class VelociousDatabaseDriversMysqlColumn extends BaseColumn {
     this.table = table
   }
 
+  getAutoIncrement() { return digg(this, "data", "Extra").includes("auto_increment") }
+
   async getIndexes() {
     const options = this.getOptions()
     const sql = `
@@ -77,6 +79,8 @@ export default class VelociousDatabaseDriversMysqlColumn extends BaseColumn {
     }
   }
 
+  getPrimaryKey() { return digg(this, "data", "Key") == "PRI" }
+
   getType() {
     const type = digg(this, "data", "Type")
     const match = type.match(/^(.+)\((\d+)\)$/)

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

@@ -9,6 +9,14 @@ export default class VelociousDatabaseDriversPgsqlColumn extends BaseColumn {
     this.table = table
   }
 
+  getAutoIncrement() {
+    return this.getDefault() == `nextval('${this.getTable().getName()}_${this.getName()}_seq'::regclass)`
+  }
+
+  getPrimaryKey() {
+    return digg(this, "data", "is_primary_key") === 1
+  }
+
   async getIndexes() {
     const options = this.getOptions()
 

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

@@ -11,7 +11,30 @@ export default class VelociousDatabaseDriversPgsqlTable extends BaseTable {
   }
 
   async getColumns() {
-    const result = await this.driver.query(`SELECT * FROM information_schema.columns WHERE table_catalog = CURRENT_DATABASE() AND table_schema = 'public' AND table_name = '${this.getName()}'`)
+    const result = await this.driver.query(`
+      SELECT
+        columns.*,
+        CASE WHEN key_column_usage.column_name IS NOT NULL THEN 1 ELSE 0 END AS is_primary_key
+
+      FROM
+        information_schema.columns AS columns
+
+      LEFT JOIN information_schema.table_constraints AS table_constraints ON
+        table_constraints.table_name = columns.table_name AND
+        table_constraints.table_schema = columns.table_schema AND
+        table_constraints.constraint_type = 'PRIMARY KEY'
+
+      LEFT JOIN information_schema.key_column_usage AS key_column_usage ON
+        key_column_usage.constraint_name = table_constraints.constraint_name AND
+        key_column_usage.table_schema = table_constraints.table_schema AND
+        key_column_usage.table_name = columns.table_name AND
+        key_column_usage.column_name = columns.column_name
+
+      WHERE
+        columns.table_catalog = CURRENT_DATABASE() AND
+        columns.table_schema = 'public' AND
+        columns.table_name = '${this.getName()}'
+    `)
     const columns = []
 
     for (const data of result) {

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

@@ -9,6 +9,8 @@ export default class VelociousDatabaseDriversSqliteColumn extends BaseColumn {
     this.table = table
   }
 
+  getAutoIncrement() { return this.getPrimaryKey() }
+
   async getIndexes() {
     const indexes = await this.getTable().getIndexes()
     const indexesForColumn = indexes.filter((index) => index.getColumnNames().includes(this.getName()))
@@ -16,9 +18,7 @@ export default class VelociousDatabaseDriversSqliteColumn extends BaseColumn {
     return indexesForColumn
   }
 
-  getDefault() {
-    return digg(this, "column", "dflt_value")
-  }
+  getDefault() { return digg(this, "column", "dflt_value") }
 
   getName() {
     const name = digg(this, "column", "name")
@@ -47,6 +47,8 @@ export default class VelociousDatabaseDriversSqliteColumn extends BaseColumn {
     }
   }
 
+  getPrimaryKey() { return digg(this, "column", "pk") == 1 }
+
   getType() {
     const columnType = digg(this, "column", "type")
     const match = columnType.match(/(.*)\((\d+)\)$/)

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

@@ -35,6 +35,8 @@ export default class VelociousDatabaseDriversSqliteNode extends Base {
   }
 
   async query(sql) {
+    console.error("SQL: ", sql)
+
     return await query(this.connection, sql)
   }
 }

package/src/database/drivers/sqlite/index.native.js

@@ -56,7 +56,9 @@ export default class VelociousDatabaseDriversSqliteNative extends Base {
     this.connection = undefined
   }
 
-  query = async (sql) => {
+  async query(sql) {
+    console.error("Native SQL: ", sql)
+
     if (!this.connection) throw new Error("Not connected yet")
 
     return await query(this.connection, sql)

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

@@ -89,6 +89,8 @@ export default class VelociousDatabaseConnectionDriversSqliteSqlAlterTable exten
     }
 
     for (const foreignKey of tableData.getForeignKeys()) {
+      console.log(`Foreign key`, {foreignKey})
+
       if (foundForeignKeys.includes(foreignKey.getName())) continue
 
       // Register foreign key on the table
@@ -100,7 +102,7 @@ export default class VelociousDatabaseConnectionDriversSqliteSqlAlterTable exten
       if (!tableDataColumn) throw new Error(`Couldn't find column for foreign key: ${actualTableDataForeignKey.getName()}`)
 
       this.logger.debug(() => [`Setting foreign key on column ${tableDataColumn.getName()}`])
-      tableDataColumn.setForeignKey(actualTableDataForeignKey)
+      tableDataColumn.setForeignKey(foreignKey)
     }
 
     const createNewTableSQL = this.getDriver().createTableSql(newTableData)

package/src/database/migration/index.js

@@ -61,14 +61,17 @@ export default class VelociousDatabaseMigration {
     const tableNameUnderscore = inflection.underscore(tableName)
     const columnName = `${referenceNameUnderscore}_id`
     const foreignKeyName = `fk_${tableName}_${referenceName}`
-    let sql = ""
 
-    sql += `ALTER TABLE ${this._db.quoteTable(tableName)}`
-    sql += ` ADD CONSTRAINT ${foreignKeyName} `
-    sql += ` FOREIGN KEY (${this._db.quoteColumn(columnName)})`
-    sql += ` REFERENCES ${tableNameUnderscore}(id)`
-
-    await this.getDriver().query(sql)
+    await this.getDriver().addForeignKey(
+      tableName,
+      columnName,
+      tableNameUnderscore,
+      "id",
+      {
+        isNewForeignKey: true,
+        name: foreignKeyName
+      }
+    )
   }
 
   async addReference(tableName, referenceName, args) {

package/src/database/table-data/table-column.js

@@ -134,7 +134,7 @@ export default class TableColumn {
         foreignKeyColumn = foreignKey.getReferencedColumnName()
         foreignKeyTable = foreignKey.getReferencedTableName()
       } else {
-        throw new Error(`Unknown foreign key type given: ${this.getForeignKey()} (${typeof this.getForeignKey()})`)
+        throw new Error(`Unknown foreign key type given: ${foreignKey} (${typeof foreignKey})`)
       }
 
       sql += ` REFERENCES ${options.quoteTableName(foreignKeyTable)}(${options.quoteColumnName(foreignKeyColumn)})`

package/src/database/table-data/table-foreign-key.js

@@ -1,10 +1,11 @@
 import restArgsError from "../../utils/rest-args-error.js"
 
 export default class TableForeignKey {
-  constructor({columnName, name, tableName, referencedColumnName, referencedTableName, ...restArgs}) {
+  constructor({columnName, isNewForeignKey, name, tableName, referencedColumnName, referencedTableName, ...restArgs}) {
     restArgsError(restArgs)
 
     this._columnName = columnName
+    this._isNewForeignKey = isNewForeignKey
     this._name = name
     this._tableName = tableName
     this._referencedColumnName = referencedColumnName
@@ -12,6 +13,7 @@ export default class TableForeignKey {
   }
 
   getColumnName() { return this._columnName }
+  getIsNewForeignKey() { return this._isNewForeignKey }
   getTableName() { return this._tableName }
   getReferencedColumnName() { return this._referencedColumnName }
   getReferencedTableName() { return this._referencedTableName }