Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/tgriesser/knex
Browse files Browse the repository at this point in the history
  • Loading branch information
kibertoad committed Apr 11, 2019
2 parents 18532b2 + f757e36 commit f28ae7a
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 19 deletions.
11 changes: 9 additions & 2 deletions CHANGELOG.md
Expand Up @@ -5,9 +5,10 @@
- Boolean param for rollback() to rollback all migrations #2968
- seed:run print the file name of the failing seed #2972 #2973
- verbose option to CLI commands #2887
- mysql warn `.returning()` does not have any effect #3039
- add intersect() #3023
- Improved format for TS stubs #3080
- MySQL: Support nullable timestamps #3100
- MySQL: Warn `.returning()` does not have any effect #3039

### Bug fixes:

Expand All @@ -16,7 +17,7 @@
- Fix fs-migrations breaking docs #3022
- Fix sqlite3 drop/renameColumn() breaks with postProcessResponse #3040
- Fix transaction support for migrations #3084
- Fix Migrator not working with TypeScript #3041
- Fix queryContext not being passed to raw queries #3111
- Typings: Allow to pass query builders, identifiers and raw in various places as parameters #2960
- Typings: toNative() definition #2996
- Typings: asCallback() definition #2963
Expand All @@ -27,9 +28,15 @@
- Typings: Update enum arguments to reflect latest signature #3043
- Typings: Add size parameter to integer method #3074
- Typings: Add 'string' as accepted Knex constructor type definition #3105
- Typings: Add boolean as a column name in join #3121
- Typings: Add missing clearOrder & clearCounters types #3109
- Dependencies: Fix security warning #3082
- Do not use unsupported column width/length arguments on data types int and tinyint in MSSQL #2738

### Changes:

- Make unionAll()'s call signature match union() #3055

### Test / internal changes:

- Swap chalk→colorette / minimist→getopts #2718
Expand Down
34 changes: 17 additions & 17 deletions package.json
Expand Up @@ -9,9 +9,9 @@
},
"dependencies": {
"@types/bluebird": "^3.5.26",
"bluebird": "^3.5.3",
"bluebird": "^3.5.4",
"colorette": "1.0.7",
"commander": "^2.19.0",
"commander": "^2.20.0",
"debug": "4.1.1",
"getopts": "2.2.3",
"inherits": "~2.0.3",
Expand All @@ -20,7 +20,7 @@
"lodash": "^4.17.11",
"mkdirp": "^0.5.1",
"pg-connection-string": "2.0.0",
"tarn": "^1.1.4",
"tarn": "^1.1.5",
"tildify": "1.2.0",
"uuid": "^3.3.2",
"v8flags": "^3.1.2"
Expand All @@ -32,10 +32,10 @@
]
},
"devDependencies": {
"@babel/cli": "^7.2.3",
"@babel/core": "^7.3.4",
"@babel/polyfill": "^7.2.5",
"@babel/preset-env": "^7.3.1",
"@babel/cli": "^7.4.3",
"@babel/core": "^7.4.3",
"@babel/polyfill": "^7.4.3",
"@babel/preset-env": "^7.4.3",
"@types/node": "^11.11.3",
"JSONStream": "^1.3.5",
"async": "^2.6.2",
Expand All @@ -45,29 +45,29 @@
"chai-subset-in-order": "^2.1.3",
"coveralls": "^3.0.3",
"cross-env": "^5.2.0",
"eslint": "5.15.1",
"eslint": "5.16.0",
"eslint-config-prettier": "^4.1.0",
"eslint-plugin-import": "^2.16.0",
"husky": "^1.3.1",
"jake": "^8.0.19",
"jake": "^8.1.1",
"json-loader": "^0.5.7",
"lint-staged": "^8.1.1",
"mocha": "^6.0.2",
"lint-staged": "^8.1.5",
"mocha": "^6.1.2",
"mock-fs": "^4.8.0",
"mssql": "^5.0.3",
"mssql": "^5.0.5",
"mysql": "^2.16.0",
"mysql2": "^1.6.5",
"nyc": "^13.3.0",
"pg": "^7.8.2",
"pg": "^7.9.0",
"pg-query-stream": "^2.0.0",
"prettier": "^1.16.2",
"prettier": "^1.16.4",
"rimraf": "^2.6.3",
"sinon": "^7.2.7",
"sinon": "^7.3.1",
"sinon-chai": "^3.3.0",
"source-map-support": "^0.5.11",
"source-map-support": "^0.5.12",
"sqlite3": "^4.0.6",
"tap-spec": "^5.0.0",
"tape": "^4.9.2",
"tape": "^4.10.1",
"through": "^2.3.8",
"toxiproxy-node-client": "^2.0.6"
},
Expand Down

0 comments on commit f28ae7a

Please sign in to comment.