Prepare to release 0.20.11 (#3689)

knex · Mar 5, 2020 · 85888ce · 85888ce
1 parent b80966a
commit 85888ce
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Master (Unreleased)
 
+# 0.20.11 - 26 February, 2020
+
+### New features:
+
+- Oracle: Add OracleDB handling for buffer type in fetchAsString #3685
+
+### Bug fixes:
+
+- Fix race condition in non-container transactions #3671
+
+### Typings:
+
+- Mark knex arguments of composite/collection types to be readonly #3680
+
+### Test / internal changes:
+
+- Remove dependency on bluebird methods from sources #3683
+- Cleanup and extract Transaction Workflow logic #3674
+
 # 0.20.10 - 13 February, 2020
 
 ### Bug fixes:

diff --git a/lib/query/compiler.js b/lib/query/compiler.js
@@ -70,7 +70,7 @@ class QueryCompiler {
       cancelOnTimeout: this.cancelOnTimeout,
       bindings: this.formatter.bindings || [],
       __knexQueryUid: uuid.v1(),
-    }
+    };
 
     Object.defineProperties(query, {
       toNative: {
@@ -100,9 +100,9 @@ class QueryCompiler {
       debugBindings(query.bindings);
       throw new Error(
         `Undefined binding(s) detected when compiling ` +
-        `${method.toUpperCase()}. Undefined column(s): [${this.undefinedBindingsInfo.join(
-          ', '
-        )}] query: ${query.sql}`
+          `${method.toUpperCase()}. Undefined column(s): [${this.undefinedBindingsInfo.join(
+            ', '
+          )}] query: ${query.sql}`
       );
     }
 
@@ -131,7 +131,6 @@ class QueryCompiler {
     };
   }
 
-
   // Compiles an "insert" query, allowing for multiple
   // inserts using a single query statement.
   insert() {
@@ -592,7 +591,7 @@ class QueryCompiler {
     clause.value.call(wrapJoin, wrapJoin);
 
     let sql = '';
-    wrapJoin.clauses.forEach(function (wrapClause, ii) {
+    wrapJoin.clauses.forEach(function(wrapClause, ii) {
       if (ii > 0) {
         sql += ` ${wrapClause.bool} `;
       }
@@ -814,8 +813,8 @@ class QueryCompiler {
     while (++i < columns.length) {
       vals.push(
         this.formatter.wrap(columns[i]) +
-        ' = ' +
-        this.formatter.parameter(data[columns[i]])
+          ' = ' +
+          this.formatter.parameter(data[columns[i]])
       );
     }
 
@@ -875,7 +874,7 @@ class QueryCompiler {
 
       this._tableName = tableName
         ? // Wrap subQuery with parenthesis, #3485
-        this.formatter.wrap(tableName, tableName instanceof QueryBuilder)
+          this.formatter.wrap(tableName, tableName instanceof QueryBuilder)
         : '';
     }
     return this._tableName;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "knex",
-  "version": "0.20.10",
+  "version": "0.20.11",
   "description": "A batteries-included SQL query & schema builder for Postgres, MySQL and SQLite3 and the Browser",
   "main": "knex.js",
   "types": "types/index.d.ts",
@@ -41,14 +41,14 @@
     "pg-connection-string": "2.1.0",
     "tarn": "^2.0.0",
     "tildify": "2.0.0",
-    "uuid": "^3.4.0",
+    "uuid": "^7.0.1",
     "v8flags": "^3.1.3"
   },
   "peerDependencies": {
-    "mssql": "^5.1.0",
-    "mysql": "^2.17.1",
+    "mssql": "^6.1.0",
+    "mysql": "^2.18.1",
     "mysql2": "^2.1.0",
-    "pg": "^7.17.0",
+    "pg": "^7.18.2",
     "sqlite3": "^4.1.1"
   },
   "peerDependenciesMeta": {
@@ -75,41 +75,41 @@
     ]
   },
   "devDependencies": {
-    "@types/node": "^10.17.15",
+    "@types/node": "^13.7.7",
     "JSONStream": "^1.3.5",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
-    "chai-subset-in-order": "^2.1.3",
+    "chai-subset-in-order": "^2.1.4",
     "cli-testlab": "^1.10.0",
     "coveralls": "^3.0.9",
     "cross-env": "^6.0.3",
     "dtslint": "2.0.2",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.10.0",
     "eslint-plugin-import": "^2.20.1",
-    "husky": "^4.2.1",
+    "husky": "^4.2.3",
     "jake": "^8.1.1",
     "lint-staged": "^9.5.0",
     "mocha": "^7.0.1",
-    "mock-fs": "^4.10.4",
-    "mssql": "^5.1.0",
+    "mock-fs": "^4.11.0",
+    "mssql": "^6.1.0",
     "mysql": "^2.18.1",
     "mysql2": "^2.1.0",
     "nyc": "^15.0.0",
-    "pg": "^7.18.1",
+    "pg": "^7.18.2",
     "pg-query-stream": "^2.1.2",
     "prettier": "1.18.2",
     "rimraf": "^3.0.2",
-    "sinon": "^8.1.1",
-    "sinon-chai": "^3.4.0",
+    "sinon": "^9.0.0",
+    "sinon-chai": "^3.5.0",
     "source-map-support": "^0.5.16",
     "sqlite3": "^4.1.1",
     "tap-spec": "^5.0.0",
     "tape": "^4.13.0",
     "toxiproxy-node-client": "^2.0.6",
     "ts-node": "^8.6.2",
     "typescript": "3.7.4",
-    "webpack-cli": "^3.3.1"
+    "webpack-cli": "^3.3.11"
   },
   "buildDependencies": [
     "rimraf"