Comparing version 0.45.2 to 0.45.3
@@ -253,9 +253,10 @@ 'use strict'; | ||
result.push(this.visit(table.toNode())); | ||
this._visitCreateCompoundPrimaryKey = col_nodes.filter(function(n) { | ||
var primary_col_nodes = col_nodes.filter(function(n) { | ||
return n.primaryKey; | ||
}).length > 1; | ||
}); | ||
this._visitCreateCompoundPrimaryKey = primary_col_nodes.length > 1; | ||
var colspec = '(' + col_nodes.map(this.visit.bind(this)).join(', '); | ||
if (this._visitCreateCompoundPrimaryKey) { | ||
colspec += ', PRIMARY KEY ('; | ||
colspec += col_nodes.map(function(node) { | ||
colspec += primary_col_nodes.map(function(node) { | ||
return this.quote(node.name); | ||
@@ -262,0 +263,0 @@ }.bind(this)).join(', '); |
@@ -5,3 +5,3 @@ { | ||
"description": "sql builder", | ||
"version": "0.45.2", | ||
"version": "0.45.3", | ||
"homepage": "https://github.com/brianc/node-sql", | ||
@@ -8,0 +8,0 @@ "repository": { |
@@ -307,16 +307,17 @@ 'use strict'; | ||
user_id: { dataType: 'int', primaryKey: true}, | ||
desc: { dataType: 'varchar'} | ||
} | ||
}).create(), | ||
pg: { | ||
text : 'CREATE TABLE "membership" ("group_id" int, "user_id" int, PRIMARY KEY ("group_id", "user_id"))', | ||
string: 'CREATE TABLE "membership" ("group_id" int, "user_id" int, PRIMARY KEY ("group_id", "user_id"))', | ||
text : 'CREATE TABLE "membership" ("group_id" int, "user_id" int, "desc" varchar, PRIMARY KEY ("group_id", "user_id"))', | ||
string: 'CREATE TABLE "membership" ("group_id" int, "user_id" int, "desc" varchar, PRIMARY KEY ("group_id", "user_id"))', | ||
}, | ||
sqlite: { | ||
text : 'CREATE TABLE "membership" ("group_id" int, "user_id" int, PRIMARY KEY ("group_id", "user_id"))', | ||
string: 'CREATE TABLE "membership" ("group_id" int, "user_id" int, PRIMARY KEY ("group_id", "user_id"))', | ||
text : 'CREATE TABLE "membership" ("group_id" int, "user_id" int, "desc" varchar, PRIMARY KEY ("group_id", "user_id"))', | ||
string: 'CREATE TABLE "membership" ("group_id" int, "user_id" int, "desc" varchar, PRIMARY KEY ("group_id", "user_id"))', | ||
}, | ||
mysql: { | ||
text : 'CREATE TABLE `membership` (`group_id` int, `user_id` int, PRIMARY KEY (`group_id`, `user_id`))', | ||
string: 'CREATE TABLE `membership` (`group_id` int, `user_id` int, PRIMARY KEY (`group_id`, `user_id`))', | ||
text : 'CREATE TABLE `membership` (`group_id` int, `user_id` int, `desc` varchar, PRIMARY KEY (`group_id`, `user_id`))', | ||
string: 'CREATE TABLE `membership` (`group_id` int, `user_id` int, `desc` varchar, PRIMARY KEY (`group_id`, `user_id`))', | ||
} | ||
}); |
@@ -37,3 +37,3 @@ 'use strict'; | ||
var expectedText = expectedObject.text || expectedObject; | ||
assert.equal(compiledQuery.text, expectedText, 'query result'); | ||
assert.equal(compiledQuery.text, expectedText); | ||
@@ -40,0 +40,0 @@ // if params are specified then test these are correct |
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
351850
9209