feat: support knex 0.15

googleapis · Dec 13, 2018 · b654bfc · b654bfc
1 parent 32dcb55
commit b654bfc
Show file tree

Hide file tree

Showing 6 changed files with 204 additions and 209 deletions.
diff --git a/package.json b/package.json
@@ -54,6 +54,7 @@
     "@types/extend": "^3.0.0",
     "@types/glob": "^7.0.0",
     "@types/is": "0.0.21",
+    "@types/knex": "^0.15.1",
     "@types/methods": "^1.1.0",
     "@types/mocha": "^5.2.5",
     "@types/ncp": "^2.0.1",

diff --git a/src/plugins/plugin-knex.ts b/src/plugins/plugin-knex.ts
@@ -55,8 +55,8 @@ module.exports = [
     unpatch: unpatchClient
   },
   {
-    // knex 0.10.x and 0.11.x do not need patching
-    versions: '>=0.10 <=0.11'
+    // these knex versions do not need patching
+    versions: '>=0.10 <=0.11 || >=0.14 <=0.16'
   }
 ];
 

diff --git a/test/fixtures/plugin-fixtures.json b/test/fixtures/plugin-fixtures.json
@@ -95,6 +95,20 @@
     },
     "_mainModule": "knex"
   },
+  "knex0.14": {
+    "dependencies": {
+      "knex": "^0.14.0",
+      "mysql": "^2.13.0"
+    },
+    "_mainModule": "knex"
+  },
+  "knex0.16": {
+    "dependencies": {
+      "knex": "^0.16.0",
+      "mysql": "^2.13.0"
+    },
+    "_mainModule": "knex"
+  },
   "koa1": {
     "dependencies": {
       "koa": "^1.1.2"