Comparing version 0.43.1 to 0.43.2
@@ -653,2 +653,3 @@ 'use strict'; | ||
if(columnNode.aggregator !== 'COUNT') { | ||
var tableName = txt.join(''); | ||
for (var i = 0; i < table.columns.length; ++i) { | ||
@@ -658,6 +659,11 @@ var col = table.columns[i]; | ||
hasAliases = hasAliases || aliased; | ||
allCols.push(this.quote(col.name) + (aliased ? ' AS ' + this.quote(col.alias || col.property) : '')); | ||
allCols.push(tableName + this.quote(col.name) + (aliased ? ' AS ' + this.quote(col.alias || col.property) : '')); | ||
} | ||
} | ||
txt.push(hasAliases ? allCols.join(', ') : '*'); | ||
if(hasAliases) { | ||
txt = [allCols.join(', ')]; | ||
} | ||
else { | ||
txt.push('*'); | ||
} | ||
} | ||
@@ -664,0 +670,0 @@ else { |
@@ -183,2 +183,5 @@ 'use strict'; | ||
var args = sliced(arguments); | ||
if (o.length == 0) { | ||
o = {}; | ||
} | ||
// object literal | ||
@@ -185,0 +188,0 @@ if (arguments.length === 1 && !o.toNode && !o.forEach) { |
@@ -5,3 +5,3 @@ { | ||
"description": "sql builder", | ||
"version": "0.43.1", | ||
"version": "0.43.2", | ||
"homepage": "https://github.com/brianc/node-sql", | ||
@@ -8,0 +8,0 @@ "repository": { |
@@ -408,1 +408,10 @@ 'use strict'; | ||
}); | ||
Harness.test({ | ||
query: post.insert([]), | ||
mysql: { | ||
text : 'INSERT INTO `post` () VALUES ()', | ||
string: 'INSERT INTO `post` () VALUES ()' | ||
}, | ||
params: [] | ||
}); |
@@ -5,2 +5,3 @@ 'use strict'; | ||
var post = Harness.definePostTable(); | ||
var customerAlias = Harness.defineCustomerAliasTable(); | ||
@@ -23,1 +24,18 @@ Harness.test({ | ||
}); | ||
Harness.test({ | ||
query: customerAlias.select(customerAlias.star()), | ||
pg: { | ||
text : 'SELECT "customer"."id" AS "id_alias", "customer"."name" AS "name_alias", "customer"."age" AS "age_alias", "customer"."income" AS "income_alias", "customer"."metadata" AS "metadata_alias" FROM "customer"', | ||
string: 'SELECT "customer"."id" AS "id_alias", "customer"."name" AS "name_alias", "customer"."age" AS "age_alias", "customer"."income" AS "income_alias", "customer"."metadata" AS "metadata_alias" FROM "customer"' | ||
}, | ||
sqlite: { | ||
text : 'SELECT "customer"."id" AS "id_alias", "customer"."name" AS "name_alias", "customer"."age" AS "age_alias", "customer"."income" AS "income_alias", "customer"."metadata" AS "metadata_alias" FROM "customer"', | ||
string: 'SELECT "customer"."id" AS "id_alias", "customer"."name" AS "name_alias", "customer"."age" AS "age_alias", "customer"."income" AS "income_alias", "customer"."metadata" AS "metadata_alias" FROM "customer"' | ||
}, | ||
mysql: { | ||
text : 'SELECT `customer`.`id` AS `id_alias`, `customer`.`name` AS `name_alias`, `customer`.`age` AS `age_alias`, `customer`.`income` AS `income_alias`, `customer`.`metadata` AS `metadata_alias` FROM `customer`', | ||
string: 'SELECT `customer`.`id` AS `id_alias`, `customer`.`name` AS `name_alias`, `customer`.`age` AS `age_alias`, `customer`.`income` AS `income_alias`, `customer`.`metadata` AS `metadata_alias` FROM `customer`' | ||
}, | ||
params: [] | ||
}); |
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
296055
7937