velocious 1.0.7 → 1.0.9

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "main": "index.js",
   "scripts": {
     "test": "jasmine",

package/src/configuration-resolver.js

@@ -15,7 +15,9 @@ const configurationResolver = async (args) => {
     configuration = configurationImport.default
   } catch (error) {
     // This might happen during an "init" CLI command where we copy a sample configuration file.
-    if (error.code != "ERR_MODULE_NOT_FOUND") throw error
+    if (!error.message.match(/^Cannot find module '(.+)\/configuration\.js'/)) {
+      throw error
+    }
 
     configuration = new Configuration(args)
   }

package/src/database/drivers/base.js

@@ -69,6 +69,15 @@ export default class VelociousDatabaseDriversBase {
     this.idSeq = id
   }
 
+  async tableExists(tableName) {
+    const tables = await this.getTables()
+    const table = tables.find((table) => table.getName() == tableName)
+
+    if (table) return true
+
+    return false
+  }
+
   async update(...args) {
     const sql = this.updateSql(...args)
 

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

@@ -1,5 +1,6 @@
 import {digg} from "diggerize"
 
+import AlterTable from "../sqlite/sql/alter-table.js"
 import Base from "../base.js"
 import CreateIndex from "../sqlite/sql/create-index.js"
 import CreateTable from "../sqlite/sql/create-table.js"
@@ -12,6 +13,13 @@ import Table from "./table"
 import Update from "../sqlite/sql/update.js"
 
 export default class VelociousDatabaseDriversSqliteBase extends Base {
+  alterTableSql(columnData) {
+    const createArgs = Object.assign({driver: this}, columnData)
+    const alterTable = new AlterTable(createArgs)
+
+    return alterTable.toSqls()
+  }
+
   createIndexSql(indexData) {
     const createArgs = Object.assign({driver: this}, indexData)
     const createIndex = new CreateIndex(createArgs)

package/src/database/drivers/sqlite/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/migrate-from-require-context.js

@@ -5,12 +5,11 @@ import Migrator from "./migrator"
 export default class VelociousDatabaseMigrateFromRequireContext {
   constructor(configuration) {
     this.configuration = configuration || Configuration.current()
+    this.migrator = new Migrator({configuration: this.configuration})
   }
 
   async execute(requireContext) {
-    const migrator = new Migrator({configuration: this.configuration})
-
-    await migrator.prepare()
+    await this.migrator.prepare()
 
     const files = requireContext.keys()
       .map((file) => {
@@ -20,7 +19,7 @@ export default class VelociousDatabaseMigrateFromRequireContext {
 
         const date = parseInt(match[1])
         const migrationName = match[2]
-        const migrationClassName = inflection.camelize(migrationName)
+        const migrationClassName = inflection.camelize(migrationName.replaceAll("-", "_"))
 
         return {
           file,
@@ -32,7 +31,7 @@ export default class VelociousDatabaseMigrateFromRequireContext {
       .sort((migration1, migration2) => migration1.date - migration2.date)
 
     for (const migration of files) {
-      if (!migrator.hasRunMigrationVersion(migration.date)) {
+      if (!this.migrator.hasRunMigrationVersion(migration.date)) {
         await this.runMigrationFile(migration, requireContext)
       }
     }

package/src/database/migration/index.js

@@ -1,10 +1,22 @@
-import TableData from "../table-data/index.js"
+import TableData, {TableColumn} from "../table-data/index.js"
 
 export default class VelociousDatabaseMigration {
   constructor({configuration}) {
     this.configuration = configuration
   }
 
+  async addColumn(tableName, columnName, args) {
+    const databasePool = this.configuration.getDatabasePool()
+    const sqls = databasePool.alterTableSql({
+      columns: [new TableColumn(columnName, args)],
+      tableName
+    })
+
+    for (const sql of sqls) {
+      await databasePool.query(sql)
+    }
+  }
+
   async addIndex(tableName, columns, args) {
     const databasePool = this.configuration.getDatabasePool()
     const createIndexArgs = Object.assign(

package/src/database/pool/base.js

@@ -35,6 +35,8 @@ class VelociousDatabasePoolBase {
 }
 
 const forwardMethods = [
+  "alterTable",
+  "alterTableSql",
   "createIndex",
   "createIndexSql",
   "createTable",

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

@@ -0,0 +1,26 @@
+import QueryBase from "./base.js"
+import restArgsError from "../../utils/rest-args-error.js"
+
+export default class VelociousDatabaseQueryAlterTableBase extends QueryBase {
+  constructor({columns, driver, tableName, ...restArgs}) {
+    restArgsError(restArgs)
+
+    super({driver})
+    this.columns = columns
+    this.tableName = tableName
+  }
+
+  toSqls() {
+    const sqls = []
+
+    for (const column of this.columns) {
+      let sql = `ALTER TABLE ${this.driver.quoteTable(this.tableName)} ADD `
+
+      sql += this.driver.quoteColumn(column.getName())
+
+      sqls.push(sql)
+    }
+
+    return sqls
+  }
+}

package/src/database/record/index.js

@@ -77,6 +77,12 @@ export default class VelociousDatabaseRecord {
     return relationship
   }
 
+  static getRelationships() {
+    if (this._relationships) return Object.values(this._relationships)
+
+    return []
+  }
+
   getRelationshipByName(relationshipName) {
     if (!this._instanceRelationships) this._instanceRelationships = {}
 
@@ -308,7 +314,7 @@ export default class VelociousDatabaseRecord {
 
       const model = instanceRelationship.loaded()
 
-      if (model.isChanged()) {
+      if (model?.isChanged()) {
         await model.save()
 
         const foreignKey = instanceRelationship.getForeignKey()
@@ -569,6 +575,13 @@ export default class VelociousDatabaseRecord {
 
     await this._reloadWithId(id)
     this.setIsNewRecord(false)
+
+    // Mark all relationships as preloaded, since we don't expect anything to have magically appeared since we created the record.
+    for (const relationship of this.constructor.getRelationships()) {
+      const instanceRelationship = this.getRelationshipByName(relationship.getRelationshipName())
+
+      instanceRelationship.setPreloaded(true)
+    }
   }
 
   async _updateRecordWithChanges() {

package/src/database/record/instance-relationships/has-many.js

@@ -39,9 +39,5 @@ export default class VelociousDatabaseRecordHasManyInstanceRelationship extends
     this._loaded = models
   }
 
-  setPreloaded(preloadedValue) {
-    this._preloaded = preloadedValue
-  }
-
   getTargetModelClass = () => this.relationship.getTargetModelClass()
 }

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

@@ -3,6 +3,8 @@ class TableColumn {
     this.args = args
     this.name = name
   }
+
+  getName = () => this.name
 }
 
 class TableIndex {
@@ -23,6 +25,8 @@ class TableReference {
   }
 }
 
+export {TableColumn}
+
 export default class TableData {
   _columns = []
   _indexes = []