Comparing version 3.6.1 to 3.7.0
@@ -285,3 +285,3 @@ /* SQB | ||
merge.descriptor(Connection.prototype, sqlObjects); | ||
merge(Connection.prototype, sqlObjects, {descriptor: true, functions: true}); | ||
@@ -288,0 +288,0 @@ /** |
@@ -63,3 +63,3 @@ /* SQB | ||
typeof query.generate === 'function') { | ||
let o = merge.clone(this.pool.config); | ||
let o = merge({}, this.pool.config); | ||
o.values = options.values; | ||
@@ -66,0 +66,0 @@ o.prettyPrint = options.prettyPrint != null ? options.prettyPrint : |
@@ -83,7 +83,7 @@ /* SQB | ||
pool && pool.config.defaults) | ||
merge.deep(ctx, pool.config.defaults); | ||
merge(ctx, pool.config.defaults, {deep: true}); | ||
if (options) | ||
merge.deep(ctx, options); | ||
merge(ctx, options, {deep: true}); | ||
ctx.values = ctx.values || | ||
(this._values ? merge.clone.deep(this._values) : {}); | ||
(this._values ? merge({}, this._values) : {}); | ||
/* create serialization extension */ | ||
@@ -90,0 +90,0 @@ ctx.extension = extensions.createSerializer(ctx); |
{ | ||
"name": "sqb", | ||
"description": "Extensible, multi-dialect SQL query builder and Database connection framework for JavaScript", | ||
"version": "3.6.1", | ||
"version": "3.7.0", | ||
"author": "Panates Ltd.", | ||
@@ -31,3 +31,3 @@ "contributors": [ | ||
"putil-isplainobject": "^1.0.1", | ||
"putil-merge": "^2.2.0", | ||
"putil-merge": "^3.1.3", | ||
"putil-promisify": "^1.3.0", | ||
@@ -39,3 +39,3 @@ "putil-taskqueue": "^2.1.2", | ||
"babel-eslint": "^10.0.1", | ||
"eslint": "^5.11.1", | ||
"eslint": "^5.12.0", | ||
"eslint-config-google": "^0.11.0", | ||
@@ -42,0 +42,0 @@ "mocha": "^5.2.0", |
120700
- Removedputil-merge@2.2.0(transitive)
Updatedputil-merge@^3.1.3