From 7adf0af66ac080500de11a52ed3ea9e6729e5bad Mon Sep 17 00:00:00 2001 From: danbulant Date: Sat, 28 Sep 2019 17:37:05 +0200 Subject: [PATCH] Fix last column having comma --- sql2csv.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sql2csv.js b/sql2csv.js index 1db0346..5d89b1d 100644 --- a/sql2csv.js +++ b/sql2csv.js @@ -56,14 +56,19 @@ 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) { - if (err) reject(err); + if (err){reject(err); return } + if(result == undefined){reject("undefined result"); return; } var csv = ""; var keys = []; var keysEmpty = true; result.forEach((row) => { + var current = 0; + var last = row.length; for(var key in row){ + current++; if(keysEmpty) keys[keys.length] = key; var column = row[key]; if(typeof column == "string"){ @@ -72,7 +77,8 @@ class sql2csv { column = '"' + column + '"'; } } - csv += column + ","; + if(current != last) + csv += column + ","; } keysEmpty = false; if(self.options.crlf) csv += "\r";