Skip to content

Commit

Permalink
Revert create dbs commits
Browse files Browse the repository at this point in the history
  • Loading branch information
Panagis Tselentis committed Mar 1, 2019
1 parent 0ccf6af commit 7bb9c4f
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 87 deletions.
52 changes: 26 additions & 26 deletions makedb/dbs/mysql.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,37 +24,37 @@ function parse(uri) {
}

module.exports = {
run : function (next) {
console.log("Using MySQL DB Adapter.");
return this.create(next);
},
run : function (next) {
console.log("Using MySQL DB Adapter.");
return this.create(next);
},


create : function(next) {
create : function(next) {

var parsedOpts;
var url = dbConf.connections.mysql.url;
if(url) {
parsedOpts = parse(url);
}
var parsedOpts;
var url = dbConf.connections.mysql.url;
if(url) {
parsedOpts = parse(url);
}


var connection = mysql.createConnection(url ? _.omit(parsedOpts,['database']) : {
host : dbConf.connections.mysql.host,
port : dbConf.connections.mysql.port,
user : dbConf.connections.mysql.user,
password : dbConf.connections.mysql.password
});
var connection = mysql.createConnection(url ? _.omit(parsedOpts,['database']) : {
host : dbConf.connections.mysql.host,
port : dbConf.connections.mysql.port,
user : dbConf.connections.mysql.user,
password : dbConf.connections.mysql.password
});

console.log("Creating database `" + ( parsedOpts ? parsedOpts.database : dbConf.connections.mysql.database ) + "` if not exists.");
console.log("Creating database `" + ( parsedOpts ? parsedOpts.database : dbConf.connections.mysql.database ) + "` if not exists.");

connection.query('CREATE DATABASE IF NOT EXISTS `' + ( parsedOpts ? parsedOpts.database : dbConf.connections.mysql.database + '`'), function (error, results, fields) {
if (error) {
console.error(error);
return next(error);
}
connection.query('CREATE DATABASE IF NOT EXISTS ' + ( parsedOpts ? parsedOpts.database : dbConf.connections.mysql.database ), function (error, results, fields) {
if (error) {
console.error(error);
return next(error);
}

return next();
});
}
}
return next();
});
}
}
122 changes: 61 additions & 61 deletions makedb/dbs/pg.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,79 +59,79 @@ function parse(str) {
}

module.exports = {
run : function (next) {

console.log("Using postgres DB Adapter.");

var self = this;
var url = dbConf.connections.postgres.url;
var user = dbConf.connections.postgres.user;
var password = dbConf.connections.postgres.password;
var dbName = dbConf.connections.postgres.database;
var dbHost = dbConf.connections.postgres.host;
var dbPort = dbConf.connections.postgres.port;
var ssl = dbConf.connections.postgres.ssl;

var opts = url ? parse(url) : {
user: user,
host: dbHost,
database: dbName,
password: password,
port: dbPort,
ssl,
}
run : function (next) {

console.log("Using postgres DB Adapter.");

var self = this;
var url = dbConf.connections.postgres.url;
var user = dbConf.connections.postgres.user;
var password = dbConf.connections.postgres.password;
var dbName = dbConf.connections.postgres.database;
var dbHost = dbConf.connections.postgres.host;
var dbPort = dbConf.connections.postgres.port;
var ssl = dbConf.connections.postgres.ssl;

var opts = url ? parse(url) : {
user: user,
host: dbHost,
database: dbName,
password: password,
port: dbPort,
ssl,
}

// console.log("Connection Options =>", opts);
// console.log("Connection Options =>", opts);

pg.connect(opts, function (err, client, done) {
if (err) {
pg.connect(opts, function (err, client, done) {
if (err) {

if(err.code == "3D000")
{
console.log("Database `" + opts.database + "` does not exist. Creating...");
done();
return self.create(opts,next);
if(err.code == "3D000")
{
console.log("Database `" + opts.database + "` does not exist. Creating...");
done();
return self.create(opts,next);

}else{
console.error("Failed to connect to DB",err);
return next(err);
}
}else{
console.log("Database exists. Continue...");
return next();
}
}else{
console.error("Failed to connect to DB",err);
return next(err);
}
}else{
console.log("Database exists. Continue...");
return next();
}

});
},
});
},


create : function(opts,next) {
create : function(opts,next) {

// Hook up to postgres db so we can create a new one
var defaultDbOpts = _.merge(_.cloneDeep(opts),{
database : "postgres"
});
// Hook up to postgres db so we can create a new one
var defaultDbOpts = _.merge(_.cloneDeep(opts),{
database : "postgres"
});

pg.connect(defaultDbOpts, function (err, client, done) {
if (err) {
console.log(err);
done();
return next(err);
}
pg.connect(defaultDbOpts, function (err, client, done) {
if (err) {
console.log(err);
done();
return next(err);
}

client.query('CREATE DATABASE `' + opts.database + '`', function (err, res) {
if (err) {
console.log("Failed to create `" + opts.database +"`",err);
done();
return next(err);
client.query('CREATE DATABASE ' + opts.database, function (err, res) {
if (err) {
console.log("Failed to create `" + opts.database +"`",err);
done();
return next(err);

}
}

console.log("Database `" + opts.database + "` created! Continue...");
console.log("Database `" + opts.database + "` created! Continue...");

return next();
return next();

});
});
}
});
});
}
}

0 comments on commit 7bb9c4f

Please sign in to comment.