csv-harder test. Close #25

lib/txt-to-sql.js

@@ -18,7 +18,6 @@ if (typeof Object.assign != 'function') {
       if (target === undefined || target === null) {
         throw new TypeError('Cannot convert undefined or null to object');
       }
-
       var output = Object(target);
       for (var index = 1; index < arguments.length; index++) {
         var source = arguments[index];
@@ -286,8 +285,17 @@ function getDelimitedField(info, field) {
 }
 
 function delimiterSplit(info, line) {
-    var parts = line.split(info.opts.separator);
-    return parts.map(function(name, index){ return getDelimitedField(info, name); });
+    var del = info.delimiter;
+    var sep = info.opts.separator;
+    var expressions = [
+        del+sep+del,
+        sep+del,
+        del+sep
+    ];
+    var splitter=new RegExp(expressions.join('|'));
+    return line.split(splitter).map(function(name, index){
+        return getDelimitedField(info, name);
+    });
 }
 
 function separateWithDelimiter(info) {

test/fixtures/csv-harder.sql

@@ -0,0 +1,12 @@
+create table "csv-harder" (
+ "rnum" integer,
+ "txt" character varying(20),
+ primary key ("rnum")
+);
+
+insert into "csv-harder" ("rnum", "txt") values
+ (1, 'txt 1'),
+ (2, 'incluye separator(;)'),
+ (3, 'txt con " doble'),
+ (4, 'txt con '' simple'),
+ (5, 'incluye delimiter(")');

test/fixtures/csv-harder.txt

@@ -0,0 +1,6 @@
+"rnum";"txt"
+1;"txt 1"
+2;"incluye separator(;)"
+3;"txt con "" doble"
+4;"txt con ' simple"
+5;"incluye delimiter("")"

test/test.js

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