diff --git a/package.json b/package.json index 4691170022a0f6cfdb923871eabe62af751055ca..eb9010f529421a259ad98ebafba97960305f2acf 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,6 @@ , "JSONSelect": "0.2.1" , "winston" : "0.3.3" , "connect-cookie-session" : "0.0.1" - , "mysql" : "0.9.1" + , "mysql" : "0.9.2" } } diff --git a/scripts/migrate_sqlite_to_mysql.js b/scripts/migrate_sqlite_to_mysql.js index dadb36407d6d107c2a3e8583295a8842a70f646a..c1ca0d12cc77bd5220046d4dfaa3770d4790cd94 100755 --- a/scripts/migrate_sqlite_to_mysql.js +++ b/scripts/migrate_sqlite_to_mysql.js @@ -23,36 +23,27 @@ client['host'] = '127.0.0.1'; client['port'] = "3306"; client['user'] = "browserid"; client['password'] = ""; +client['database'] = "browserid"; function fatal(err) { console.log("ERROR:", err.toString()); process.exit(1); } -client.connect(function(error) { - if (error) { - fatal(error); - } else { - // now create the databse - client.useDatabase("browserid", function(err) { - if (err) fatal(err); - function createNextTable(i) { - if (i < schemas.length) { - client.query(schemas[i], function(err) { - if (err) { - fatal(err); - } else { - createNextTable(i+1); - } - }); - } else { - onMysqlReady(); - } +function createNextTable(i) { + if (i < schemas.length) { + client.query(schemas[i], function(err) { + if (err) { + fatal(err); + } else { + createNextTable(i+1); } - createNextTable(0); }); + } else { + onMysqlReady(); } -}); +} +createNextTable(0); var sqlitedb;