velocious 1.0.40 → 1.0.41

package/README.md

@@ -82,7 +82,7 @@ Run migrations from anywhere if you want to:
 const migrationsPath = `/some/dir/migrations`
 const files = await new FilesFinder({path: migrationsPath}).findFiles()
 
-await this.configuration.withConnections(async () => {
+await this.configuration.ensureConnections(async () => {
   const migrator = new Migrator({configuration: this.configuration})
 
   await migrator.prepare()

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.40",
+  "version": "1.0.41",
   "main": "index.js",
   "scripts": {
     "test": "jasmine",
@@ -45,6 +45,7 @@
     "incorporator": "^1.0.2",
     "inflection": "^3.0.0",
     "pure-uuid": "^1.8.1",
+    "set-state-compare": "^1.0.58",
     "sql-escape-string": "^1.1.0",
     "sql.js": "^1.12.0",
     "strftime": "^0.10.2"

package/peak_flow.yml

@@ -49,7 +49,8 @@ builds:
       - wait-for-it mariadb:3306
       - sleep 5
       - cd spec/dummy && npx velocious db:create
-      - npm test
+      - cd spec/dummy && npx velocious db:migrate
+      - cd spec/dummy && npx velocious test
   build_2:
     name: MS-SQL
     script:
@@ -57,7 +58,8 @@ builds:
       - wait-for-it mssql:1433
       - sleep 5
       - cd spec/dummy && npx velocious db:create
-      - npm test
+      - cd spec/dummy && npx velocious db:migrate
+      - cd spec/dummy && npx velocious test
   build_3:
     name: PG-SQL
     script:
@@ -66,7 +68,8 @@ builds:
       - wait-for-it postgres:5432
       - sleep 5
       - cd spec/dummy && npx velocious db:create
-      - npm test
+      - cd spec/dummy && npx velocious db:migrate
+      - cd spec/dummy && npx velocious test
   build_4:
     name: SQLite
     script:
@@ -74,4 +77,5 @@ builds:
       - wait-for-it mssql:1433
       - sleep 5
       - cd spec/dummy && npx velocious db:create
-      - npm test
+      - cd spec/dummy && npx velocious db:migrate
+      - cd spec/dummy && npx velocious test

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

@@ -8,6 +8,7 @@ describe("Cli - Commands - db:create", () => {
       processArgs: ["db:create"],
       testing: true
     })
+
     const result = await cli.execute()
 
     if (cli.getConfiguration().getDatabaseType() == "sqlite") {

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

@@ -3,7 +3,7 @@ import dummyDirectory from "../../../dummy/dummy-directory.js"
 import uniqunize from "uniqunize"
 
 describe("Cli - Commands - db:migrate", () => {
-  it("runs migrations", async () => {
+  it("runs migrations", {databaseCleaning: {transaction: false}}, async () => {
     const directory = dummyDirectory()
     const cli = new Cli({
       directory,
@@ -15,20 +15,24 @@ describe("Cli - Commands - db:migrate", () => {
 
     let defaultDatabaseType, defaultSchemaMigrations = [], projectForeignKey = [], tablesResult = []
 
-    await cli.configuration.withConnections(async (dbs) => {
+    await cli.configuration.ensureConnections(async (dbs) => {
       defaultDatabaseType = dbs.default.getType()
 
-      const tableNames = ["accounts", "tasks", "project_translations", "projects", "schema_migrations"]
+      const tableNames = ["accounts", "authentication_tokens", "tasks", "project_translations", "projects", "schema_migrations", "users"]
 
       for (const tableName of tableNames) {
-        await dbs.default.dropTable(tableName, {ifExists: true})
-        await dbs.mssql.dropTable(tableName, {ifExists: true})
+        await dbs.default.dropTable(tableName, {cascade: true, ifExists: true})
+
+        if (dbs.default.getType() != "mssql") {
+          await dbs.mssql.dropTable(tableName, {cascade: true, ifExists: true})
+        }
       }
 
       await cli.execute()
 
-      const table = await dbs.default.getTableByName("tasks")
-      const foreignKeys = await table.getForeignKeys()
+      // It creates foreign keys
+      const tasksTable = await dbs.default.getTableByName("tasks")
+      const foreignKeys = await tasksTable.getForeignKeys()
 
       for (const foreignKey of foreignKeys) {
         if (foreignKey.getColumnName() == "project_id") {
@@ -36,6 +40,15 @@ describe("Cli - Commands - db:migrate", () => {
         }
       }
 
+      // It creates unique indexes
+      const authenticationTokensTable = await dbs.default.getTableByName("authentication_tokens")
+      const tokenColumn = await authenticationTokensTable.getColumnByName("token")
+      const tokenIndex = await tokenColumn.getIndexByName("index_on_token")
+
+      expect(tokenIndex.getName()).toEqual("index_on_token")
+      expect(tokenIndex.isPrimaryKey()).toBeFalse()
+      expect(tokenIndex.isUnique()).toBeTrue()
+
       for (const db of Object.values(dbs)) {
         const schemaMigrations = await db.query("SELECT * FROM schema_migrations ORDER BY version")
 
@@ -62,27 +75,31 @@ describe("Cli - Commands - db:migrate", () => {
       expect(uniqunize(tablesResult.sort())).toEqual(
         [
           "accounts",
+          "authentication_tokens",
           "project_translations",
           "projects",
           "schema_migrations",
-          "tasks"
+          "tasks",
+          "users"
         ]
       )
 
-      expect(uniqunize(defaultSchemaMigrations.sort())).toEqual(["20230728075328", "20230728075329", "20250605133926", "20250903112845"])
+      expect(uniqunize(defaultSchemaMigrations.sort())).toEqual(["20230728075328", "20230728075329", "20250605133926", "20250903112845", "20250912183605", "20250912183606"])
     } else {
       expect(tablesResult.sort()).toEqual(
         [
           "accounts",
+          "authentication_tokens",
           "project_translations",
           "projects",
           "schema_migrations",
           "schema_migrations",
-          "tasks"
+          "tasks",
+          "users"
         ]
       )
 
-      expect(defaultSchemaMigrations.sort()).toEqual(["20230728075328", "20230728075329", "20250605133926", "20250903112845"])
+      expect(defaultSchemaMigrations.sort()).toEqual(["20230728075328", "20230728075329", "20250605133926", "20250903112845", "20250912183605", "20250912183606"])
     }
   })
 })

package/spec/cli/commands/test/test-files-finder-spec.js

@@ -1,12 +1,13 @@
+import fs from "fs/promises"
 import TestFilesFinder from "../../../../src/testing/test-files-finder.js"
 
 describe("Cli - Commands - test - TestFilesFinder", () => {
   it("finds the correct test files", async () => {
-    const testFilesFinder = new TestFilesFinder({directory: process.cwd(), processArgs: ["test"]})
+    const directory = await fs.realpath(`${process.cwd()}/../..`)
+    const testFilesFinder = new TestFilesFinder({directory, processArgs: ["test"]})
     const testFiles = await testFilesFinder.findTestFiles()
+    const sampleTestFilePath = `${directory}/spec/cli/commands/destroy/migration-spec.js`
 
-    const sampleTestFilePath = `${process.cwd()}/spec/cli/commands/destroy/migration-spec.js`
-
-    expect(testFiles.includes(sampleTestFilePath)).toBe(true)
+    expect(testFiles).toContain(sampleTestFilePath)
   })
 })

package/spec/database/record/create-spec.js

@@ -44,6 +44,12 @@ describe("Record - create", () => {
 
   it("uses transactions and rolls back in case of an error", async () => {
     await Dummy.run(async () => {
+      const beforeProjectsCount = await Project.count()
+      const beforeTasksCount = await Task.count()
+
+      expect(beforeProjectsCount).toEqual(0)
+      expect(beforeTasksCount).toEqual(0)
+
       const project = new Project({name: "Test project"})
 
       project.tasks().build({name: " ", project})

package/spec/database/record/destroy-spec.js

@@ -1,10 +1,12 @@
 import Dummy from "../../dummy/index.js"
+import Project from "../../dummy/src/models/project.js"
 import Task from "../../dummy/src/models/task.js"
 
 describe("Record - destroy", () => {
   it("destroys a record", async () => {
     await Dummy.run(async () => {
-      const task = new Task({name: "Test task"})
+      const project = await Project.create()
+      const task = new Task({name: "Test task", project})
 
       await task.save()
       await task.destroy()
@@ -17,8 +19,9 @@ describe("Record - destroy", () => {
 
   it("destroys all records in a collection", async () => {
     await Dummy.run(async () => {
-      const task1 = await Task.create({name: "Test task 1"})
-      const task2 = await Task.create({name: "Test task 2"})
+      const project = await Project.create()
+      const task1 = await Task.create({name: "Test task 1", project})
+      const task2 = await Task.create({name: "Test task 2", project})
 
       await Task.where({id: task1.id()}).destroyAll()
 

package/spec/database/record/find-spec.js

@@ -1,10 +1,12 @@
 import Dummy from "../../dummy/index.js"
+import Project from "../../dummy/src/models/project.js"
 import Task from "../../dummy/src/models/task.js"
 
 describe("Record - find", () => {
   it("finds an existing record", async () => {
     await Dummy.run(async () => {
-      const task = new Task({name: "Test task"})
+      const project = await Project.create()
+      const task = new Task({name: "Test task", project})
 
       await task.save()
 

package/spec/database/record/query-spec.js

@@ -1,4 +1,5 @@
 import Dummy from "../../dummy/index.js"
+import Project from "../../dummy/src/models/project.js"
 import Task from "../../dummy/src/models/task.js"
 
 describe("Record - query", () => {
@@ -38,9 +39,10 @@ describe("Record - query", () => {
   it("finds the first record", async () => {
     await Dummy.run(async () => {
       const taskIDs = []
+      const project = await Project.create()
 
       for (let i = 0; i < 5; i++) {
-        const task = await Task.create({name: `Task ${i}`})
+        const task = await Task.create({name: `Task ${i}`, project})
 
         taskIDs.push(task.id())
       }
@@ -54,9 +56,10 @@ describe("Record - query", () => {
   it("finds the last record", async () => {
     await Dummy.run(async () => {
       const taskIDs = []
+      const project = await Project.create()
 
       for (let i = 0; i < 5; i++) {
-        const task = await Task.create({name: `Task ${i}`})
+        const task = await Task.create({name: `Task ${i}`, project})
 
         taskIDs.push(task.id())
       }
@@ -70,9 +73,10 @@ describe("Record - query", () => {
   it("counts the records", async () => {
     await Dummy.run(async () => {
       const taskIDs = []
+      const project = await Project.create()
 
       for (let i = 0; i < 5; i++) {
-        const task = await Task.create({name: `Task ${i}`})
+        const task = await Task.create({name: `Task ${i}`, project})
 
         taskIDs.push(task.id())
       }

package/spec/database/record/translation-fallbacks-spec.js

@@ -1,7 +1,7 @@
 import Dummy from "../../dummy/index.js"
 import Task from "../../dummy/src/models/task.js"
 
-describe("Record - create", () => {
+describe("Record - translation fallbacks", () => {
   it("creates a new simple record with relationships and translations with fallbacks", async () => {
     await Dummy.run(async () => {
       const task = new Task({name: "Test task"})

package/spec/database/record/update-spec.js

@@ -6,7 +6,8 @@ import wait from "awaitery/src/wait.js"
 describe("Record - update", () => {
   it("updates a record", async () => {
     await Dummy.run(async () => {
-      const task = new Task({name: "Test task"})
+      const project = await Project.create()
+      const task = new Task({name: "Test task", project})
 
       await task.save()
       await task.update({name: "Updated name"})

package/spec/database/record/validations-spec.js

@@ -1,29 +1,33 @@
 import Dummy from "../../dummy/index.js"
 import Task from "../../dummy/src/models/task.js"
 import {ValidationError} from "../../../src/database/record/index.js"
+import Project from "../../dummy/src/models/project.js"
 
 describe("Record - validations", () => {
   it("raises validations if trying to create an invalid record because of a presence validation", async () => {
     await Dummy.run(async () => {
-      const task = new Task({name: " "})
+      const project = await Project.create()
+      const task = new Task({name: " ", project})
 
-      await expectAsync(task.save()).toBeRejectedWith(new ValidationError("Name can't be blank"))
+      await expect(async () => task.save()).toThrowError(new ValidationError("Name can't be blank"))
     })
   })
 
   it("raises validations if trying to create an invalid record with a blank value because of a presence validation", async () => {
     await Dummy.run(async () => {
-      const task = new Task({name: null})
+      const project = await Project.create()
+      const task = new Task({name: null, project})
 
-      await expectAsync(task.save()).toBeRejectedWith(new ValidationError("Name can't be blank"))
+      await expect(async () => task.save()).toThrowError(new ValidationError("Name can't be blank"))
     })
   })
 
   it("raises validations if trying to create an invalid record because of a uniqueness validation", async () => {
     await Dummy.run(async () => {
-      await Task.create({name: "Task 1"})
+      const project = await Project.create()
+      await Task.create({name: "Task 1", project})
 
-      const task2 = await Task.create({name: "Task 2"})
+      const task2 = await Task.create({name: "Task 2", project})
 
       try {
         await task2.update({name: "Task 1"})

package/spec/database/transactions-spec.js

@@ -1,24 +1,26 @@
 import Dummy from "../dummy/index.js"
 import dummyConfiguration from "../dummy/src/config/configuration.js"
+import Project from "../dummy/src/models/project.js"
 import Task from "../dummy/src/models/task.js"
 import {ValidationError} from "../../src/database/record/index.js"
 
 describe("database - transactions", () => {
   it("supports transactions and savepoints", async () => {
     await Dummy.run(async () => {
-      await dummyConfiguration.withConnections(async (dbs) => {
+      await dummyConfiguration.ensureConnections(async (dbs) => {
         const db = dbs.default
+        const project = await Project.create()
 
         await db.transaction(async () => {
-          await Task.create({name: "Task 1"})
+          await Task.create({name: "Task 1", project})
 
           await db.transaction(async () => {
-            await Task.create({name: "Task 2"})
+            await Task.create({name: "Task 2", project})
 
             try {
               await db.transaction(async () => {
-                await Task.create({name: "Task 3"})
-                await Task.create({name: "    "})
+                await Task.create({name: "Task 3", project})
+                await Task.create({name: "    ", project})
 
                 throw new Error("Didn't expect to succeed")
               })

package/spec/dummy/index.js

@@ -1,7 +1,7 @@
 import Application from "../../src/application.js"
-import {digg} from "diggerize"
 import dummyConfiguration from "./src/config/configuration.js"
-import Migration from "../../src/database/migration/index.js"
+import FilesFinder from "../../src/database/migrator/files-finder.js"
+import Migrator from "../../src/database/migrator.js"
 
 export default class Dummy {
   static current() {
@@ -15,31 +15,8 @@ export default class Dummy {
   static async prepare() {
     dummyConfiguration.setCurrent()
 
-    await dummyConfiguration.withConnections(async (dbs) => {
-      const db = digg(dbs, "default")
-
-      await db.dropTable("tasks", {ifExists: true})
-      await db.dropTable("project_translations", {ifExists: true})
-      await db.dropTable("projects", {ifExists: true})
-
-      const migration = new Migration({configuration: dummyConfiguration, databaseIdentifier: "default", db})
-
-      await migration.createTable("projects", (t) => {
-        t.timestamps()
-      })
-      await migration.createTable("project_translations", (t) => {
-        t.references("project", {null: false, foreignKey: true})
-        t.string("locale", {null: false})
-        t.string("name")
-      })
-
-      await migration.addIndex("project_translations", ["project_id", "locale"], {unique: true})
-
-      await migration.createTable("tasks", (t) => {
-        t.references("project")
-        t.string("name")
-        t.text("description")
-      })
+    await dummyConfiguration.ensureConnections(async () => {
+      await this.runMigrations()
 
       if (!dummyConfiguration.isInitialized()) {
         await dummyConfiguration.initialize()
@@ -47,12 +24,21 @@ export default class Dummy {
     })
   }
 
+  static async runMigrations() {
+    const migrationsPath = `${import.meta.dirname}/src/database/migrations`
+    const files = await new FilesFinder({path: migrationsPath}).findFiles()
+    const migrator = new Migrator({configuration: dummyConfiguration})
+
+    await migrator.prepare()
+    await migrator.migrateFiles(files, async (path) => await import(path))
+  }
+
   static async run(callback) {
     await this.current().run(callback)
   }
 
   async run(callback) {
-    await dummyConfiguration.withConnections(async () => {
+    await dummyConfiguration.ensureConnections(async () => {
       await Dummy.prepare()
       await this.start()
 
@@ -78,7 +64,10 @@ export default class Dummy {
           password: ""
         }
       },
-      httpServer: {port: 3006}
+      httpServer: {
+        maxWorkers: 1,
+        port: 3006
+      }
     })
 
     await this.application.initialize()

package/spec/dummy/src/config/configuration.example.js

@@ -49,7 +49,7 @@ export default new Configuration({
     const requireContextModels = requireContext(modelsPath, true, /^(.+)\.js$/)
     const initializerFromRequireContext = new InitializerFromRequireContext({requireContext: requireContextModels})
 
-    await configuration.withConnections(async () => {
+    await configuration.ensureConnections(async () => {
       await initializerFromRequireContext.initialize({configuration})
     })
   },
@@ -58,5 +58,6 @@ export default new Configuration({
     de: ["de", "en"],
     en: ["en", "de"]
   },
-  locales: ["de", "en"]
+  locales: ["de", "en"],
+  testing: `${dummyDirectory()}/src/config/testing.js`
 })

package/spec/dummy/src/config/configuration.peakflow.mariadb.js

@@ -32,11 +32,6 @@ export default new Configuration({
           password: "Super-Secret-Password",
           database: "velocious_test",
           server: "mssql",
-          pool: {
-            max: 10,
-            min: 0,
-            idleTimeoutMillis: 30000
-          },
           options: {
             encrypt: true, // for azure
             trustServerCertificate: true // change to true for local dev / self-signed certs
@@ -51,7 +46,7 @@ export default new Configuration({
     const requireContextModels = requireContext(modelsPath, true, /^(.+)\.js$/)
     const initializerFromRequireContext = new InitializerFromRequireContext({requireContext: requireContextModels})
 
-    await configuration.withConnections(async () => {
+    await configuration.ensureConnections(async () => {
       await initializerFromRequireContext.initialize({configuration})
     })
   },
@@ -60,5 +55,6 @@ export default new Configuration({
     de: ["de", "en"],
     en: ["en", "de"]
   },
-  locales: ["de", "en"]
+  locales: ["de", "en"],
+  testing: `${dummyDirectory()}/src/config/testing.js`
 })

package/spec/dummy/src/config/configuration.peakflow.mssql.js

@@ -52,7 +52,7 @@ export default new Configuration({
     const requireContextModels = requireContext(modelsPath, true, /^(.+)\.js$/)
     const initializerFromRequireContext = new InitializerFromRequireContext({requireContext: requireContextModels})
 
-    await configuration.withConnections(async () => {
+    await configuration.ensureConnections(async () => {
       await initializerFromRequireContext.initialize({configuration})
     })
   },
@@ -61,5 +61,6 @@ export default new Configuration({
     de: ["de", "en"],
     en: ["en", "de"]
   },
-  locales: ["de", "en"]
+  locales: ["de", "en"],
+  testing: `${dummyDirectory()}/src/config/testing.js`
 })

package/spec/dummy/src/config/configuration.peakflow.pgsql.js

@@ -32,11 +32,6 @@ export default new Configuration({
           password: "Super-Secret-Password",
           database: "velocious_test",
           server: "mssql",
-          pool: {
-            max: 10,
-            min: 0,
-            idleTimeoutMillis: 30000
-          },
           options: {
             encrypt: true, // for azure
             trustServerCertificate: true // change to true for local dev / self-signed certs
@@ -51,7 +46,7 @@ export default new Configuration({
     const requireContextModels = requireContext(modelsPath, true, /^(.+)\.js$/)
     const initializerFromRequireContext = new InitializerFromRequireContext({requireContext: requireContextModels})
 
-    await configuration.withConnections(async () => {
+    await configuration.ensureConnections(async () => {
       await initializerFromRequireContext.initialize({configuration})
     })
   },
@@ -60,5 +55,6 @@ export default new Configuration({
     de: ["de", "en"],
     en: ["en", "de"]
   },
-  locales: ["de", "en"]
+  locales: ["de", "en"],
+  testing: `${dummyDirectory()}/src/config/testing.js`
 })

package/spec/dummy/src/config/configuration.peakflow.sqlite.js

@@ -29,11 +29,6 @@ export default new Configuration({
           password: "Super-Secret-Password",
           database: "velocious_test",
           server: "mssql",
-          pool: {
-            max: 10,
-            min: 0,
-            idleTimeoutMillis: 30000
-          },
           options: {
             encrypt: true, // for azure
             trustServerCertificate: true // change to true for local dev / self-signed certs
@@ -48,7 +43,7 @@ export default new Configuration({
     const requireContextModels = requireContext(modelsPath, true, /^(.+)\.js$/)
     const initializerFromRequireContext = new InitializerFromRequireContext({requireContext: requireContextModels})
 
-    await configuration.withConnections(async () => {
+    await configuration.ensureConnections(async () => {
       await initializerFromRequireContext.initialize({configuration})
     })
   },
@@ -57,5 +52,6 @@ export default new Configuration({
     de: ["de", "en"],
     en: ["en", "de"]
   },
-  locales: ["de", "en"]
+  locales: ["de", "en"],
+  testing: `${dummyDirectory()}/src/config/testing.js`
 })

package/spec/dummy/src/config/testing.js

@@ -0,0 +1,62 @@
+import dummyConfiguration from "./configuration.js"
+
+beforeEach(async ({testArgs}) => {
+  const transaction = testArgs.databaseCleaning?.transaction
+
+  if (transaction === undefined) {
+    const dbs = dummyConfiguration.getCurrentConnections()
+
+    for (const dbIdentifier in dbs) {
+      const db = dbs[dbIdentifier]
+
+      await db.startTransaction()
+    }
+  }
+})
+
+afterEach(async ({testArgs}) => {
+  const transaction = testArgs.databaseCleaning?.transaction
+  const truncate = testArgs.databaseCleaning?.truncate
+
+  const dbs = dummyConfiguration.getCurrentConnections()
+
+  for (const dbIdentifier in dbs) {
+    const db = dbs[dbIdentifier]
+
+    if (transaction === undefined || transaction) {
+      await db.rollbackTransaction()
+    }
+
+    if (truncate) {
+      await db.withDisabledForeignKeys(async () => {
+        let tries = 0
+
+        while(true) {
+          tries++
+
+          const tables = await db.getTables()
+          const truncateErrors = []
+
+          for (const table of tables) {
+            if (table.getName() != "schema_migrations") {
+              try {
+                await table.truncate({cascade: true})
+              } catch (error) {
+                console.error(error)
+                truncateErrors.push(error)
+              }
+            }
+          }
+
+          if (truncateErrors.length == 0) {
+            break
+          } else if (tries <= 5) {
+            // Retry
+          } else {
+            throw truncateErrors[0]
+          }
+        }
+      })
+    }
+  }
+})

package/spec/dummy/src/database/migrations/20250912183605-create-users.js

@@ -0,0 +1,15 @@
+import Migration from "../../../../../src/database/migration/index.js"
+
+export default class CreateUsers extends Migration {
+  async up() {
+    await this.createTable("users", (t) => {
+      t.string("email", {index: {unique: true}, null: false})
+      t.string("encrypted_password", {null: false})
+      t.timestamps()
+    })
+  }
+
+  async down() {
+    await this.dropTable("users")
+  }
+}