Merge branch 'release/4.0.19'

adonisjs · Oct 1, 2017 · 843a032 · 843a032
2 parents e2b6e0e + 649a029
commit 843a032
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+<a name="4.0.19"></a>
+## [4.0.19](https://github.com/adonisjs/adonis-lucid/compare/v4.0.18...v4.0.19) (2017-10-01)
+
+
+### Bug Fixes
+
+* **migration:** make table when getting migration status ([ac33a52](https://github.com/adonisjs/adonis-lucid/commit/ac33a52))
+* **migration:status:** set batch to empty string over null ([7ebca55](https://github.com/adonisjs/adonis-lucid/commit/7ebca55))
+
+
+### BREAKING CHANGES
+
+* **migration:status:** Closes #180
+
+
+
 <a name="4.0.18"></a>
 ## [4.0.18](https://github.com/adonisjs/adonis-lucid/compare/v4.0.17...v4.0.18) (2017-09-25)
 

diff --git a/commands/MigrationStatus.js b/commands/MigrationStatus.js
@@ -47,7 +47,7 @@ class MigrationStatus extends BaseMigration {
       const migrations = await this.migration.status(this._getSchemaFiles())
       const head = ['File name', 'Migrated', 'Batch']
       const body = migrations.map((migration) => {
-        return [migration.name, migration.migrated ? 'Yes' : 'No', migration.batch]
+        return [migration.name, migration.migrated ? 'Yes' : 'No', migration.batch || '']
       })
       this.table(head, body)
     } catch (error) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/lucid",
-  "version": "4.0.18",
+  "version": "4.0.19",
   "description": "SQL ORM built on top of Active Record pattern",
   "main": "index.js",
   "scripts": {

diff --git a/src/Migration/index.js b/src/Migration/index.js
@@ -436,6 +436,8 @@ class Migration {
    * @return {Object}
    */
   async status (schemas) {
+    await this._makeMigrationsTable()
+
     const migrated = await this.db
       .table(this._migrationsTable)
       .orderBy('name')