Skip to content

Commit cafcfc8

Browse files
committed
Updates Model.sync() to use keys instead of id on all drivers
1 parent faf59a0 commit cafcfc8

4 files changed

Lines changed: 51 additions & 4 deletions

File tree

‎lib/Drivers/DDL/mysql.js‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,21 @@ exports.sync = function (driver, opts, cb) {
3434
var queries = [];
3535
var definitions = [];
3636
var k, i, pending;
37+
var primary_keys = opts.keys.map(function (k) { return driver.query.escapeId(k); });
38+
var keys = [];
3739

38-
definitions.push(driver.query.escapeId(opts.id) + " INT(11) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY");
40+
for (i = 0; i < opts.keys.length; i++) {
41+
if (opts.properties.hasOwnProperty(opts.keys[i])) continue;
42+
43+
keys.push(driver.query.escapeId(opts.keys[i]));
44+
}
45+
46+
for (i = 0; i < keys.length; i++) {
47+
definitions.push(keys[i] + " INT(11) UNSIGNED NOT NULL");
48+
}
49+
if (opts.keys.length == 1) {
50+
definitions[definitions.length - 1] += " AUTO_INCREMENT";
51+
}
3952

4053
for (k in opts.properties) {
4154
definitions.push(buildColumnDefinition(driver, k, opts.properties[k]));
@@ -49,7 +62,6 @@ exports.sync = function (driver, opts, cb) {
4962
);
5063
}
5164

52-
definitions.push("INDEX (" + driver.query.escapeId(opts.id) + ")");
5365
for (k in opts.properties) {
5466
if (opts.properties[k].unique === true) {
5567
definitions.push("UNIQUE KEY " + driver.query.escapeId(k) + " (" + driver.query.escapeId(k) + ")");
@@ -67,10 +79,14 @@ exports.sync = function (driver, opts, cb) {
6779
}).join(", ") + ")");
6880
}
6981

82+
definitions.push("PRIMARY KEY (" + primary_keys.join(", ") + ")");
83+
7084
queries.push(
7185
"CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.table) +
7286
" (" + definitions.join(", ") + ")"
7387
);
88+
console.log("CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.table) +
89+
" (" + definitions.join(", ") + ")");
7490

7591
for (i = 0; i < opts.many_associations.length; i++) {
7692
definitions = [];

‎lib/Drivers/DDL/postgres.js‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,21 @@ exports.sync = function (driver, opts, cb) {
2323
var typequeries = [];
2424
var definitions = [];
2525
var k, i, pending;
26+
var primary_keys = opts.keys.map(function (k) { return driver.query.escapeId(k); });
27+
var keys = [];
2628

27-
definitions.push(driver.query.escapeId(opts.id) + " SERIAL PRIMARY KEY");
29+
for (i = 0; i < opts.keys.length; i++) {
30+
if (opts.properties.hasOwnProperty(opts.keys[i])) continue;
31+
32+
keys.push(driver.query.escapeId(opts.keys[i]));
33+
}
34+
35+
for (i = 0; i < keys.length; i++) {
36+
definitions.push(keys[i] + " INTEGER NOT NULL");
37+
}
38+
if (opts.keys.length == 1) {
39+
definitions[definitions.length - 1] = keys[0] + " SERIAL";
40+
}
2841

2942
for (k in opts.properties) {
3043
definitions.push(buildColumnDefinition(driver, opts.table, k, opts.properties[k]));
@@ -53,6 +66,8 @@ exports.sync = function (driver, opts, cb) {
5366
}
5467
}
5568

69+
definitions.push("PRIMARY KEY (" + primary_keys.join(", ") + ")");
70+
5671
tables.push({
5772
name : opts.table,
5873
query : "CREATE TABLE " + driver.query.escapeId(opts.table) +

‎lib/Drivers/DDL/sqlite.js‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,21 @@ exports.sync = function (driver, opts, cb) {
2121
var queries = [];
2222
var definitions = [];
2323
var k, i, pending;
24+
var primary_keys = opts.keys.map(function (k) { return driver.query.escapeId(k); });
25+
var keys = [];
2426

25-
definitions.push(driver.query.escapeId(opts.id) + " INTEGER PRIMARY KEY AUTOINCREMENT");
27+
for (i = 0; i < opts.keys.length; i++) {
28+
if (opts.properties.hasOwnProperty(opts.keys[i])) continue;
29+
30+
keys.push(driver.query.escapeId(opts.keys[i]));
31+
}
32+
33+
for (i = 0; i < keys.length; i++) {
34+
definitions.push(keys[i] + " INTEGER UNSIGNED NOT NULL");
35+
}
36+
if (opts.keys.length == 1) {
37+
definitions[definitions.length - 1] += " AUTOINCREMENT";
38+
}
2639

2740
for (k in opts.properties) {
2841
definitions.push(buildColumnDefinition(driver, k, opts.properties[k]));
@@ -36,6 +49,8 @@ exports.sync = function (driver, opts, cb) {
3649
);
3750
}
3851

52+
definitions.push("PRIMARY KEY (" + primary_keys.join(", ") + ")");
53+
3954
queries.push(
4055
"CREATE TABLE IF NOT EXISTS " + driver.query.escapeId(opts.table) +
4156
" (" + definitions.join(", ") + ")"

‎lib/Model.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ function Model(opts) {
123123
if (typeof opts.driver.sync == "function") {
124124
opts.driver.sync({
125125
id : opts.id,
126+
keys : opts.keys,
126127
table : opts.table,
127128
properties : opts.properties,
128129
indexes : opts.indexes || [],

0 commit comments

Comments
 (0)