velocious 1.0.4 → 1.0.5

package/index.mjs

@@ -1,19 +1 @@
-import Application from "./src/application.mjs"
-import Cli from "./src/cli/index.mjs"
-import Configuration from "./src/configuration.mjs"
-import Controller from "./src/controller.mjs"
-import Database from "./src/database/index.mjs"
-import HttpServer from "./src/http-server/index.mjs"
-import Routes from "./src/routes/index.mjs"
-import Spec from "./src/spec/index.mjs"
-
-export {
-  Application,
-  Cli,
-  Configuration,
-  Controller,
-  Database,
-  HttpServer,
-  Routes,
-  Spec
-}
+export {}

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.mjs"
   },
   "name": "velocious",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "main": "index.mjs",
   "scripts": {
     "test": "jasmine",
@@ -32,6 +32,7 @@
     "escape-string-regexp": "^1.0.5",
     "incorporator": "^1.0.2",
     "inflection": "^3.0.0",
+    "sql-escape-string": "^1.1.0",
     "sql.js": "^1.12.0",
     "strftime": "^0.10.2"
   }

package/spec/database/connection/drivers/mysql/query-parser-spec.mjs

@@ -1,4 +1,5 @@
-import Database from "../../../../../src/database/index.mjs"
+import DatabaseHandler from "../../../../../src/database/handler.mjs"
+import DatabaseQuery from "../../../../../src/database/query/index.mjs"
 import MysqlQueryParser from "../../../../../src/database/drivers/mysql/query-parser.mjs"
 
 import FromTable from "../../../../../src/database/query/from-table.mjs"
