velocious 1.0.33 → 1.0.35

package/README.md

@@ -1,7 +1,5 @@
 # README
 
-This is still work in progress.
-
 * Concurrent multi threadded web server
 * Database framework ala Rails
 * Database models ala Rails
@@ -19,23 +17,29 @@ npm install velocious
 npx velocious init
 ```
 
-# Migrations
+# Models
 
 ```bash
-npx velocious g:migration create_tasks
+npx velocious g:model Account
+npx velocious g:model Task
 ```
 
-```bash
-npx velocious db:migrate
-```
+```js
+import Record from "velocious/src/database/record/index.js"
 
-# Models
+class Task extends Record {
+}
 
-```bash
-npx velocious g:model Task
+Task.belongsTo("account")
+Task.translates("description", "subTitle", "title")
+
+export default Task
 ```
 
 # Migrations
+
+Make a new migration from a template like this:
+
 ```bash
 npx velocious g:migration create-tasks
 ```
@@ -66,7 +70,12 @@ export default class CreateEvents extends Migration {
 }
 ```
 
-Run migrations from anywhere
+Run migrations from the command line like this:
+```bash
+npx velocious db:migrate
+```
+
+Run migrations from anywhere if you want to:
 
 ```js
 const migrationsPath = `/some/dir/migrations`
@@ -88,6 +97,8 @@ import {Task} from "@/src/models/task"
 const tasks = await Task
   .preload({project: {account: true}})
   .where({projects: {public: true}})
+  .order("name")
+  .limit(5)
   .toArray()
 ```
 
@@ -104,7 +115,7 @@ If you are developing on Velocious, you can run the tests with:
 npm run test
 ```
 
-# Writing a require test
+# Writing a request test
 
 First create a test file under something like the following path 'src/routes/accounts/create-test.js' with something like the following content:
 

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "main": "index.js",
   "scripts": {
     "test": "jasmine",
@@ -45,6 +45,6 @@
     "sql-escape-string": "^1.1.0",
     "sql.js": "^1.12.0",
     "strftime": "^0.10.2",
-    "uuid": "^11.1.0"
+    "uuid": "^12.0.0"
   }
 }

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

@@ -0,0 +1,10 @@
+import Record from "../../../src/database/record/index.js"
+
+class EventSeries extends Record {
+}
+
+describe("Record - translations", () => {
+  it("handles difficult table names", async () => {
+    expect(EventSeries.getTranslationsTableName()).toEqual("event_series_translations")
+  })
+})

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

@@ -14,9 +14,9 @@ export default class VelociousDatabaseQueryAlterTableBase extends QueryBase {
     const sqls = []
 
     for (const column of this.columns) {
-      let sql = `ALTER TABLE ${this.driver.quoteTable(this.tableName)} ADD `
+      let sql = `ALTER TABLE ${this.getOptions().quoteTableName(this.tableName)} ADD `
 
-      sql += this.driver.quoteColumn(column.getName())
+      sql += this.getOptions().quoteColumnName(column.getName())
 
       sqls.push(sql)
     }

package/src/database/record/index.js

@@ -395,10 +395,9 @@ export default class VelociousDatabaseRecord {
     const className = `${this.name}Translation`
     const TranslationClass = class Translation extends VelociousDatabaseRecord {}
     const belongsTo = `${inflection.camelize(inflection.singularize(this.tableName()), true)}`
-    const tableName = `${inflection.singularize(this.tableName())}_translations`
 
     Object.defineProperty(TranslationClass, "name", {value: className})
-    TranslationClass.setTableName(tableName)
+    TranslationClass.setTableName(this.getTranslationsTableName())
     TranslationClass.belongsTo(belongsTo)
 
     this._translationClass = TranslationClass
@@ -407,7 +406,11 @@ export default class VelociousDatabaseRecord {
   }
 
   static getTranslationsTableName() {
-    return `${inflection.singularize(this.tableName())}_translations`
+    const tableNameParts = this.tableName().split("_")
+
+    tableNameParts[tableNameParts.length - 1] = inflection.singularize(tableNameParts[tableNameParts.length - 1])
+
+    return `${tableNameParts.join("_")}_translations`
   }
 
   static async hasTranslationsTable() {