mirror of
https://github.com/danbulant/sql2csv
synced 2026-06-19 14:31:38 +00:00
Fix last column having comma
This commit is contained in:
parent
6915cd06e8
commit
7adf0af66a
1 changed files with 8 additions and 2 deletions
10
sql2csv.js
10
sql2csv.js
|
|
@ -56,14 +56,19 @@ class sql2csv {
|
||||||
query(sql){
|
query(sql){
|
||||||
var self = this;
|
var self = this;
|
||||||
var startDate = performance.timeOrigin + performance.now();
|
var startDate = performance.timeOrigin + performance.now();
|
||||||
|
this.log(sql);
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
this.conn.query(sql, function (err, result) {
|
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 csv = "";
|
||||||
var keys = [];
|
var keys = [];
|
||||||
var keysEmpty = true;
|
var keysEmpty = true;
|
||||||
result.forEach((row) => {
|
result.forEach((row) => {
|
||||||
|
var current = 0;
|
||||||
|
var last = row.length;
|
||||||
for(var key in row){
|
for(var key in row){
|
||||||
|
current++;
|
||||||
if(keysEmpty) keys[keys.length] = key;
|
if(keysEmpty) keys[keys.length] = key;
|
||||||
var column = row[key];
|
var column = row[key];
|
||||||
if(typeof column == "string"){
|
if(typeof column == "string"){
|
||||||
|
|
@ -72,7 +77,8 @@ class sql2csv {
|
||||||
column = '"' + column + '"';
|
column = '"' + column + '"';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
csv += column + ",";
|
if(current != last)
|
||||||
|
csv += column + ",";
|
||||||
}
|
}
|
||||||
keysEmpty = false;
|
keysEmpty = false;
|
||||||
if(self.options.crlf) csv += "\r";
|
if(self.options.crlf) csv += "\r";
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue