Comparing version 1.0.4 to 1.1.0
@@ -321,3 +321,3 @@ /* SQB | ||
* Creates an executable InsertQuery associated with this connection. | ||
* @param {...String|TableColumn} column | ||
* @param {...String|SelectColumn} column | ||
* @return {InsertQuery} | ||
@@ -324,0 +324,0 @@ */ |
@@ -240,3 +240,3 @@ /* SQB | ||
* Creates an executable InsertQuery associated with this pool. | ||
* @param {...String|TableColumn} column | ||
* @param {...String|SelectColumn} column | ||
* @return {InsertQuery} | ||
@@ -243,0 +243,0 @@ */ |
@@ -38,3 +38,2 @@ /* SQB | ||
Join: require('./sqlobject/Join'), | ||
TableColumn: require('./sqlobject/TableColumn'), | ||
@@ -41,0 +40,0 @@ select: function(column) { |
@@ -18,3 +18,3 @@ /* SQB | ||
const TableName = require('../sqlobject/TableName'); | ||
const TableColumn = require('../sqlobject/TableColumn'); | ||
const SelectColumn = require('../sqlobject/SelectColumn'); | ||
const OrderColumn = require('../sqlobject/OrderColumn'); | ||
@@ -66,3 +66,3 @@ const GroupColumn = require('../sqlobject/GroupColumn'); | ||
else if (arg) { | ||
this._columns.push(arg.isSerializable ? arg : new TableColumn(arg)); | ||
this._columns.push(arg.isSerializable ? arg : new SelectColumn(arg)); | ||
} | ||
@@ -192,3 +192,3 @@ } | ||
const o = { | ||
columns: serializeTableColumns(this, ctx), | ||
columns: serializeSelectColumns(this, ctx), | ||
from: serializeFrom(this, ctx), | ||
@@ -240,3 +240,3 @@ join: serializeJoins(this, ctx), | ||
function serializeTableColumns(query, ctx) { | ||
function serializeSelectColumns(query, ctx) { | ||
const arr = []; | ||
@@ -243,0 +243,0 @@ if (query._columns) |
@@ -16,3 +16,3 @@ /* SQB | ||
const GROUP_COLUMN_PATTERN = /^((?:[a-zA-Z][\w$]*\.){0,2}) *([a-zA-Z][\w$]*|\*)$/; | ||
const GROUP_COLUMN_PATTERN = /^((?:[a-zA-Z][\w$]*\.){0,2})([a-zA-Z][\w$]*)$/; | ||
@@ -19,0 +19,0 @@ /** |
@@ -44,2 +44,3 @@ /* SQB | ||
const o = { | ||
operatorType: this.operatorType, | ||
expression: | ||
@@ -55,4 +56,3 @@ this._expression.isSerializable ? | ||
const self = this; | ||
return Serializable.serializeFallback(ctx, 'operator_' + | ||
self.operatorType, o, function() { | ||
return Serializable.serializeFallback(ctx, 'operator', o, function() { | ||
return self.__serialize(ctx, o); | ||
@@ -59,0 +59,0 @@ }); |
{ | ||
"name": "sqb", | ||
"description": "Extensible, multi-dialect SQL query builder and Database connection framework for JavaScript", | ||
"version": "1.0.4", | ||
"version": "1.1.0", | ||
"author": "Panates Ltd.", | ||
@@ -29,3 +29,3 @@ "contributors": [ | ||
"putil-isplainobject": "^1.0.1", | ||
"putil-merge": "^1.1.5", | ||
"putil-merge": "^1.2.0", | ||
"putil-promisify": "^1.1.0", | ||
@@ -36,7 +36,7 @@ "putil-taskqueue": "^1.3.1", | ||
"devDependencies": { | ||
"babel-eslint": "^8.2.1", | ||
"eslint": "^4.15.0", | ||
"babel-eslint": "^8.2.2", | ||
"eslint": "^4.18.1", | ||
"eslint-config-google": "^0.9.1", | ||
"istanbul": "^0.4.5", | ||
"mocha": "^4.1.0" | ||
"mocha": "^5.0.1" | ||
}, | ||
@@ -43,0 +43,0 @@ "engines": { |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
126034
4265
Updatedputil-merge@^1.2.0