Agregando pk y time

codenautas · Nov 8, 2016 · a92a056 · a92a056
1 parent 0014740
commit a92a056
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/lib/txt-to-sql.js b/lib/txt-to-sql.js
@@ -658,13 +658,18 @@ function stringizeStats(stats) {
     r.push('rows:'+stats.rows);
     r.push('columns:'+stats.columns+' (text:'+stats.textColumns+', null:'+stats.nullColumns+')');
     if(stats.primaryKey.length) {
-        r.push('primary key:'+stats.primaryKey.join(','));
+        r.push('primary key['+stats.primaryKey.join(',')+']');
     }
     var time = stats.endTime - stats.startTime;
-    var ms = parseInt((time%1000)),
-        secs = parseInt((time/1000)%60),
-        mins = parseInt((time/(1000*60))%60),
-        hs = parseInt((time/(1000*60*60))%24);
+    // var ms = parseInt((time%1000)),
+        // secs = parseInt((time/1000)%60),
+        // mins = parseInt((time/(1000*60))%60),
+        // hs = parseInt((time/(1000*60*60))%24);
+    var ms = parseInt(time%1000),
+        secs = parseInt(time/1000),
+        mins = parseInt(time/(1000*60)/60),
+        hs = parseInt(time/(1000*60*60)/24);
+    // console.log("time", time, "ms", ms, "secs", secs, "mins", mins, "hs", hs)
     var t=[];
     if(hs) { t.push(hs+'h'); }
     if(mins) { t.push(mins+'m'); }

diff --git a/test/test.js b/test/test.js
@@ -238,11 +238,16 @@ describe("stringizeStats", function(){
            out:'rows:3, columns:3 (text:1, null:2), time:1s' },
         {stats:{rows:0,columns:1,textColumns:0, nullColumns:1, primaryKey:[], startTime:1000, endTime:8010},
            out:'rows:0, columns:1 (text:0, null:1), time:7s, 10ms' },
+        {stats:{rows:20,columns:12,textColumns:7, nullColumns:5, primaryKey:['c1','c2'], startTime:0, endTime:1000*60*60*60},
+           out:'rows:20, columns:12 (text:7, null:5), primary key[c1,c2], time:1h',
+           skip:true
+        },
     ].forEach(function(check, index) {
+        var name=(index+1)+': '+JSON.stringify(check.stats).substr(0,40)+'...';
         if(check.skip) {
-            it.skip(check.name);
+            it.skip(name);
         } else {
-            it((index+1)+': '+JSON.stringify(check.stats).substr(0,40)+'...', function(){
+            it(name, function(){
                 expect(txtToSql.stringizeStats(check.stats)).to.eql(check.out);
             });
         }

diff --git a/web/txt-to-sql.js b/web/txt-to-sql.js
@@ -658,13 +658,18 @@ function stringizeStats(stats) {
     r.push('rows:'+stats.rows);
     r.push('columns:'+stats.columns+' (text:'+stats.textColumns+', null:'+stats.nullColumns+')');
     if(stats.primaryKey.length) {
-        r.push('primary key:'+stats.primaryKey.join(','));
+        r.push('primary key['+stats.primaryKey.join(',')+']');
     }
     var time = stats.endTime - stats.startTime;
-    var ms = parseInt((time%1000)),
-        secs = parseInt((time/1000)%60),
-        mins = parseInt((time/(1000*60))%60),
-        hs = parseInt((time/(1000*60*60))%24);
+    // var ms = parseInt((time%1000)),
+        // secs = parseInt((time/1000)%60),
+        // mins = parseInt((time/(1000*60))%60),
+        // hs = parseInt((time/(1000*60*60))%24);
+    var ms = parseInt(time%1000),
+        secs = parseInt(time/1000),
+        mins = parseInt(time/(1000*60)/60),
+        hs = parseInt(time/(1000*60*60)/24);
+    // console.log("time", time, "ms", ms, "secs", secs, "mins", mins, "hs", hs)
     var t=[];
     if(hs) { t.push(hs+'h'); }
     if(mins) { t.push(mins+'m'); }