public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2684 from hinnerk/develop 

Conver.js: Use current mysql client API
pull/2688/head
John McLear 2015-05-30 16:40:22 +01:00
parent b049f4bfc7 7ba5e97a60
commit d11c92cbf9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bin/convert.js
View File

@ -34,13 +34,13 @@ var sql = "SET CHARACTER SET UTF8;\n" +
fs.writeSync(sqlOutput, sql);
log("done");
//set setings for ep db
var etherpadDB= new mysql.Client();
etherpadDB.host = settings.etherpadDB.host;
etherpadDB.port = settings.etherpadDB.port;
etherpadDB.database = settings.etherpadDB.database;
etherpadDB.user = settings.etherpadDB.user;
etherpadDB.password = settings.etherpadDB.password;
var etherpadDB = mysql.createConnection({
host : settings.etherpadDB.host,
user : settings.etherpadDB.user,
password : settings.etherpadDB.password,
database : settings.etherpadDB.database,
port : settings.etherpadDB.port
});
//get the timestamp once
var timestamp = new Date().getTime();