libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2684 from hinnerk/develop

Browse source 
Conver.js: Use current mysql client API
This commit is contained in:
John McLear 2015-05-30 16:40:22 +01:00
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); fs.writeSync(sqlOutput, sql);
log("done"); log("done");
//set setings for ep db var etherpadDB = mysql.createConnection({
var etherpadDB= new mysql.Client(); host : settings.etherpadDB.host,
etherpadDB.host = settings.etherpadDB.host; user : settings.etherpadDB.user,
etherpadDB.port = settings.etherpadDB.port; password : settings.etherpadDB.password,
etherpadDB.database = settings.etherpadDB.database; database : settings.etherpadDB.database,
etherpadDB.user = settings.etherpadDB.user; port : settings.etherpadDB.port
etherpadDB.password = settings.etherpadDB.password; });
//get the timestamp once //get the timestamp once
var timestamp = new Date().getTime(); var timestamp = new Date().getTime();