@@ -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 = [ ] ;
0 commit comments