build process changes

Author: Pamblam

.gitignore

@@ -1,5 +1,7 @@
 /nbproject/
-/tests/.jsqldatastore
+/test/.jsqldatastore
 .jsqldatastore
 package-lock.json
-node_modules
+node_modules
+coverage
+.coveralls.yml

.travis.yml

@@ -1,3 +1,5 @@
 language: node_js
 node_js:
   - "node"
+script: npm run coverage
+after_success: 'npm run coveralls'

tests/test4.js _tmp/test4.jstests/test4.js renamed to _tmp/test4.js

@@ -0,0 +1,2 @@
+	
+repo_token: 9bgpsLWzkdOMWCgv2HQqoi5B9Lh8ieMXg

tests/test5.js _tmp/test5.jstests/test5.js renamed to _tmp/test5.js

@@ -7,7 +7,9 @@
     "example": "tests"
   },
   "scripts": {
-    "test": "node ./tests/test1.js && node ./tests/test2.js && node ./tests/test3.js && node ./tests/test4.js && node ./tests/test5.js && node ./tests/test6.js && node ./tests/test7.js"
+    "test": "node node_modules/.bin/mocha",
+    "coverage": "node node_modules/.bin/istanbul cover _mocha -- -R spec",
+	"coveralls": "cat ./coverage/lcov.info | node node_modules/.bin/coveralls"
   },
   "repository": {
     "type": "git",
@@ -34,9 +36,13 @@
   },
   "homepage": "http://pamblam.github.io/jSQL/",
   "devDependencies": {
+    "chai": "^4.1.2",
+    "coveralls": "^3.0.0",
     "grunt": "^1.0.1",
     "grunt-contrib-concat": "^1.0.1",
     "grunt-contrib-uglify": "^3.1.0",
-    "grunt-string-replace": "^1.3.1"
+    "grunt-string-replace": "^1.3.1",
+    "istanbul": "^0.4.5",
+    "mocha": "^4.0.1"
   }
 }

tests/test6.js _tmp/test6.jstests/test6.js renamed to _tmp/test6.js

