Preparando para #25

bin/txt-to-sql-run.js

@@ -189,6 +189,7 @@ function doFast(params, inputBase) {
             if(! info.headers) {
                 info.headers = line;
                 txtToSql.determineSeparator(info);
+                txtToSql.determineDelimiter(info);
                 txtToSql.separateColumns(info);
             } else {
                 fastProcessLine(info, line);

lib/txt-to-sql.js

@@ -7,6 +7,7 @@ var iconv = require('iconv-lite');
 
 var margin = ' ';
 var separators=';,\t|';
+var delimiters='\'"';
 
 /* istanbul ignore if  */
 if (typeof Object.assign != 'function') {
@@ -262,11 +263,41 @@ function determineSeparator(info){
     return info;
 }
 
-function separateColumns(info){
-    info.columnsInfo = info.headers.split(info.opts.separator).map(function(name){ return {
+function determineDelimiter(info) {
+    var delimiterCandidates = delimiters.split('');
+    var headers = info.headers.split(info.opts.separator);
+    delimiterCandidates = delimiterCandidates.filter(function(delimiter) {
+        return headers.filter(function(header) {
+            return header[0]===delimiter && header[header.length-1]===delimiter;
+        }).length>0;
+    });
+    //console.log("delimiter", delimiterCandidates)
+    if(delimiterCandidates.length>0) {
+        info.delimiter = delimiterCandidates[0];
+    }
+    return info;
+}
+
+function separateDelimiter(info) {
+    var splitter = info.delimiter+info.opts.separator+info.delimiter;
+    var headers = info.headers.split(splitter);
+    return info.columnsInfo = headers.map(function(name, index){
+        return {
+            name:index===0 ? name.substring(1) : index===headers.length-1 ? name.substring(0, name.length-1) : name,
+            columnLength:0,
+        };
+    });
+}
+
+function separateSimple(info) {
+    return info.headers.split(info.opts.separator).map(function(name){ return {
         name:name,
         columnLength:0,
     };});
+}
+
+function separateColumns(info){
+    info.columnsInfo = info.delimiter ? separateDelimiter(info) : separateSimple(info);
     if(info.opts.columns && 'name' in info.opts.columns[0]) {
         if(info.opts.columns.length !== info.columnsInfo.length) {
             throw new Error('wrong number of column names: expected '+
@@ -558,6 +589,7 @@ function setup(info) {
         .then(processEncodingOptions)
         .then(separateLines)
         .then(determineSeparator)
+        .then(determineDelimiter)
         .then(separateColumns)
         .then(separateRows)
         .then(verifyColumnCount)
@@ -620,6 +652,7 @@ txtToSql.compareBuffers = compareBuffers;
 txtToSql.verifyInputParams = verifyInputParams;
 txtToSql.getEncoding = getEncoding;
 txtToSql.determineSeparator = determineSeparator;
+txtToSql.determineDelimiter = determineDelimiter;
 txtToSql.separateColumns = separateColumns;
 txtToSql.transformNames = transformNames;
 txtToSql.verifyColumnNames = verifyColumnNames;

test/fixtures/csv-simple.sql

@@ -0,0 +1,13 @@
+create table "csv-simple" (
+ "rnum" integer,
+ "username" character varying(9),
+ "txt" character varying(16),
+ "rn2" integer,
+ "rol" character varying(4)
+);
+
+insert into "csv-simple" ("rnum", "username", "md5pass", "rn2", "rol") values
+ (1, 'ejemplo 1', 'txt 1', 101, 'tes1'),
+ (2, 'ejemplo 2', 'txt 2', 102, 'tes2'),
+ (3, 'ejemplo 3', 'txt raro " con comilla', 103, 'tes3'),
+ (4, 'ejemplo 4', 'dos " comillas "', 104, 'tes4');

test/fixtures/csv-simple.txt

@@ -0,0 +1,6 @@
+"rnum";"username";"txt";"rn2";"rol"
+1;"ejemplo 1";"txt 1";101;"tes1"
+2;"ejemplo 2";"txt 2";102;"tes2"
+3;"ejemplo 3";"txt raro "" con comilla";103;"tes3"
+4;"ejemplo 4";"dos "" comillas """;104;"tes4"
+

test/test.js

@@ -106,6 +106,7 @@ describe("fixtures", function(){
         {path:'pk-custom'},
         {path:'pk-custom-names'},
         {path:'with-null-lines'},
+        {path:'csv-simple', skip:true},
     ].forEach(function(fixture){
         if(fixture.skip) {
             it.skip("fixture: "+fixture.path);