Skip test file on statement error

Author: mathiasrw

results.md

@@ -0,0 +1,11 @@
+# SQLlogictest results for AlaSQL 0.2.1
+
+_2015-11-30T18:59:33.355Z_
+
+This is a subset of the total 622 tests.
+Results from 1 test files:
+
+---- ---- ---- ---- ---- ---- ----
+### 1/1 [`./test/select5.test`](https://github.com/mathiasrw/alasql-logictest/blob/master/sqllogic/./test/select5.test)
+
+_Mimic sqlite_

sqllogic/run_md.js

@@ -7,17 +7,17 @@ var util = require('util');
 var pretty = require('prettysize');
 var md5    = require("MD5");
 var comparray = require('comparray');
-var sqllogictestparser =  require('./sqllogictestparserV2');
-var alasql = require('./alasql');
+var sqllogictestparser =  require(__dirname+'/sqllogictestparserV2');
+var alasql = require('alasql');
 //var sql = require('sql.js');
 
 console.time('Total script time');
 
 
 //////////////////////////// CONFIG START /////////////////////////////////////
 
-// Incomment to use local file instead of node_module
-alasql = require('./alasql.js');
+// outcomment to use node_module version instead of local file
+// alasql = require(__dirname+'/alasql');
 
 // If set to false an error will only be printed first time ic occures in all test files.
 var printAllErrors = false;
@@ -42,18 +42,19 @@ var debugErrorInfo = false;
 
 // Config of what tests to run
 var testfiles = walkFiles(
-							'test', 					// Folder where to find test files
+							'./test', 			// Folder where to find test files
 
 
 							/\.test$/, 					// Regexp for files to include (all files ending with .test )
 
 
 														// Regexp for files to exclude - keep one and outcomment the rest
-							/00\/|\d{2,}\.test/			// Exclude a lot of files (fastest - 125 files)
+					//		/00\/|\d{2,}\.test/			// Exclude a lot of files (fastest - 125 files)
 					//		/\/10+\//					// exclude biggest files (balance between time and depth) (410 files)
-					//		null						// Exclude no files - As all tests contains a few million tests it can take some time. (622+ files)
+							null						// Exclude no files - As all tests contains a few million tests it can take some time. (622+ files)
 						);
 //testfiles=['test/index/between/10/slt_good_0.test'];
