Merge branch 'release-3.0.12'

adonisjs · Dec 15, 2016 · aa2466d · aa2466d
2 parents e7b7e2b + e8ef3cb
commit aa2466d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="3.0.12"></a>
+## [3.0.12](https://github.com/adonisjs/adonis-lucid/compare/v3.0.11...v3.0.12) (2016-12-15)
+
+
+### Bug Fixes
+
+* **database:** rename pluck to pluckAll ([410f700](https://github.com/adonisjs/adonis-lucid/commit/410f700)), closes [#81](https://github.com/adonisjs/adonis-lucid/issues/81)
+
+
+
 <a name="3.0.11"></a>
 ## [3.0.11](https://github.com/adonisjs/adonis-lucid/compare/v3.0.10...v3.0.11) (2016-12-12)
 

diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "directories": {
     "test": "test"
   },
-  "version": "3.0.11",
+  "version": "3.0.12",
   "scripts": {
     "lint": "standard",
     "test:all": "DB=sqlite3 npm run test && DB=mysql npm run test && DB=pg npm run test",

diff --git a/src/Database/index.js b/src/Database/index.js
@@ -404,7 +404,7 @@ Database.withPrefix = function (prefix) {
   return this
 }
 
-Database.pluck = function (fields) {
+Database.pluckAll = function (fields) {
   const args = _.isArray(fields) ? fields : _.toArray(arguments)
   return this.select.apply(this, args)
 }
@@ -428,7 +428,7 @@ QueryBuilder.prototype.from = Database.table
 QueryBuilder.prototype.into = Database.table
 QueryBuilder.prototype.withPrefix = Database.withPrefix
 QueryBuilder.prototype.withoutPrefix = Database.withoutPrefix
-QueryBuilder.prototype.pluck = Database.pluck
+QueryBuilder.prototype.pluckAll = Database.pluckAll
 
 /**
  * Proxy handler to proxy methods and send

diff --git a/test/unit/database.spec.js b/test/unit/database.spec.js
@@ -271,8 +271,8 @@ describe('Database provider', function () {
     expect(callbackCalledForTimes).to.equal(allUsers.length)
   })
 
-  it('should be able to pluck multiple fields using the pluck method', function * () {
-    const users = yield Database.table('users').withoutPrefix().pluck('id', 'username')
+  it('should be able to pluck multiple fields using the pluckAll method', function * () {
+    const users = yield Database.table('users').withoutPrefix().pluckAll('id', 'username')
     expect(users[0]).to.have.property('id')
     expect(users[0]).to.have.property('username')
   })

diff --git a/test/unit/migrations.spec.js b/test/unit/migrations.spec.js
@@ -471,8 +471,8 @@ describe('Migrations', function () {
       }
     }
 
-    const migrationsB1 = {'2016-01-30_create_users_table': User}
-    const migrationsB2 = {'2016-01-30_create_accouts_table': Account}
+    const migrationsB1 = {'2016-01-30_create_accounts_table': Account}
+    const migrationsB2 = {'2016-01-30_create_users_table': User}
     let allMigs = {}
     _.merge(allMigs, migrationsB1, migrationsB2)
     const Runner = new Migrations(Database, Config)