From dec1efab043a4f396a3208dbb330a22ed3634c27 Mon Sep 17 00:00:00 2001
From: Lloyd Hilaiel <lloyd@hilaiel.com>
Date: Mon, 15 Aug 2011 11:15:24 +0300
Subject: [PATCH] port migration script mysql driver 0.9.2
---
package.json | 2 +-
scripts/migrate_sqlite_to_mysql.js | 33 +++++++++++-------------------
2 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/package.json b/package.json
index 469117002..eb9010f52 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 dadb36407..c1ca0d12c 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;
--
GitLab