knex
Advanced tools
Comparing version 0.21.8 to 0.21.9
@@ -355,6 +355,2 @@ #!/usr/bin/env node | ||
if (!process.argv.slice(2).length) { | ||
commander.outputHelp(); | ||
} | ||
commander.parse(process.argv); | ||
@@ -361,0 +357,0 @@ } |
# Master (Unreleased) | ||
# 0.21.9 - 27 October, 2020 | ||
### New features: | ||
- add method clear(statement) to QueryBuilder #4051 | ||
### Bug fixes: | ||
- CLI: fix help text being printed twice #4072 | ||
- Oracle: columnInfo() no longer requires an Owner User #4053 | ||
- Add missing "start" event propagation from transaction #4087 | ||
# 0.21.8 - 27 October, 2020 | ||
@@ -4,0 +16,0 @@ |
@@ -130,4 +130,4 @@ /* eslint max-len:0 */ | ||
? ` returning ROWID into ${this.formatter.parameter( | ||
returningHelper | ||
)}` | ||
returningHelper | ||
)}` | ||
: ''; | ||
@@ -229,3 +229,3 @@ | ||
select char_col_decl_length, column_name, data_type, data_default, nullable | ||
from user_tab_columns where table_name = ''${table}'' ') | ||
from all_tab_columns where table_name = ''${table}'' ') | ||
columns | ||
@@ -232,0 +232,0 @@ CHAR_COL_DECL_LENGTH number, COLUMN_NAME varchar2(200), DATA_TYPE varchar2(106), |
@@ -38,3 +38,3 @@ // Oracle Schema Compiler | ||
const sql = | ||
`select COLUMN_NAME from USER_TAB_COLUMNS ` + | ||
`select COLUMN_NAME from ALL_TAB_COLUMNS ` + | ||
`where TABLE_NAME = ${this.formatter.parameter(tableName)} ` + | ||
@@ -41,0 +41,0 @@ `and COLUMN_NAME = ${this.formatter.parameter(column)}`; |
@@ -967,3 +967,2 @@ // Builder | ||
this._single.counter = {}; | ||
return this; | ||
@@ -1008,3 +1007,3 @@ }, | ||
// Remove everything from select clause | ||
// Deprecated. Remove everything from select clause | ||
clearSelect() { | ||
@@ -1015,3 +1014,3 @@ this._clearGrouping('columns'); | ||
// Remove everything from where clause | ||
// Deprecated. Remove everything from where clause | ||
clearWhere() { | ||
@@ -1022,3 +1021,3 @@ this._clearGrouping('where'); | ||
// Remove everything from group clause | ||
// Deprecated. Remove everything from group clause | ||
clearGroup() { | ||
@@ -1029,3 +1028,3 @@ this._clearGrouping('group'); | ||
// Remove everything from order clause | ||
// Deprecated. Remove everything from order clause | ||
clearOrder() { | ||
@@ -1036,3 +1035,3 @@ this._clearGrouping('order'); | ||
// Remove everything from having clause | ||
// Deprecated. Remove everything from having clause | ||
clearHaving() { | ||
@@ -1043,2 +1042,12 @@ this._clearGrouping('having'); | ||
// Remove everything from statement clause | ||
clear(statement) { | ||
if(!['with', 'select', 'columns', 'where', 'union', 'join', 'group', 'order', 'having', 'limit', 'offset', 'counter', 'counters'].includes(statement)) | ||
throw new Error(`Knex Error: unknown statement '${statement}'`); | ||
if(statement.startsWith('counter')) return this.clearCounters(); | ||
if(statement === 'select') { statement = 'columns'; } | ||
this._clearGrouping(statement); | ||
return this; | ||
}, | ||
// Insert & Update | ||
@@ -1247,3 +1256,7 @@ // ------ | ||
_clearGrouping(grouping) { | ||
this._statements = reject(this._statements, { grouping }); | ||
if(grouping in this._single) { | ||
this._single[grouping] = undefined; | ||
} else { | ||
this._statements = reject(this._statements, { grouping }); | ||
} | ||
}, | ||
@@ -1250,0 +1263,0 @@ |
@@ -298,2 +298,7 @@ // Transaction | ||
trxClient.on('start', function (arg) { | ||
trx.emit('start', arg); | ||
client.emit('start', arg); | ||
}); | ||
trxClient.on('query', function (arg) { | ||
@@ -300,0 +305,0 @@ trx.emit('query', arg); |
{ | ||
"name": "knex", | ||
"version": "0.21.8", | ||
"version": "0.21.9", | ||
"description": "A batteries-included SQL query & schema builder for Postgres, MySQL and SQLite3 and the Browser", | ||
@@ -85,3 +85,3 @@ "main": "knex.js", | ||
"chai-subset-in-order": "^2.1.4", | ||
"cli-testlab": "^2.0.0", | ||
"cli-testlab": "^2.1.1", | ||
"coveralls": "^3.1.0", | ||
@@ -88,0 +88,0 @@ "cross-env": "^7.0.2", |
Sorry, the diff of this file is too big to display
592489
15439