Merge branch '0.12.x'

* 0.12.x: release 0.12.5 Update changelog include scripts in npm package (#1737)
knex · Oct 12, 2016 · 0949ed3 · 0949ed3
2 parents 6500b2f + fe0b71f
commit 0949ed3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,8 @@
 # Master (Unreleased)
 - Add more having* methods / join clause on* methods  #1674
 
-# 0.12.4 - 12 Oct, 2016
+# 0.12.5 - 12 Oct, 2016
+- Fix broken 0.12.4 build (removed from npm)
 - Fix #1733, #920, incorrect postgres array bindings
 
 # 0.12.3 - 9 Oct, 2016

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "knex",
-  "version": "0.12.4",
+  "version": "0.12.5",
   "description": "A batteries-included SQL query & schema builder for Postgres, MySQL and SQLite3 and the Browser",
   "main": "knex.js",
   "dependencies": {

diff --git a/src/index.js b/src/index.js
@@ -46,7 +46,7 @@ Object.defineProperties(Knex, {
         'Knex.VERSION is deprecated, you can get the module version' +
         "by running require('knex/package').version"
       )
-      return '0.12.2'
+      return '0.12.5'
     }
   },
   Promise: {

diff --git a/src/util/make-knex.js b/src/util/make-knex.js
@@ -72,7 +72,7 @@ export default function makeKnex(client) {
 
   knex.client = client
 
-  const VERSION = '0.12.2'
+  const VERSION = '0.12.5'
 
   Object.defineProperties(knex, {