cvs-simple (#25)

codenautas · Oct 18, 2016 · 4a6fc26 · 4a6fc26
1 parent b3e7df7
commit 4a6fc26
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 16 deletions.
diff --git a/bin/txt-to-sql-run.js b/bin/txt-to-sql-run.js
@@ -144,9 +144,7 @@ function fastAnalyzeLines(info) {
 
 function fastInsert(outStream, info, line) {
     if(line.trim() !=='') {
-        var row = txtToSql.separateOneRow(info, line);
-        var row =  [line].filter(function(ln){ return ln.trim()!==""; })
-                     .map(function(ln){ return ln.split(info.opts.separator);});
+        var row = [txtToSql.separateOneRow(info, line)];
         var rows = txtToSql.createAdaptedRows(info, row);
         var insertInto = txtToSql.createInsertInto(info);
         var insertValues = txtToSql.createInsertValues(rows, info.columnsInfo).map(function(c) { return insertInto + c + ";"; }).join('\n');

diff --git a/lib/txt-to-sql.js b/lib/txt-to-sql.js
@@ -278,11 +278,22 @@ function determineDelimiter(info) {
     return info;
 }
 
+function getDelimitedField(info, field) {
+    var last = field.length-1;
+    var start=field[0]===info.delimiter?1:0,
+        end=(last>start && field[last]===info.delimiter) ? last:last+1;
+    return field.substring(start, end).replace(new RegExp(info.delimiter+info.delimiter,"g"),info.delimiter);
+}
+
+function delimiterSplit(info, line) {
+    var parts = line.split(info.opts.separator);
+    return parts.map(function(name, index){ return getDelimitedField(info, name); });
+}
+
 function separateWithDelimiter(info) {
-    var headers = info.headers.split(info.delimiter+info.opts.separator+info.delimiter);
-    return info.columnsInfo = headers.map(function(name, index){
+    return info.headers.split(info.opts.separator).map(function(name, index){
         return {
-            name:index===0 ? name.substring(1) : index===headers.length-1 ? name.substring(0, name.length-1) : name,
+            name:getDelimitedField(info, name),
             columnLength:0,
         };
     });
@@ -311,7 +322,11 @@ function separateColumns(info){
 }
 
 function separateOneRow(info, line) {
-    return line.split(info.opts.separator);
+    if(info.delimiter) {
+        return delimiterSplit(info, line);
+    } else {
+        return line.split(info.opts.separator);
+    }
 }
 
 function separateRows(info) {

diff --git a/test/fixtures/csv-simple.sql b/test/fixtures/csv-simple.sql
@@ -1,12 +1,13 @@
 create table "csv-simple" (
  "rnum" integer,
  "username" character varying(9),
- "txt" character varying(16),
+ "txt" character varying(22),
  "rn2" integer,
- "rol" character varying(4)
+ "rol" character varying(4),
+ primary key ("rnum")
 );
 
-insert into "csv-simple" ("rnum", "username", "md5pass", "rn2", "rol") values
+insert into "csv-simple" ("rnum", "username", "txt", "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'),

diff --git a/test/test.js b/test/test.js
@@ -106,7 +106,7 @@ describe("fixtures", function(){
         {path:'pk-custom'},
         {path:'pk-custom-names'},
         {path:'with-null-lines'},
-        {path:'csv-simple', skip:true},
+        {path:'csv-simple'},
     ].forEach(function(fixture){
         if(fixture.skip) {
             it.skip("fixture: "+fixture.path);
@@ -155,7 +155,7 @@ describe("fixtures", function(){
                     if(comp !==-1) {
                         console.log("GEN", generated.rawSql.toString());
                         console.log("EXP", expected.rawSql.toString());
-                        console.log("diff in ", comp, expected.rawSql.toString().substring(comp))
+                        console.log("diff in ", comp, "\n"+expected.rawSql.toString().substring(comp))
                     }
                     expect(generated.rawSql).to.eql(expected.rawSql);
                     expect(differences(generated.rawSql,expected.rawSql)).to.eql(null);

diff --git a/web/txt-to-sql.js b/web/txt-to-sql.js
@@ -278,11 +278,22 @@ function determineDelimiter(info) {
     return info;
 }
 
+function getDelimitedField(info, field) {
+    var last = field.length-1;
+    var start=field[0]===info.delimiter?1:0,
+        end=(last>start && field[last]===info.delimiter) ? last:last+1;
+    return field.substring(start, end).replace(new RegExp(info.delimiter+info.delimiter,"g"),info.delimiter);
+}
+
+function delimiterSplit(info, line) {
+    var parts = line.split(info.opts.separator);
+    return parts.map(function(name, index){ return getDelimitedField(info, name); });
+}
+
 function separateWithDelimiter(info) {
-    var headers = info.headers.split(info.delimiter+info.opts.separator+info.delimiter);
-    return info.columnsInfo = headers.map(function(name, index){
+    return info.headers.split(info.opts.separator).map(function(name, index){
         return {
-            name:index===0 ? name.substring(1) : index===headers.length-1 ? name.substring(0, name.length-1) : name,
+            name:getDelimitedField(info, name),
             columnLength:0,
         };
     });
@@ -311,7 +322,11 @@ function separateColumns(info){
 }
 
 function separateOneRow(info, line) {
-    return line.split(info.opts.separator);
+    if(info.delimiter) {
+        return delimiterSplit(info, line);
+    } else {
+        return line.split(info.opts.separator);
+    }
 }
 
 function separateRows(info) {