+//testfiles=['./test/select5.test'];
 
 //What databases to mimic when running tests
 var mimic = [ 
@@ -170,15 +171,22 @@ for (var i in testfiles) {
 	for (mimicking = 0; mimicking < mimic.length; mimicking++) {
 
 		var name = testfiles[i].replace(/[^a-z0-9]/mig,'_') + mimic[mimicking];
+		
 		var db = new alasql.Database(name);
+		
+		/*
+		var db = alasqlFn();
+		db.options.modifier = "MATRIX";
+		db.options.cache = false;
+		*/
 
 		if(useSqliteDb){
 			db = new sql.Database();
 		}
 
 		score.round.init();
 
-		runSQLtestFromFile(testfiles[i],  db, mimic[mimicking]);
+		runSQLtestFromFile(__dirname+'/'+testfiles[i],  db, mimic[mimicking]);
 
 		var roundCount = score.round.stat();
 		if(0===roundCount.total){
@@ -324,7 +332,7 @@ function runSQLtestFromFile(path, db, mimic){
 			// The hashing of the errors gives us first error per error type. The math random is there to give os 1% of all errors so we have some different examples. Should be avoided when we have the worst error types implemented correctly.
 			if(statementFaild || printAllErrors || !erroIndex[errHash] || Math.random()<curiousErrorprinting){
 
-				
+				//console.log(JSON.stringify(db.tables, null, 4));
 
 				console.log('');
 				console.log('```sql');

sqllogic/sqllogictestparserV2.js

@@ -1,34 +1,6 @@
-/*
-
-var fs = require('fs');
-
-
-var parserPath = './parser.txt'
-var parserDescription = fs.readFileSync(parserPath, "ASCII");
-var testDescription = fs.readFileSync(testPath, "ASCII");
-
-console.log('Creating parser')
-var parser = PEG.buildParser(parserDescription);
-console.log('Parser OK')
-console.log('')
-
-	
-console.log('Parseing test')	
-console.log(parser.parse(testDescription));
-
-
-
-
-
-
-
-
-
-*/
-
 var fs = require('fs');
 var PEG = require("pegjs");
-var _parserPath = 'parser.peg';
+var _parserPath = __dirname+'/parser.peg';
 //console.log('Initializing parser');
 //console.time('Parser OK');
 var _parserDescription = fs.readFileSync(_parserPath, "ASCII");
@@ -45,7 +17,7 @@ module.exports = function(path) {
 
 	var parser = _parser;
 
-	var commands = []
+	var commands = [];
 
 	var fileContent = fs.readFileSync(path, "ASCII");
 
@@ -63,7 +35,7 @@ module.exports = function(path) {
 	for (var i = 0; i < textCommands.length; i++) {
 
 
-		if(''==textCommands[i]){
+		if(''===textCommands[i]){
 			continue;
 		}
 
@@ -72,203 +44,24 @@ module.exports = function(path) {
 			commands.push(parser.parse(textCommands[i]+"\n"));
 		}catch(e){
 			// output if could not be passed
-			console.log('************ Error parseing test number', (i+1), 'in file', path)	
+			console.log('************ Error parseing test number', (i+1), 'in file', path);	
 			console.log('previus one (passed):',textCommands[i-1]);
 			console.log('this one (failed):', textCommands[i]);
 			if(i+1 < textCommands.length)
 				console.log('Next test to be passed:', textCommands[i+1]);
-			console.log('')	
-			console.log(JSON.stringify({error:e.message}))
-			console.log('----------------')		
-			console.log('')		
+			console.log('');	
+			console.log(JSON.stringify({error:e.message}));
+			console.log('----------------');		
+			console.log('');		
 		}	
 
 
 
-	};
+	}
 
 
 	return commands;
 
 
 
 };
-
- /*
- 
- {
-  function doInt(o) {
-    return parseInt(o.join(""), 10);
-  }
-
-}
-
-start 
-  = nl* c:command trim? {return c}
-
-trim
-  = ([\n\t ]*) 
-
-
-command
-  = statement 
-  / query   
-  / hash 
-  / halt 
-  
-
-
-halt
-	= "halt"i 
-  		{	
-	  		return {
-	  					command:'halt'
-	  				}	 
-	  	}
-
-hash
-	= "hash-threshold" _ maxResponses:[0-9]+ 
-  		{
-  			return {
-  						command: 'setThreshold', 
-  						maxResponses: doInt(maxResponses)
-  					} 
-  		}
-
-statement
-  = expect:statementExpectation _* nl sql:sql 
-  	{
-  		return {
-  					command: 'execute', 
-  					expectSucess: expect, 
-  					sql:sql
-  				}
-  	}
-
-statementExpectation
-  = "statement"i ' ' v:statementOption {return v}
-
-statementOption
-  = "ok"i    {return true}
-  / "fail"i  {return false}
-
-
-sql
-  = result:	(
-				t:(!delimitor .) {return t[1];}
-			)* 
-		delimitor {return result.join("");}
-
-delimitor
-	= '\n----'
-	/ !.
-
-query
-  = queryInit:queryInit? 
-    queryMain:queryMain nl
-    sql:sql nl
-    result:result
-    {
-    	return {
-			command: 'execute',
-			expectSucess: true,
-			sql: sql,
-			result: result,
-			skipif: queryInit.skipif || false,
-			onlyif: queryInit.onlyif || false,
-		}
-    }
-
-nl
-	= "\n"
-
-result
-	= resultHash
-	/ resultList
-	/ resultVoid
-
-resultHash
-	= amount:$[0-9]+ 
-		" values hashing to " 
-		hash:alphanum 
-		{
-			return {
-				type:'hash',
-				amount: amount,
-				hash:hash
-			}
-		}
-
-
-resultList
-	= list:(v:$[^\n]+ nl{return v})+
-	{
-		console.log(list)
-		return {
-			type:'list',
-			values: list
-		}
-	}
-	
-resultVoid
-	= nl* !. 
-	{
-		return{
-			type:"void"
-		}
-
-	}
-	
-
-queryInit
-  = c:queryInitCommand* 
-  	{ 
-  		var skipif = [];
-  		var onlyif = [];
-		for (var i = c.length - 1; i >= 0; i--) {
-			if('skip' == c[i].type){
-				skipif.push(c[i].val);
-			} else if('only' == c[i].type){
-				onlyif.push(c[i].val);
-			}
-		};
-  		return {skipif:skipif,onlyif:onlyif}
-  	}
-
-queryInitCommand
-  = "skipif"i ' ' v:alphanum nl {return {type:'skip', val: v}}
-  / "onlyif"i ' ' v:alphanum nl {return {type:'only', val: v}}
-
-
-queryMain
- = "query"i _ colInfo _ sortInfo
-
-skipif
-  = "skipif"i _ alphanum
-
-
-colInfo
-  = [SDI]+
-
-sortInfo
-  = "nosort"i
-  / "rowsort"i
-
-
-alphanum
-  = $[a-z0-9]i+
-
-
-_
-	= ' '
-
-
-
-
-
-
-
-
-
- 
- */