velocious 1.0.74 → 1.0.76

package/package.json

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

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

@@ -106,6 +106,13 @@ export default class VelociousDatabaseDriversSqliteBase extends Base {
     return false
   }
 
+  supportsInsertIntoReturning() {
+    if (this.versionMajor >= 4) return true
+    if (this.versionMajor == 3 && this.versionMinor >= 35) return true
+
+    return false
+  }
+
   async insertMultipleWithSingleInsert(tableName, columns, rows) {
     const sql = new Insert({columns, driver: this, rows, tableName}).toSql()
 

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

@@ -1,7 +1,7 @@
 import restArgsError from "../../utils/rest-args-error.js"
 
 export default class VelociousDatabaseQueryInsertBase {
-  constructor({columns, data, driver, multiple, tableName, returnLastInsertedColumnName, rows, ...restArgs}) {
+  constructor({columns, data, driver, multiple, tableName, returnLastInsertedColumnNames, rows, ...restArgs}) {
     if (!driver) throw new Error("No driver given to insert base")
     if (!tableName) throw new Error(`Invalid table name given to insert base: ${tableName}`)
 
@@ -11,7 +11,7 @@ export default class VelociousDatabaseQueryInsertBase {
     this.data = data
     this.driver = driver
     this.multiple = multiple
-    this.returnLastInsertedColumnName = returnLastInsertedColumnName
+    this.returnLastInsertedColumnNames = returnLastInsertedColumnNames
     this.rows = rows
     this.tableName = tableName
   }
@@ -27,15 +27,35 @@ export default class VelociousDatabaseQueryInsertBase {
     let count = 0
     let columns, lastInsertedSQL
 
-    if (this.returnLastInsertedColumnName) {
+    if (this.returnLastInsertedColumnNames) {
       if (driver.getType() == "mssql") {
-        lastInsertedSQL = ` OUTPUT INSERTED.${driver.quoteColumn(this.returnLastInsertedColumnName)} AS lastInsertID`
+        lastInsertedSQL = ` OUTPUT `
+
+        for (let i = 0; i < this.returnLastInsertedColumnNames.length; i++) {
+          const columnName = this.returnLastInsertedColumnNames[i]
+
+          if (i > 0) {
+            lastInsertedSQL += ", "
+          }
+
+          lastInsertedSQL += ` INSERTED.${driver.quoteColumn(columnName)}`
+        }
 
         if (Object.keys(this.data).length <= 0) {
           sql += lastInsertedSQL
         }
-      } else if (driver.getType() == "mysql" || driver.getType() == "pgsql") {
-        lastInsertedSQL = ` RETURNING ${driver.quoteColumn(this.returnLastInsertedColumnName)} AS lastInsertID`
+      } else if (driver.getType() == "mysql" || driver.getType() == "pgsql" || (driver.getType() == "sqlite" && driver.supportsInsertIntoReturning())) {
+        lastInsertedSQL = " RETURNING "
+
+        for (let i = 0; i < this.returnLastInsertedColumnNames.length; i++) {
+          const columnName = this.returnLastInsertedColumnNames[i]
+
+          if (i > 0) {
+            lastInsertedSQL += ", "
+          }
+
+          lastInsertedSQL += ` ${driver.quoteColumn(columnName)}`
+        }
       }
     }
 
@@ -60,7 +80,7 @@ export default class VelociousDatabaseQueryInsertBase {
       sql += ")"
     }
 
-    if (this.returnLastInsertedColumnName && driver.getType() == "mssql" && Object.keys(this.data).length > 0) {
+    if (this.returnLastInsertedColumnNames && driver.getType() == "mssql" && Object.keys(this.data).length > 0) {
       sql += lastInsertedSQL
     }
 
@@ -88,8 +108,8 @@ export default class VelociousDatabaseQueryInsertBase {
       }
     }
 
-    if (this.returnLastInsertedColumnName) {
-      if (driver.getType() == "mysql") {
+    if (this.returnLastInsertedColumnNames) {
+      if (driver.getType() == "pgsql" || driver.getType() == "mysql" || (driver.getType() == "sqlite" && driver.supportsInsertIntoReturning())) {
         sql += lastInsertedSQL
       }
     }

package/src/database/record/index.js

@@ -398,6 +398,14 @@ class VelociousDatabaseRecord {
     return this._columns
   }
 
+  static getColumnNames() {
+    if (!this._columnNames) {
+      this._columnNames = this.getColumns().map((column) => column.getName())
+    }
+
+    return this._columnNames
+  }
+
   static _getTable() {
     if (!this._table) throw new Error(`${this.name} hasn't been initialized yet`)
 
@@ -959,21 +967,24 @@ class VelociousDatabaseRecord {
     if (createdAtColumn) data.created_at = currentDate
     if (updatedAtColumn) data.updated_at = currentDate
 
+    const columnNames = this.constructor.getColumnNames()
     const sql = this._connection().insertSql({
-      returnLastInsertedColumnName: this.constructor.primaryKey(),
+      returnLastInsertedColumnNames: columnNames,
       tableName: this._tableName(),
       data
     })
     const insertResult = await this._connection().query(sql)
-    let id
+    const primaryKey = this.constructor.primaryKey()
 
-    if (insertResult && insertResult[0]?.lastInsertID) {
-      id = insertResult[0]?.lastInsertID
+    if (insertResult && insertResult[0][primaryKey]) {
+      this._attributes = insertResult[0]
+      this._changes = {}
     } else {
-      id = await this._connection().lastInsertID()
+      const id = await this._connection().lastInsertID()
+
+      await this._reloadWithId(id)
     }
 
-    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.