@@ -0,0 +1,123 @@
+var expect = require('chai').expect;
+var jSQL = require("../jSQL.js");
+
+jSQL.onError(function(e){
+	console.log(e.message);
+});
+
+jSQL.load(function () {
+	jSQL.reset();
+	describe('Lexer/Parser tests', function () {
+		
+		it('create wtf_test table', function(){
+			jSQL.query("create table wtf_test (id, name, `somekey` varchar(), something enum('hello','goodbye'), primary key(`id`, name), unique key (somekey) )").execute();
+			expect((jSQL.tables.wtf_test !== undefined)).to.be.true;
+		});
+		
+		it('create typetest table', function(){
+			jSQL.query("create table typetest (id numeric(3), data json, greet function, active boolean, `number` int(3), code char(4), name varchar(4), created date, anything ambi, something enum('hello','goodbye') )").execute();
+			expect((jSQL.tables.typetest.colmap.number === 4 && jSQL.tables.typetest.types[9].args[0] === 'hello' && jSQL.tables.typetest.types[9].args[1] === 'goodbye')).to.be.true;
+		});
+		
+		it('create keytest table', function(){
+			jSQL.query("create table keytest (id int auto_increment primary key, data, greet, active, `number`, code, name varchar, created date, anything ambi, something enum('hello','goodbye') )").execute();
+			expect((jSQL.tables.keytest.keys.primary.column === 'id' && jSQL.tables.keytest.auto_inc_col === 'id')).to.be.true;
+		});
+		
+		it('create keytest2 table', function(){
+			jSQL.query("create table keytest2 (id int auto_increment, data, greet, active, `number`, code, name varchar, created date, anything ambi, something enum('hello','goodbye'), primary key(`id`, name) )").execute();
+			expect((jSQL.tables.keytest2.keys.primary.column[0] === 'id' && jSQL.tables.keytest2.keys.primary.column[1] === 'name' && jSQL.tables.keytest2.auto_inc_col === 'id')).to.be.true;
+		});
+		
+		it('create smalltest table', function(){
+			jSQL.query("create table `smalltest` (id int, str varchar)").execute();
+			expect((!!jSQL.tables.smalltest)).to.be.true;
+		});
+		
+		it('insert into smalltest table', function(){
+			jSQL.query("insert into smalltest (id, str) values (7, 'testing')").execute();
+			expect((jSQL.tables.smalltest.data.length === 1)).to.be.true;
+		});
+		
+		it('insert into smalltest table again', function(){
+			jSQL.query("insert into `smalltest` values (11, 'testing again')").execute();
+			expect((jSQL.tables.smalltest.data.length === 2)).to.be.true;
+		});
+		
+		it('insert into typetest table', function(){
+			jSQL.query("insert into `typetest` values (11, '{\"greeting\":\"hello\"}', 'function(){console.log(\"hello world\")}', true, 3, '72', 'rob', 'Mon, 25 Dec 1995 13:30:00 +0430', 'scooby doo', \"hello\")").execute();
+			expect((jSQL.tables.typetest.data.length === 1)).to.be.true;
+		});
+		
+		it('insert into keytest2 table', function(){
+			jSQL.query("insert into `keytest2` (id, `greet`) values (11, 'holla')").execute();
+			expect((jSQL.tables.keytest2.data[0][0] === 11)).to.be.true;
+		});
+		
+		it('insert into keytest2 table again', function(){
+			jSQL.query("insert into `keytest2` (`greet`) values ('poopums')").execute();
+			expect((jSQL.tables.keytest2.data[1][0] === 12)).to.be.true;
+		});
+		
+		it('select from typetest table', function(){
+			var res = jSQL.query("select * from `typetest`").execute().fetchAll("ARRAY");
+			expect((res[0][7] instanceof Date && "function" === typeof res[0][2])).to.be.true;
+		});
+		
+		it('select from keytest2 table', function(){
+			var q = jSQL.query("SELECT id, greet FROM `keytest2` WHERE `id` > 11").execute();
+			expect((q.fetch("ASSOC").greet === "poopums")).to.be.true;
+		});
+		
+		it('select from keytest2 table again', function(){
+			var q = jSQL.query("SELECT id, greet FROM `keytest2` WHERE `id` < 12").execute();
+			expect((q.fetch("ASSOC").greet === "holla")).to.be.true;
+		});
+		
+		it('select from keytest2 table again again', function(){
+			var q = jSQL.query("SELECT * FROM `keytest2` WHERE `id` < 12 and greet = 'holla'").execute();
+			expect((q.fetch("ASSOC").greet === "holla")).to.be.true;
+		});
+		
+		it('select from keytest2 table once again', function(){
+			var q = jSQL.query("SELECT * FROM `keytest2` WHERE `id` < 12 and greet = 'holla' and greet <> \"poo\" or id = 11").execute();
+			expect((q.fetch("ASSOC").greet === "holla")).to.be.true;
+		});
+		
+		it('select from keytest2 table again once again', function(){
+			var q = jSQL.query("SELECT * FROM `keytest2` WHERE `greet` LIKE '%olla'").execute();
+			expect((q.fetch("ASSOC").greet === "holla")).to.be.true;
+		});
+		
+		it('select from keytest2 table again once again once', function(){
+			var q = jSQL.query("SELECT * FROM `keytest2` WHERE `greet` LIKE '%o%'").execute();
+			expect((q.fetchAll("ASSOC").length === 2)).to.be.true;
+		});
+		
+		it('select from keytest2 table again once again once more', function(){
+			var q = jSQL.query("SELECT * FROM `keytest2` WHERE `greet` LIKE 'p%'").execute();
+			expect((q.fetchAll("ASSOC").length === 1)).to.be.true;
+		});
+		
+		it('update keytest2 table', function(){
+			var q = jSQL.query("update `keytest2` set `greet` = 'yyyyo' where id = 12").execute();
+			expect((jSQL.tables.keytest2.data[1][2] === 'yyyyo')).to.be.true;
+		});
+		
+		it('update keytest2 table again', function(){
+			var q = jSQL.query("update`keytest2`set`greet`='waddapp',data=\"data\"where`id`=11").execute();
+			expect((jSQL.tables.keytest2.data[0][2] === 'waddapp' && jSQL.tables.keytest2.data[0][1] === 'data')).to.be.true;
+		});
+		
+		it('delete from keytest2 table', function(){
+			var q = jSQL.query("delete from `keytest2` where `greet` = 'waddapp'").execute();
+			expect((jSQL.tables.keytest2.data.length === 1)).to.be.true;
+		});
+		
+		it('drop keytest2 table', function(){
+			var q = jSQL.query("drop table `keytest2`").execute();
+			expect((jSQL.tables.keytest2 === undefined)).to.be.true;
+		});
+		
+	});
+});

