objection
Advanced tools
Comparing version 0.6.0-rc.1 to 0.6.0-rc.2
@@ -45,3 +45,3 @@ 'use strict'; | ||
WrappingQueryBuilderOperation.prototype.call = function call(builder, args) { | ||
var ret = wrapArgs(builder, args); | ||
var ret = wrapArgs(this, builder, args); | ||
this.args = args; | ||
@@ -57,3 +57,3 @@ return ret; | ||
function wrapArgs(builder, args) { | ||
function wrapArgs(op, builder, args) { | ||
var skipUndefined = builder.shouldSkipUndefined(); | ||
@@ -69,3 +69,3 @@ var knex = builder.knex(); | ||
} else { | ||
throw new Error('undefined passed as argument #' + l + ' for \'' + this.name + '\' operation. Call skipUndefined() method to ignore the undefined values.'); | ||
throw new Error('undefined passed as argument #' + l + ' for \'' + op.name + '\' operation. Call skipUndefined() method to ignore the undefined values.'); | ||
} | ||
@@ -79,3 +79,3 @@ } else if (arg instanceof _QueryBuilderBase2.default) { | ||
} else if (includesUndefined(arg)) { | ||
throw new Error('undefined passed as an item in argument #' + l + ' for \'' + this.name + '\' operation. Call skipUndefined() method to ignore the undefined values.'); | ||
throw new Error('undefined passed as an item in argument #' + l + ' for \'' + op.name + '\' operation. Call skipUndefined() method to ignore the undefined values.'); | ||
} | ||
@@ -82,0 +82,0 @@ } else if (typeof arg === 'function') { |
{ | ||
"name": "objection", | ||
"version": "0.6.0-rc.1", | ||
"version": "0.6.0-rc.2", | ||
"description": "An SQL-friendly ORM for Node.js", | ||
@@ -5,0 +5,0 @@ "main": "lib/objection.js", |
@@ -13,3 +13,3 @@ import QueryBuilderBase from '../QueryBuilderBase'; | ||
call(builder, args) { | ||
const ret = wrapArgs(builder, args); | ||
const ret = wrapArgs(this, builder, args); | ||
this.args = args; | ||
@@ -20,3 +20,3 @@ return ret; | ||
function wrapArgs(builder, args) { | ||
function wrapArgs(op, builder, args) { | ||
const skipUndefined = builder.shouldSkipUndefined(); | ||
@@ -32,3 +32,3 @@ const knex = builder.knex(); | ||
} else { | ||
throw new Error(`undefined passed as argument #${l} for '${this.name}' operation. Call skipUndefined() method to ignore the undefined values.`); | ||
throw new Error(`undefined passed as argument #${l} for '${op.name}' operation. Call skipUndefined() method to ignore the undefined values.`); | ||
} | ||
@@ -42,3 +42,3 @@ } else if (arg instanceof QueryBuilderBase) { | ||
} else if (includesUndefined(arg)) { | ||
throw new Error(`undefined passed as an item in argument #${l} for '${this.name}' operation. Call skipUndefined() method to ignore the undefined values.`); | ||
throw new Error(`undefined passed as an item in argument #${l} for '${op.name}' operation. Call skipUndefined() method to ignore the undefined values.`); | ||
} | ||
@@ -45,0 +45,0 @@ } else if (typeof arg === 'function') { |
699761