From 5df60796da8dec42400ca428c42b4267892c587c Mon Sep 17 00:00:00 2001
From: Lloyd Hilaiel <lloyd@hilaiel.com>
Date: Mon, 15 Aug 2011 11:35:16 +0300
Subject: [PATCH] port mysql persistence layer to node-mysql 0.9.2 (no more
connect() call)
---
browserid/lib/db_mysql.js | 63 +++++++++++++++++----------------------
1 file changed, 28 insertions(+), 35 deletions(-)
diff --git a/browserid/lib/db_mysql.js b/browserid/lib/db_mysql.js
index 1fb2fd8ce..4bcb8d52e 100644
--- a/browserid/lib/db_mysql.js
+++ b/browserid/lib/db_mysql.js
@@ -111,44 +111,37 @@ exports.open = function(cfg, cb) {
drop_on_close = database;
}
- client.connect(function(error) {
- if (error) {
- logUnexpectedError(error);
- cb(error);
- } else {
- // now create the databse
- client.query("CREATE DATABASE IF NOT EXISTS " + database, function(err) {
- if (err) {
- logUnexpectedError(err);
- cb(err);
- return;
- }
- client.useDatabase(database, function(err) {
- if (err) {
- logUnexpectedError(err);
- cb(err);
- return;
- }
+ // now create the databse
+ client.query("CREATE DATABASE IF NOT EXISTS " + database, function(err) {
+ if (err) {
+ logUnexpectedError(err);
+ cb(err);
+ return;
+ }
+ client.useDatabase(database, function(err) {
+ if (err) {
+ logUnexpectedError(err);
+ cb(err);
+ return;
+ }
- // now create tables
- function createNextTable(i) {
- if (i < schemas.length) {
- client.query(schemas[i], function(err) {
- if (err) {
- logUnexpectedError(err);
- cb(err);
- } else {
- createNextTable(i+1);
- }
- });
+ // now create tables
+ function createNextTable(i) {
+ if (i < schemas.length) {
+ client.query(schemas[i], function(err) {
+ if (err) {
+ logUnexpectedError(err);
+ cb(err);
} else {
- cb();
+ createNextTable(i+1);
}
- }
- createNextTable(0);
- });
- });
- }
+ });
+ } else {
+ cb();
+ }
+ }
+ createNextTable(0);
+ });
});
};
--
GitLab