coveralls.yml

@@ -0,0 +1,40 @@
+var expect = require('chai').expect;
+var jSQL = require("../jSQL.js");
+
+jSQL.onError(function(e){
+	console.log(e.message);
+});
+
+jSQL.load(function () {
+	jSQL.reset();
+	describe('FuNkY TaBlE TeSts', function () {
+		
+		it('inserting inconsistent objects', function(){
+			jSQL.createTable("oTable", [
+				{a:1, b:2, c:3, d:4, e:5, f:6, g:7},
+				{a:2, b:3, c:3, d:54, e:7, f:6},
+				{a:2, b:3, c:3, d:54, e:7, f:6, g:7, h:"d"}
+			]).execute();
+			expect((jSQL.tables.oTable.data.length === 3 && jSQL.tables.oTable.columns.length === 8)).to.be.true;
+		});
+		
+		it('dynamically adding columns', function(){
+			jSQL.createTable("aTable", ["a", "b", "c"]).execute([
+				[12, 34, 56, 78],
+				[23, 45, 67, 89, 78, 78],
+				[7]
+			]);
+			expect((jSQL.tables.aTable.data.length === 3 && jSQL.tables.aTable.columns.length === 6)).to.be.true;
+		});
+		
+		it('mixing arrays and objects', function(){
+			jSQL.createTable("ceTable", ['a', 'b', 'c', 'd', 'e', 'f', 'g']).execute([
+				[12, 34, 56, 78],
+				[23, 45, 67, 89, 78, 78],
+				[7], {"a": 1, "b": 2, "g": 3}
+			]);
+			expect((jSQL.tables.ceTable.data.length === 4 && jSQL.tables.ceTable.columns.length === 7)).to.be.true;
+		});
+		
+	});
+});

package.json

@@ -0,0 +1,66 @@
+var expect = require('chai').expect;
+var jSQL = require("../jSQL.js");
+
+jSQL.onError(function(e){
+	console.log(e.message);
+});
+
+function hat(type,color){
+	this.type = type;
+	this.color = color;
+	this.getName = function(){
+		return "a "+this.color+" "+this.type;
+	};
+}
+
+jSQL.types.add({
+	type: "HAT",
+	serialize: function(value, args){
+		return JSON.stringify(value);
+	},
+	unserialize: function(value, args){
+		var o = JSON.parse(value);
+		return new hat(o.type, o.color);
+	}
+});
+
+jSQL.load(function () {
+	jSQL.reset();
+	describe('Custom objects test', function () {
+		
+		it('storing custom objects', function(){
+			
+			// create the table and populate it, 
+			// if it does not already exist
+			var query = jSQL.query("Create table if not exists hatTable "+
+				"(name varchar(50,5), age int, created date, greet function, favorite_hat hat)");
+
+			// execute the query and insert the data 
+			// (if the table doesn't already exist)
+			query.execute([{ 
+				name: "bob",
+				age: 27,
+				created: new Date(),
+				greet: function(){alert("hi!");},
+				favorite_hat: new hat("cowboy hat","blue")
+			},{
+				name: "ned",
+				age: 29,
+				created: new Date(),
+				greet: function(){alert("hello!");},
+				favorite_hat: new hat("baseball cap","green")
+			},{
+				name: "Fred",
+				age: 34,
+				created: new Date(),
+				greet: function(){alert("sup dawg!");},
+				favorite_hat: new hat("tophat","purple")
+			}]);
+			
+			
+			
+			expect((jSQL.tables.hatTable.data.length === 3)).to.be.true;
+		});
+		
+	});
+});