From fd91d397fadfbf38e7a2cdf919c5c6a1140c0969 Mon Sep 17 00:00:00 2001 From: danbulant Date: Sat, 28 Sep 2019 18:06:33 +0200 Subject: [PATCH] Fix files, wrapper now working --- index.js | 18 ++++++++++++------ sql2csv.js | 3 +-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/index.js b/index.js index 399a43c..08c9f64 100644 --- a/index.js +++ b/index.js @@ -100,21 +100,27 @@ con.connect(function(err) { process.exit(1); } log("\x1b[32mMySQL Connected!"); - + + s2c.setConnection(con); + fs.readdirSync('./input/').forEach(file => { + var fileName = file; file = "./input/" + file; if(fs.statSync(file).isDirectory()) return;//skip directories var query = fs.readFileSync(file); log("Running " + query + " from file " + file); - s2c.query(query) + s2c.query(query + '') .then(result => { - console.log(result.csv); + var loc = "/output/" + fileName; + if(loc.lastIndexOf(".") != -1){ + loc = loc.substr(0, loc.lastIndexOf(".")); + } + loc = "." + loc;//fix for empty location + loc += ".csv"; + fs.writeFile(loc, result.csv, { flag: "w"}, (err)=>{if(err)error(err)}); log(`Task from file ${file} done in ` + Math.round(result.end - result.start) + "ms"); - con.end(); }) .catch(err => {error(err); process.exit(0)}) }); }); - -s2c.setConnection(con); diff --git a/sql2csv.js b/sql2csv.js index 5d89b1d..79d66d4 100644 --- a/sql2csv.js +++ b/sql2csv.js @@ -56,9 +56,8 @@ class sql2csv { query(sql){ var self = this; var startDate = performance.timeOrigin + performance.now(); - this.log(sql); return new Promise((resolve, reject) => { - this.conn.query(sql, function (err, result) { + self.conn.query(sql, function (err, result) { if (err){reject(err); return } if(result == undefined){reject("undefined result"); return; } var csv = "";