Skip to content

Commit a72f25c

Browse files
committed
Format numbers
1 parent a50d214 commit a72f25c

File tree

3 files changed

+16
-167
lines changed

3 files changed

+16
-167
lines changed

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,8 @@
2020
"bugs": {
2121
"url": "https://github.com/mathiasrw/alasql-logictest/issues"
2222
},
23-
"homepage": "https://github.com/mathiasrw/alasql-logictest"
23+
"homepage": "https://github.com/mathiasrw/alasql-logictest",
24+
"devDependencies": {
25+
"numeral": "^1.5.3"
26+
}
2427
}

sqllogic/run_md.js

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ var pretty = require('prettysize');
88
var md5 = require("MD5");
99
var comparray = require('comparray');
1010
var sqllogictestparser = require(__dirname+'/sqllogictestparserV2');
11+
var numeral = require('numeral'); // var string = numeral(1000).format('0,0');
12+
1113

1214
var alasql = require(__dirname+'/../../alasql/dist/alasql'); //todo: make parameter to set path
1315
//var alasql = require('alasql');
@@ -57,7 +59,7 @@ var testfiles = walkFiles(
5759
// /00\/|\d{2,}\.test/ // Exclude a lot of files (fastest - 125 files)
5860
// /\/10+\// // exclude biggest files (balance between time and depth) (410 files)
5961
// null // Exclude no files - As all tests contains a few million tests it can take some time. (622+ files)
60-
/select5\.test/
62+
/select5\.test/ // get all exept select5.test - as its taking days to complete
6163

6264
);
6365

@@ -91,6 +93,7 @@ alasql.options.modifier = "MATRIX";
9193
alasql.options.cache = false;
9294
var mimicking = 0;
9395
var erroIndex = {};
96+
var format = function(val){ return numeral(val).format('0,0') }
9497
var score = {
9598
ok: {
9699
total:0,
@@ -134,7 +137,7 @@ var score = {
134137

135138

136139

137-
console.log('# SQLlogictest results for', useSqliteDb?'sql.js':'AlaSQL '+alasql.version);
140+
console.log('# SQLlogictest '+(onlyParseSql?' compile ':'')+'results for', useSqliteDb?'sql.js':'AlaSQL '+alasql.version);
138141
console.log('');
139142
console.log('_'+ new Date().toISOString()+'_');
140143
console.log('');
@@ -201,16 +204,16 @@ for (var i in testfiles) {
201204
if(0===roundCount.total){
202205
continue;
203206
}
204-
205-
console.log('#### '+ (0===roundCount.fail?'★':'☓') +' Ran', roundCount.total, 'tests as', mimic[mimicking]);
207+
numeral(1000).format('0,0')
208+
console.log('#### '+ (0===roundCount.fail?'★':'☓') +' Ran', format(roundCount.total), 'tests as', mimic[mimicking]);
206209
console.log('');
207210

208211
if(roundCount.skip){
209-
console.log('* '+roundCount.skip+ " skipped");
212+
console.log('* '+format(roundCount.skip)+ " skipped");
210213
}
211214

212215
if(roundCount.fail){
213-
console.log('* '+roundCount.fail+ " failed");
216+
console.log('* '+format(roundCount.fail)+ " failed");
214217
}
215218

216219

@@ -252,12 +255,12 @@ function printStats(){
252255

253256
console.log('## Final result');
254257
console.log('');
255-
console.log('* Skipped tests:', score.skip.total);
258+
console.log('* Skipped tests:', format(score.skip.total));
256259

257-
console.log('* Failed tests:', score.fail.total);
260+
console.log('* Failed tests:', format(score.fail.total));
258261

259262
//console.log('Was OK :', score.ok.total);
260-
console.log('* Total tested:', score.ok.total+score.fail.total+score.skip.total);
263+
console.log('* Total tested:', format(score.ok.total+score.fail.total+score.skip.total));
261264
console.log('* Final score:', score.percent(score.ok.total, score.fail.total+score.skip.total), '% was OK');
262265

263266
//printMem();

sqllogic/sqllogictestparser.js

Lines changed: 0 additions & 157 deletions
This file was deleted.

0 commit comments

Comments
 (0)