@@ -10,8 +11,8 @@ const mysqlDriver = new MysqlDriverClass()
 
 describe("database - connection - drivers - mysql - query parser", () => {
   it("generates sql with selects, joins and orders", () => {
-    const handler = new Database.Handler()
-    const query = new Database.Query({driver: mysqlDriver, handler})
+    const handler = new DatabaseHandler()
+    const query = new DatabaseQuery({driver: mysqlDriver, handler})
       .select(["tasks.id", "tasks.name"])
       .from("tasks")
       .joins("LEFT JOIN projects ON projects.id = tasks.project_id")
@@ -22,8 +23,8 @@ describe("database - connection - drivers - mysql - query parser", () => {
   })
 
   it("generates sql with selects, joins and orders", () => {
-    const handler = new Database.Handler()
-    const query = new Database.Query({driver: mysqlDriver, handler})
+    const handler = new DatabaseHandler()
+    const query = new DatabaseQuery({driver: mysqlDriver, handler})
       .select([
         new SelectTableAndColumn({tableName: "tasks", columnName: "id"}),
         new SelectTableAndColumn({tableName: "tasks", columnName: "name"})

package/spec/database/drivers/mysql/connection-spec.mjs

@@ -1,13 +1,12 @@
-import Database from "../../../../src/database/index.mjs"
+import DatabaseDriversMysql from "../../../../src/database/drivers/mysql/index.mjs"
 import configuration from "../../../dummy/src/config/configuration.mjs"
 import {digg} from "diggerize"
 
 const mysqlConfig = digg(configuration, "database", "default", "master")
-const Mysql = Database.Drivers.Mysql
 
 describe("Database - Drivers - Mysql - Connection", () => {
   it("connects", async () => {
-    const mysql = new Mysql(mysqlConfig)
+    const mysql = new DatabaseDriversMysql(mysqlConfig)
 
     await mysql.connect()
 

package/spec/dummy/src/models/task.mjs

@@ -1,4 +1,4 @@
-import Database from "../../../../src/database/index.mjs"
+import DatabaseRecord from "../../../../src/database/record/index.mjs"
 
-export default class Task extends Database.Record {
+export default class Task extends DatabaseRecord {
 }

package/src/database/drivers/base.mjs

@@ -1,8 +1,23 @@
+import Query from "../query/index.mjs"
+import Handler from "../handler.mjs"
+
 export default class VelociousDatabaseDriversBase {
   constructor(args) {
     this._args = args
   }
 
+  async createTable(...args) {
+    const sql = this.createTableSql(...args)
+
+    await this.query(sql)
+  }
+
+  async delete(...args) {
+    const sql = this.deleteSql(...args)
+
+    await this.query(sql)
+  }
+
   getArgs() {
     return this._args
   }
@@ -11,7 +26,33 @@ export default class VelociousDatabaseDriversBase {
     return this.idSeq
   }
 
+  async insert(...args) {
+    const sql = this.insertSql(...args)
+
+    await this.query(sql)
+  }
+
+  async select(tableName) {
+    const handler = new Handler()
+    const query = new Query({
+      driver: this,
+      handler
+    })
+
+    const sql = query
+      .from(tableName)
+      .toSql()
+
+    return await this.query(sql)
+  }
+
   setIdSeq(id) {
     this.idSeq = id
   }
+
+  async update(...args) {
+    const sql = this.updateSql(...args)
+
+    await this.query(sql)
+  }
 }

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

@@ -0,0 +1,36 @@
+import Base from "../base.mjs"
+import CreateTable from "../sqlite/sql/create-table.mjs"
+import Delete from "../sqlite/sql/delete.mjs"
+import Insert from "../sqlite/sql/insert.mjs"
+import QueryParser from "../sqlite/query-parser.mjs"
+import Table from "./table"
+import Update from "../sqlite/sql/update.mjs"
+
+export default class VelociousDatabaseDriversSqliteBase extends Base {
+  createTableSql(tableData) {
+    const createArgs = Object.assign({tableData, driver: this})
+    const createTable = new CreateTable(createArgs)
+
+    return createTable.toSql()
+  }
+
+  deleteSql = ({tableName, conditions}) => new Delete({conditions, driver: this, tableName}).toSql()
+  insertSql = ({tableName, data}) => new Insert({driver: this, tableName, data}).toSql()
+
+  async getTables() {
+    const result = await this.query("SELECT name FROM sqlite_master WHERE type = 'table'")
+    const tables = []
+
+    for (const row of result) {
+      const table = new Table(row)
+
+      tables.push(table)
+    }
+
+    return tables
+  }
+
+  queryToSql = (query) => new QueryParser({query}).toSql()
+  quoteColumn = (string) => `\`${string}\``
+  updateSql = ({conditions, data, tableName}) => new Update({conditions, data, driver: this, tableName}).toSql()
+}

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

@@ -1,17 +1,13 @@
-import Base from "../base.mjs"
-import CreateTable from "../sqlite/sql/create-table.mjs"
-import Delete from "../sqlite/sql/delete.mjs"
+import Base from "./base"
 import {digg} from "diggerize"
-import Insert from "../sqlite/sql/insert.mjs"
+import escapeString from "sql-string-escape"
 import Options from "../sqlite/options.mjs"
-import query from "./query.mjs"
-import QueryParser from "../sqlite/query-parser.mjs"
+import query from "./query"
 import * as SQLite from "expo-sqlite"
-import Update from "../sqlite/sql/update.mjs"
 
-export default class VelociousDatabaseDriversSqliteNative extends Base{
+export default class VelociousDatabaseDriversSqliteNative extends Base {
   async connect() {
-    const connection = await SQLite.openDatabaseAsync(digg(this.connectArgs(), "name"))
+    const connection = await SQLite.openDatabaseAsync(digg(this.getArgs(), "name"))
 
     this.connection = connection
   }
@@ -39,54 +35,20 @@ export default class VelociousDatabaseDriversSqliteNative extends Base{
     this.connection = undefined
   }
 
-  createTableSql(tableData) {
-    const createArgs = Object.assign({tableData, driver: this})
-    const createTable = new CreateTable(createArgs)
-
-    return createTable.toSql()
-  }
-
-  async query(sql) {
-    return await query(this.connection, sql)
-  }
-
-  queryToSql(query) {
-    return new QueryParser({query}).toSql()
-  }
+  query = async (sql) => await query(this.connection, sql)
 
   quote(string) {
-    if (!this.connection) throw new Error("Can't escape before connected")
+    const type = typeof string
 
-    return this.connection.escape(string)
-  }
+    if (type == "number") return string
+    if (type != "string") string = `${string}`
 
-  quoteColumn(string) {
-    return `\`${string}\``
-  }
-
-  deleteSql({tableName, conditions}) {
-    const deleteInstruction = new Delete({conditions, driver: this, tableName})
-
-    return deleteInstruction.toSql()
-  }
-
-  insertSql({tableName, data}) {
-    const insert = new Insert({driver: this, tableName, data})
-
-    return insert.toSql()
+    return escapeString(string)
   }
 
   options() {
-    if (!this._options) {
-      this._options = new Options({driver: this})
-    }
+    if (!this._options) this._options = new Options({driver: this})
 
     return this._options
   }
-
-  updateSql({conditions, data, tableName}) {
-    const update = new Update({conditions, data, driver: this, tableName})
-
-    return update.toSql()
-  }
 }

package/src/database/drivers/sqlite/index.web.mjs

@@ -1,16 +1,11 @@
-import Base from "../base.mjs"
-import CreateTable from "../sqlite/sql/create-table.mjs"
-import Delete from "../sqlite/sql/delete.mjs"
+import Base from "./base.mjs"
 import {digg} from "diggerize"
-import Insert from "../sqlite/sql/insert.mjs"
 import Options from "../sqlite/options.mjs"
 import query from "./query"
-import QueryParser from "../sqlite/query-parser.mjs"
-import Update from "../sqlite/sql/update.mjs"
 
 import initSqlJs from "sql.js"
 
-export default class VelociousDatabaseDriversSqliteWeb extends Base{
+export default class VelociousDatabaseDriversSqliteWeb extends Base {
   async connect() {
     const SQL = await initSqlJs({
       // Required to load the wasm binary asynchronously. Of course, you can host it wherever you want you can omit locateFile completely when running in Node.
@@ -32,15 +27,7 @@ export default class VelociousDatabaseDriversSqliteWeb extends Base{
     this.connection = undefined
   }
 
-  createTableSql(tableData) {
-    const createArgs = Object.assign({tableData, driver: this})
-    const createTable = new CreateTable(createArgs)
-
-    return createTable.toSql()
-  }
-
   query = async (sql) => await query(this.connection, sql)
-  queryToSql = (query) => new QueryParser({query}).toSql()
 
   quote(string) {
     if (!this.connection) throw new Error("Can't escape before connected")
@@ -48,10 +35,6 @@ export default class VelociousDatabaseDriversSqliteWeb extends Base{
     return this.connection.escape(string)
   }
 
-  quoteColumn = (string) => `\`${string}\``
-  deleteSql = ({tableName, conditions}) => new Delete({conditions, driver: this, tableName}).toSql()
-  insertSql = ({tableName, data}) => new Insert({driver: this, tableName, data}).toSql()
-
   options() {
     if (!this._options) {
       this._options = new Options({driver: this})
@@ -59,6 +42,4 @@ export default class VelociousDatabaseDriversSqliteWeb extends Base{
 
     return this._options
   }
-
-  updateSql = ({conditions, data, tableName}) => new Update({conditions, data, driver: this, tableName}).toSql()
 }

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

@@ -0,0 +1,9 @@
+import {digg} from "diggerize"
+
+export default class VelociousDatabaseDriversSqliteTable {
+  constructor(row) {
+    this.row = row
+  }
+
+  getName = () => digg(this, "row", "name")
+}

package/src/database/migrate-from-require-context.mjs

@@ -1,5 +1,6 @@
 import Configuration from "../configuration.mjs"
 import * as inflection from "inflection"
+import Migrator from "./migrator"
 
 export default class VelociousDatabaseMigrateFromRequireContext {
   constructor(configuration) {
@@ -7,6 +8,10 @@ export default class VelociousDatabaseMigrateFromRequireContext {
   }
 
   async execute(requireContext) {
+    const migrator = new Migrator({configuration: this.configuration})
+
+    await migrator.prepare()
+
     const files = requireContext.keys()
       .map((file) => {
         const match = file.match(/^\.\/(\d{14})-(.+)\.mjs$/)
@@ -27,7 +32,9 @@ export default class VelociousDatabaseMigrateFromRequireContext {
       .sort((migration1, migration2) => migration1.date - migration2.date)
 
     for (const migration of files) {
-      await this.runMigrationFile(migration, requireContext)
+      if (!migrator.hasRunMigrationVersion(migration.date)) {
+        await this.runMigrationFile(migration, requireContext)
+      }
     }
   }
 
@@ -35,7 +42,7 @@ export default class VelociousDatabaseMigrateFromRequireContext {
     if (!this.configuration) throw new Error("No configuration set")
     if (!this.configuration.isDatabasePoolInitialized()) await this.configuration.initializeDatabasePool()
 
-    await this.configuration.getDatabasePool().withConnection(async () => {
+    await this.configuration.getDatabasePool().withConnection(async (db) => {
       const MigrationClass = requireContext(migration.file).default
       const migrationInstance = new MigrationClass({
         configuration: this.configuration
@@ -48,6 +55,8 @@ export default class VelociousDatabaseMigrateFromRequireContext {
       } else {
         throw new Error(`'change' or 'up' didn't exist on migration: ${migration.file}`)
       }
+
+      await db.insert({tableName: "schema_migrations", data: {version: migration.date}})
     })
   }
 }

package/src/database/migrator.mjs

@@ -0,0 +1,73 @@
+import {digg} from "diggerize"
+import TableData from "./table-data/index"
+
+export default class VelociousDatabaseMigrator {
+  constructor({configuration}) {
+    this.configuration = configuration
+  }
+
+  async prepare() {
+    const exists = await this.migrationsTableExist()
+
+    if (!exists) await this.createMigrationsTable()
+
+    await this.loadMigrationsVersions()
+  }
+
+  async createMigrationsTable() {
+    const schemaMigrationsTable = new TableData("schema_migrations", {ifNotExists: true})
+
+    schemaMigrationsTable.string("version", {null: false, primaryKey: true})
+
+    await this.configuration.getDatabasePool().withConnection(async (db) => {
+      const createSchemaMigrationsTableSql = db.createTableSql(schemaMigrationsTable)
+
+      await db.query(createSchemaMigrationsTableSql)
+    })
+  }
+
+  hasRunMigrationVersion(version) {
+    if (!this.migrationsVersions) {
+      throw new Error("Migrations versions hasn't been loaded yet")
+    }
+
+    if (version in this.migrationsVersions) {
+      return true
+    }
+
+    return false
+  }
+
+  async loadMigrationsVersions() {
+    const db = this.configuration.getDatabasePool()
+
+    this.migrationsVersions = {}
+
+    await db.withConnection(async () => {
+      const rows = await db.select("schema_migrations")
+
+      for (const row of rows) {
+        const version = digg(row, "version")
+
+        this.migrationsVersions[version] = true
+      }
+    })
+  }
+
+  async migrationsTableExist() {
+    let exists = false
+
+    await this.configuration.getDatabasePool().withConnection(async (db) => {
+      const tables = await db.getTables()
+
+      for (const table of tables) {
+        if (table.getName() == "schema_migrations") {
+          exists = true
+          break
+        }
+      }
+    })
+
+    return exists
+  }
+}

package/src/database/pool/async-tracked-multi-connection.mjs

@@ -58,7 +58,7 @@ export default class VelociousDatabasePoolAsyncTrackedMultiConnection extends Ba
 
     await this.asyncLocalStorage.run(id, async () => {
       try {
-        await callback()
+        await callback(connection)
       } finally {
         this.checkin(connection)
       }

package/src/database/pool/base.mjs

@@ -34,7 +34,20 @@ class VelociousDatabasePoolBase {
   }
 }
 
-const forwardMethods = ["createTableSql", "deleteSql", "insertSql", "query", "quote", "updateSql"]
+const forwardMethods = [
+  "createTable",
+  "createTableSql",
+  "delete",
+  "deleteSql",
+  "getTables",
+  "insert",
+  "insertSql",
+  "query",
+  "quote",
+  "select",
+  "update",
+  "updateSql"
+]
 
 for (const forwardMethod of forwardMethods) {
   VelociousDatabasePoolBase.prototype[forwardMethod] = function(...args) {

package/src/database/pool/single-multi-use.mjs

@@ -27,7 +27,7 @@ export default class VelociousDatabasePoolSingleMultiUser extends BasePool {
 
   async withConnection(callback) {
     await this.checkout() // Ensure a connection is present
-    await callback()
+    await callback(this.connection)
   }
 
   getCurrentConnection() {

package/src/database/query/insert-base.mjs

@@ -1,5 +1,9 @@
 export default class VelociousDatabaseQueryInsertBase {
   constructor({driver, tableName, data}) {
+    if (!driver) throw new Error("No driver given to insert base")
+    if (!tableName) throw new Error(`Invalid table name given to insert base: ${tableName}`)
+    if (!data) throw new Error("No data given to insert base")
+
     this.data = data
     this.driver = driver
     this.tableName = tableName

package/src/database/query-parser/options.mjs

@@ -11,13 +11,13 @@ export default class VelociousDatabaseQueryParserOptions {
   }
 
   quoteColumnName(columnName) {
-    if (columnName.includes(this.columnQuote)) throw new Error(`Invalid column name: ${columnName}`)
+    if (!columnName || columnName.includes(this.columnQuote)) throw new Error(`Invalid column name: ${columnName}`)
 
     return `${this.columnQuote}${columnName}${this.columnQuote}`
   }
 
   quoteTableName(tableName) {
-    if (tableName.includes(this.tableQuote)) throw new Error(`Invalid table name: ${tableName}`)
+    if (!tableName || tableName.includes(this.tableQuote)) throw new Error(`Invalid table name: ${tableName}`)
 
     return `${this.tableQuote}${tableName}${this.tableQuote}`
   }

package/src/database/drivers/index.mjs

@@ -1,5 +0,0 @@
-import Mysql from "../drivers/mysql/index.mjs"
-
-export default {
-  Mysql
-}

package/src/database/index.mjs

@@ -1,15 +0,0 @@
-import Drivers from "./drivers/index.mjs"
-import Handler from "./handler.mjs"
-import Migration from "./migration/index.mjs"
-import Migrator from "./migrator/index.mjs"
-import Query from "./query/index.mjs"
-import Record from "./record/index.mjs"
-
-export default {
-  Drivers,
-  Handler,
-  Migration,
-  Migrator,
-  Query,
-  Record
-}

package/src/database/migrator/index.mjs

@@ -1,15 +0,0 @@
-export default class VelociousDatabaseMigrator {
-  constructor({path}) {
-    if (!path) throw new Error("No 'path' given")
-
-    this.path = path
-  }
-
-  migrateUp() {
-    throw new Error("stub")
-  }
-
-  migrateDown() {
-    throw new Error("stub")
-  }
-}