Merge branch 'release/4.0.4'

adonisjs · Jul 30, 2017 · 2322b8f · 2322b8f
2 parents d119d4b + ad0afe4
commit 2322b8f
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 140 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+<a name="4.0.4"></a>
+## [4.0.4](https://github.com/adonisjs/adonis-lucid/compare/v4.0.3...v4.0.4) (2017-07-30)
+
+
+### Bug Fixes
+
+* **model:** set makePlain getter for ioc container ([40b3e85](https://github.com/adonisjs/adonis-lucid/commit/40b3e85))
+
+
+### Features
+
+* **migration:** remove migration:make command ([0a97527](https://github.com/adonisjs/adonis-lucid/commit/0a97527))
+
+
+
 <a name="4.0.3"></a>
 ## [4.0.3](https://github.com/adonisjs/adonis-lucid/compare/v4.0.2...v4.0.3) (2017-07-17)
 

diff --git a/commands/MigrationMake.js b/commands/MigrationMake.js
diff --git a/commands/templates/make.mustache b/commands/templates/make.mustache
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/lucid",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "description": "SQL ORM built on top of Active Record pattern",
   "main": "index.js",
   "scripts": {

diff --git a/src/Database/index.js b/src/Database/index.js
@@ -50,7 +50,7 @@ const proxyHandler = {
  */
 class Database {
   constructor (config) {
-    if (config.client === 'sqlite') {
+    if (config.client === 'sqlite' || config.client === 'sqlite3') {
       config.useNullAsDefault = _.defaultTo(config.useNullAsDefault, true)
     }
     this.knex = knex(config)

diff --git a/src/Lucid/Hooks/index.js b/src/Lucid/Hooks/index.js
@@ -66,7 +66,7 @@ class Hooks {
    */
   addHandler (event, handler, name) {
     if (!this._events[event]) {
-      // error
+      throw CE.InvalidArgumentException.invalidParameter(`${event} is not a valid hook event`)
     }
     this._handlers[event] = this._handlers[event] || []
     this._handlers[event].push({ handler, name })

diff --git a/src/Lucid/Model/index.js b/src/Lucid/Model/index.js
@@ -66,6 +66,19 @@ class Model extends BaseModel {
     return ['_bootIfNotBooted']
   }
 
+  /**
+   * Making sure that `ioc.make` returns
+   * the class object and not it's
+   * instance
+   *
+   * @method makePlain
+   *
+   * @return {Boolean}
+   */
+  static get makePlain () {
+    return true
+  }
+
   /**
    * The primary key for the model. You can change it
    * to anything you want, just make sure that the