alasql 0.0.50 → 0.0.52

package/gulpfile.js

@@ -1,3 +1,388 @@
+<<<<<<< HEAD
+//
+// gulpfile.js
+// Gulp for Alasql
+// Дата: 06.08.2014
+// (c) 2014, Andrey Gershun
+//
+
+var gulp = require('gulp');
+module.exports = gulp;
+//var connect = require('gulp-connect');
+//var livereload = require('gulp-livereload');
+//var changed = require('gulp-changed');
+//var jison = require('gulp-jison');
+var concat = require('gulp-concat-sourcemap');
+//var uglify = require('gulp-uglify');
+//var jisonLex = require('gulp-jison-lex');
+var shell = require('gulp-shell');
+
+
+gulp.task('js-merge-worker', function () {
+  return gulp.src([
+    './src/05copyright.js', 
+    './src/99worker-start.js', 
+    './src/99worker.js', 
+    './src/99worker-finish.js', 
+    ])
+//    .pipe(changed('./dist/'))
+    .pipe(concat('alasql-worker.js'))
+//    .pipe(uglify())
+    .pipe(gulp.dest('./dist'))
+});
+
+gulp.task('js-merge', function () {
+  return gulp.src([
+    './src/05copyright.js', 
+  	'./src/10start.js', 
+  	'./src/alasqlparser.js', 
+    './src/12pretty.js', 
+  	'./src/15utility.js', 
+    './src/16comments.js', 
+    './src/17alasql.js', 
+    './src/20database.js',
+    './src/21transaction.js',
+//    './src/22store.js',
+    './src/23table.js',
+    './src/24view.js',
+  	'./src/25queryclass.js',
+    './src/28yy.js',
+  	'./src/30statements.js',
+    './src/38query.js',
+    './src/39dojoin.js',
+  	'./src/40select.js',
+    './src/41exists.js',
+    './src/420from.js',
+    './src/421join.js',
+    './src/422where.js',
+    './src/423groupby.js',
+    './src/424select.js',
+    './src/425having.js',
+    './src/426orderby.js',
+    './src/43rollup.js',    
+    './src/44defcols.js',
+    './src/45union.js',
+    './src/46apply.js',
+    './src/47over.js',
+  	'./src/50expression.js',
+    './src/52linq.js',
+    './src/55functions.js',
+    './src/56datetime.js',
+    './src/57case.js',
+    './src/58json.js',
+    './src/59convert.js',
+  	'./src/60createtable.js',
+    './src/61date.js',
+    './src/62droptable.js',
+    './src/64altertable.js',
+    './src/65createindex.js',
+    './src/66dropindex.js',
+    './src/67withselect.js',
+    './src/68if.js',
+    './src/69while.js',
+  	'./src/70insert.js',
+    './src/72delete.js',
+    './src/74update.js',
+    './src/74update.js',
+    './src/75merge.js',
+    './src/76usedatabase.js',
+    './src/77declare.js',
+    './src/78show.js',
+    './src/79set.js',
+    './src/80console.js',
+    './src/81commit.js',
+    './src/83into.js',
+    './src/84from.js',
+    './src/85help.js',
+    './src/86print.js',
+    './src/87source.js',
+    './src/88require.js',
+    './src/89assert.js',
+    './src/90websql.js',
+    './src/91indexeddb.js',
+    './src/92localstorage.js',
+    './src/93sqlite.js',
+    './src/94filestorage.js',
+    './src/97saveas.js',
+    './src/FileSaver.js',
+   	'./src/98finish.js',
+    './src/99worker.js'
+    ])
+//    .pipe(changed('./dist/'))
+    .pipe(concat('alasql.js'))
+//    .pipe(uglify())
+    .pipe(gulp.dest('./dist'))
+});
+
+
+gulp.task('jison-compile', function () {
+  return gulp.src('./src/*.jison', {read: false})
+    .pipe(shell([
+      'jison ./src/alasqlparser.jison -o ./src/alasqlparser.js',
+    ]));
+});
+
+
+gulp.task('uglify', function () {
+  return gulp.src('./alasql.js', {read: false})
+    .pipe(shell([
+      'uglifyjs dist/alasql.js -o dist/alasql.min.js',
+      'uglifyjs dist/alasql-worker.js -o dist/alasql-worker.min.js',
+    ]));
+});
+
+gulp.task('copy-dist', function(){
+  gulp.src(['./dist/alasql.js','./alasql.js.map'])
+    .pipe(gulp.dest('./'));
+});
+
+gulp.task('copy-dist-org', function(){
+  gulp.src(['./dist/alasql.min.js','./dist/alasql-worker.min.js'])
+    .pipe(gulp.dest('./console/'));
+});
+
+// Additional task to update alasql.org/console directory
+gulp.task('copy-console-org', function(){
+  gulp.src(['./console/*'])
+    .pipe(gulp.dest('../alasql-org/console/'));
+});
+
+//    , {
+//      templateData: {
+//        f: function (s) {
+//          return s.replace(/$/, '.bak')
+//        }
+//      }
+//    }))
+
+// gulp.task('jison-compile', function () {
+//   return gulp.src('./src/*.jison')
+ //    .pipe(changed('./dist/'))
+//     .pipe(jison({ moduleType: 'commonjs' }))
+//     .pipe(gulp.dest('./src/'))
+// //    .pipe(livereload());
+// });
+
+// gulp.task('jison-lex-compile', function () {
+//   return gulp.src('./src/*.jisonlex')
+// //    .pipe(changed('./dist/'))
+//     .pipe(jisonLex())
+//     .pipe(gulp.dest('./src2/'))
+// //    .pipe(livereload());
+// });
+
+
+// Главная задача
+gulp.task('default', ['js-merge' /*, 'jison-compile', 'jison-lex-compile' */], function(){
+  gulp.watch('./src/*.js',function(){ gulp.run('js-merge'); });
+  gulp.watch('./src/99worker*.js',function(){ gulp.run('js-merge-worker'); });
+  gulp.watch('./src/*.jison',function(){ gulp.run('jison-compile'); });
+  gulp.watch('./dist/alasql.js',function(){ gulp.run('uglify'); });
+  gulp.watch('./dist/alasql.min.js',function(){ 
+    gulp.run('copy-dist'); 
+    gulp.run('copy-dist-org');
+  });
+  gulp.watch('./dist/alasql-worker.js',function(){ 
+    gulp.run('copy-dist'); 
+    gulp.run('copy-dist-org');
+  });
+  gulp.watch('./console/*',function(){ gulp.run('copy-console-org'); });
+  // gulp.watch('./src/*.jison',function(){ gulp.run('jison-compile'); gulp.run('js-merge');});
+  // gulp.watch('./src/*.jisonlex',function(){ gulp.run('jison-lex-compile'); gulp.run('js-merge');});
+});
+||||||| merged common ancestors
+//
+// gulpfile.js
+// Gulp for Alasql
+// Дата: 06.08.2014
+// (c) 2014, Andrey Gershun
+//
+
+var gulp = require('gulp');
+module.exports = gulp;
+//var connect = require('gulp-connect');
+//var livereload = require('gulp-livereload');
+//var changed = require('gulp-changed');
+//var jison = require('gulp-jison');
+var concat = require('gulp-concat-sourcemap');
+//var uglify = require('gulp-uglify');
+//var jisonLex = require('gulp-jison-lex');
+var shell = require('gulp-shell');
+
+
+gulp.task('js-merge-worker', function () {
+  return gulp.src([
+    './src/05copyright.js', 
+    './src/99worker-start.js', 
+    './src/99worker.js', 
+    './src/99worker-finish.js', 
+    ])
+//    .pipe(changed('./dist/'))
+    .pipe(concat('alasql-worker.js'))
+//    .pipe(uglify())
+    .pipe(gulp.dest('./dist'))
+});
+
+gulp.task('js-merge', function () {
+  return gulp.src([
+    './src/05copyright.js', 
+  	'./src/10start.js', 
+  	'./src/alasqlparser.js', 
+    './src/12pretty.js', 
+  	'./src/15utility.js', 
+    './src/16comments.js', 
+    './src/17alasql.js', 
+    './src/20database.js',
+    './src/21transaction.js',
+//    './src/22store.js',
+    './src/23table.js',
+    './src/24view.js',
+  	'./src/25queryclass.js',
+    './src/28yy.js',
+  	'./src/30statements.js',
+    './src/38query.js',
+    './src/39dojoin.js',
+  	'./src/40select.js',
+    './src/41exists.js',
+    './src/420from.js',
+    './src/421join.js',
+    './src/422where.js',
+    './src/423groupby.js',
+    './src/424select.js',
+    './src/425having.js',
+    './src/426orderby.js',
+    './src/43rollup.js',    
+    './src/44defcols.js',
+    './src/45union.js',
+    './src/46apply.js',
+    './src/47over.js',
+  	'./src/50expression.js',
+    './src/52linq.js',
+    './src/55functions.js',
+    './src/56datetime.js',
+    './src/57case.js',
+    './src/58json.js',
+    './src/59convert.js',
+  	'./src/60createtable.js',
+    './src/61date.js',
+    './src/62droptable.js',
+    './src/64altertable.js',
+    './src/65createindex.js',
+    './src/66dropindex.js',
+    './src/67withselect.js',
+    './src/68if.js',
+    './src/69while.js',
+  	'./src/70insert.js',
+    './src/72delete.js',
+    './src/74update.js',
+    './src/74update.js',
+    './src/75merge.js',
+    './src/76usedatabase.js',
+    './src/77declare.js',
+    './src/78show.js',
+    './src/79set.js',
+    './src/80console.js',
+    './src/81commit.js',
+    './src/83into.js',
+    './src/84from.js',
+    './src/85help.js',
+    './src/86print.js',
+    './src/87source.js',
+    './src/88require.js',
+    './src/89assert.js',
+    './src/90websql.js',
+    './src/91indexeddb.js',
+    './src/92localstorage.js',
+    './src/93sqlite.js',
+    './src/94filestorage.js',
+    './src/97saveas.js',
+    './src/FileSaver.js',
+   	'./src/98finish.js',
+    './src/99worker.js'
+    ])
+//    .pipe(changed('./dist/'))
+    .pipe(concat('alasql.js'))
+//    .pipe(uglify())
+    .pipe(gulp.dest('./dist'))
+});
+
+
+gulp.task('jison-compile', function () {
+  return gulp.src('./src/*.jison', {read: false})
+    .pipe(shell([
+      'jison ./src/alasqlparser.jison -o ./src/alasqlparser.js',
+    ]));
+});
+
+
+gulp.task('uglify', function () {
+  return gulp.src('./alasql.js', {read: false})
+    .pipe(shell([
+      'uglifyjs dist/alasql.js -o dist/alasql.min.js',
+      'uglifyjs dist/alasql-worker.js -o dist/alasql-worker.min.js',
+    ]));
+});
+
+gulp.task('copy-dist', function(){
+  gulp.src(['./dist/alasql.js','./alasql.js.map'])
+    .pipe(gulp.dest('./'));
+});
+
+gulp.task('copy-dist-org', function(){
+  gulp.src(['./dist/alasql.min.js','./dist/alasql-worker.min.js'])
+    .pipe(gulp.dest('./console/'));
+});
+
+// Additional task to update alasql.org/console directory
+gulp.task('copy-console-org', function(){
+  gulp.src(['./console/*'])
+    .pipe(gulp.dest('../alasql-org/console/'));
+});
+
+//    , {
+//      templateData: {
+//        f: function (s) {
+//          return s.replace(/$/, '.bak')
+//        }
+//      }
+//    }))
+
+// gulp.task('jison-compile', function () {
+//   return gulp.src('./src/*.jison')
+ //    .pipe(changed('./dist/'))
+//     .pipe(jison({ moduleType: 'commonjs' }))
+//     .pipe(gulp.dest('./src/'))
+// //    .pipe(livereload());
+// });
+
+// gulp.task('jison-lex-compile', function () {
+//   return gulp.src('./src/*.jisonlex')
+// //    .pipe(changed('./dist/'))
+//     .pipe(jisonLex())
+//     .pipe(gulp.dest('./src2/'))
+// //    .pipe(livereload());
+// });
+
+
+// Главная задача
+gulp.task('default', ['js-merge' /*, 'jison-compile', 'jison-lex-compile' */], function(){
+  gulp.watch('./src/*.js',function(){ gulp.run('js-merge'); });
+  gulp.watch('./src/99worker*.js',function(){ gulp.run('js-merge-worker'); });
+  gulp.watch('./src/*.jison',function(){ gulp.run('jison-compile'); });
+  gulp.watch('./dist/alasql.js',function(){ gulp.run('uglify'); });
+  gulp.watch('./dist/alasql.min.js',function(){ 
+    gulp.run('copy-dist'); 
+    gulp.run('copy-dist-org');
+  });
+  gulp.watch('./dist/alasql-worker.js',function(){ 
+    gulp.run('copy-dist'); 
+    gulp.run('copy-dist-org');
+  });
+  gulp.watch('./console/*',function(){ gulp.run('copy-console-org'); });
+  // gulp.watch('./src/*.jison',function(){ gulp.run('jison-compile'); gulp.run('js-merge');});
+  // gulp.watch('./src/*.jisonlex',function(){ gulp.run('jison-lex-compile'); gulp.run('js-merge');});
+});
+=======
 //
 // gulpfile.js
 // Gulp for Alasql
@@ -191,3 +576,4 @@ gulp.task('default', ['js-merge' /*, 'jison-compile', 'jison-lex-compile' */], f
   // gulp.watch('./src/*.jison',function(){ gulp.run('jison-compile'); gulp.run('js-merge');});
   // gulp.watch('./src/*.jisonlex',function(){ gulp.run('jison-lex-compile'); gulp.run('js-merge');});
 });
+>>>>>>> release/0.0.46

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "alasql",
   "description": "AlaSQL - JavaScript SQL database and data manipulation library",
-  "version": "0.0.50",
+  "version": "0.0.52",
   "author": "Andrey Gershun <agershun@gmail.com>",
   "directories": {
     "example": "examples",

package/src/05copyright.js

@@ -2,7 +2,7 @@
 // alasql.js
 // AlaSQL - JavaScript SQL database
 // Date: 22.04.2015
-// Version: 0.0.50
+// Version: 0.0.52
 // (ñ) 2014-2015, Andrey Gershun
 //
 

package/src/10start.js

@@ -78,5 +78,5 @@ var alasql = function(sql, params, cb, scope) {
 };
 
 /** Current version of alasql */
-alasql.version = "0.0.50";
+alasql.version = "0.0.52";
 

package/src/15utility.js

@@ -565,11 +565,11 @@ var cloneDeep = utils.cloneDeep = function cloneDeep(obj) {
     if(obj == null || typeof(obj) != 'object')
         return obj;
 
-    var temp = obj.constructor(); // changed
+    var temp = (Object.prototype.hasOwnProperty.call(obj, 'constructor') ? Object : obj.constructor)(); // changed
 
     for(var key in obj) {
         if(obj.hasOwnProperty(key)) {
-            temp[key] = cloneDeep(obj[key]);
+            /* A "__proto__" key from parsed data is copied as data, never as the prototype */ if (key === '__proto__') { Object.defineProperty(temp, key, {value: cloneDeep(obj[key]), writable: true, enumerable: true, configurable: true}); } else { temp[key] = cloneDeep(obj[key]); }
         }
     }
     return temp;
@@ -649,7 +649,7 @@ var extend = utils.extend = function extend (a,b){
     if(typeof a == 'undefined') a = {};
     for(var key in b) {
         if(b.hasOwnProperty(key)) {
-            a[key] = b[key]
+            /* A "__proto__" key from parsed data is copied as data, never as the prototype */ if (key === '__proto__') { Object.defineProperty(a, key, {value: b[key], writable: true, enumerable: true, configurable: true}); } else { a[key] = b[key]; }
         }
     }
     return a;

package/src/17alasql.js

@@ -51,6 +51,12 @@ alasql.options.casesensitive = true; // Table and column names are case sensitiv
 alasql.options.logtarget = 'output'; // target for log. Values: 'console', 'output', 'id' of html tag
 alasql.options.logprompt = true; // Print SQL at log
 
+// Default modifier
+// values: RECORDSET, VALUE, ROW, COLUMN, MATRIX, TEXTSTRING, INDEX
+alasql.options.modifier = undefined; 
+// How many rows to lookup to define columns
+alasql.options.columnlookup = 10; 
+
 //alasql.options.worker = false;
 // Variables
 alasql.vars = {};

package/src/38query.js

@@ -212,16 +212,63 @@ function queryfn3(query) {
 
 //	console.log('removeKeys:',query.removeKeys);
 
-    var removeKeys = query.removeKeys;
-    if(typeof angular != "undefined") removeKeys.push('$$hashKey');
-    var jlen = removeKeys.length;
-    if(jlen > 0) {
-      for(var i=0,ilen=query.data.length;i<ilen;i++) {
-        for(var j=0; j<jlen;j++)
-          delete query.data[i][removeKeys[j]];
-      }    
-    };
+	if(typeof query.removeKeys != 'undefined' &&  query.removeKeys.length > 0) {
+	    var removeKeys = query.removeKeys;
+
+	    // TODO: Check what artefacts rest from Angular.js
+	    if(typeof angular != "undefined") removeKeys.push('$$hashKey');
+
+	    // Remove from data
+	    var jlen = removeKeys.length;
+	    if(jlen > 0) {
+	      for(var i=0,ilen=query.data.length;i<ilen;i++) {
+	        for(var j=0; j<jlen;j++) {
+	          delete query.data[i][removeKeys[j]];
+	        }
+	      }    
+	    };
+
+	    // Remove from columns list
+		if(query.columns.length > 0) {
+			query.columns = query.columns.filter(function(column){
+				var found = false;
+				removeKeys.forEach(function(key){
+					if(column.columnid == key) found = true;
+				});
+				return !found;
+			});
+		}
+
+	}
+
+	if(typeof query.removeLikeKeys != 'undefined' && query.removeLikeKeys.length > 0) {
+
+	    var removeLikeKeys = query.removeLikeKeys;
+
+		// Remove unused columns
+		// SELECT * REMOVE COLUMNS LIKE "%b"
+		for(var i=0,ilen=query.data.length;i<ilen;i++) {
+			var r = query.data[i];
+			for(var k in r) {
+				for(var j=0;j<query.removeLikeKeys.length;j++) {
+					if(k.match(query.removeLikeKeys[j])) {
+						delete r[k];
+					}				
+				}
+			}; 
+		}
 
+		if(query.columns.length > 0) {
+			query.columns = query.columns.filter(function(column){
+				var found = false;
+				removeLikeKeys.forEach(function(key){
+					if(column.columnid.match(key)) found = true;
+				});
+				return !found;
+			});
+		}
+
+	}
 //	console.log(query.intoallfns);
 
 	// if(query.explain) {

package/src/39dojoin.js

@@ -18,7 +18,7 @@ function doJoin (query, scope, h) {
 //			console.log("last",res);
 			// If there is a GROUP BY then pipe to groupping function
 			if(query.groupfn) {
-				query.groupfn(scope, query.params, query.alasql)
+				query.groupfn(scope, query.params, alasql)
 			} else {
 //				query.qwerty = 999;
 //console.log(query.qwerty, query.queriesfn && query.queriesfn.length,2);
@@ -85,6 +85,9 @@ function doJoin (query, scope, h) {
 
 			// Main cycle
 			var i = 0;
+			if(typeof data == 'undefined') {
+				throw new Error('Data source number '+h+' in undefined')
+			}
 			var ilen=data.length;
 			var dataw;
 //			console.log(h,opt,source.data,i,source.dontcache);

package/src/40select.js

@@ -98,6 +98,7 @@ yy.Select.prototype.compile = function(databaseid) {
 	// Create variable for query
 	var query = new Query();
 
+	// Array with columns to be removed
     query.removeKeys = [];
 
 	query.explain = this.explain; // Explain
@@ -128,6 +129,10 @@ yy.Select.prototype.compile = function(databaseid) {
 	} else {
 		query.selectfns = this.compileSelect1(query);
 	}
+
+	// Remove columns clause
+	this.compileRemoveColumns(query);
+
 	// 5. Optimize WHERE and JOINS
 	if(this.where) this.compileWhereJoins(query);
 
@@ -288,21 +293,42 @@ yy.Select.prototype.compile = function(databaseid) {
 };
 
 function modify(query, res) {
-	if(query.modifier == 'VALUE') {
+	var modifier = query.modifier || alasql.options.modifier;
+	var columns = query.columns;
+	if(typeof columns == 'undefined' || columns.length == 0) {
+		// Try to create columns
+		if(res.length > 0) {
+			var allcol = {};
+			for(var i=0;i<Math.min(res.length,alasql.options.columnlookup||10);i++) {
+				for(var key in res[i]) {
+					allcol[key] = true;
+				}
+			}
+
+			columns = Object.keys(allcol).map(function(columnid){
+				return {columnid:columnid};
+			});			
+		} else {
+			// Cannot recognize columns
+			columns = [];
+		}
+	}
+
+//	console.log(columns);
+
+	if(modifier == 'VALUE') {
 //		console.log(222,res);
 		if(res.length > 0) {
 			var key;
-			if(query.columns && query.columns.length > 0) key = query.columns[0].columnid;
+			if(columns && columns.length > 0) key = columns[0].columnid;
 			else key = Object.keys(res[0])[0];
 			res = res[0][key];
 		} else {
 			res = undefined;
 		}
-	} if(query.modifier == 'ROW') {
+	} if(modifier == 'ROW') {
 		if(res.length > 0) {
 			var key;
-			if(query.columns && query.columns.length > 0) key = query.columns[0].columnid;
-			else key = Object.keys(res[0])[0];
 			var a = [];
 			for(var key in res[0]) {
 				a.push(res[0][key]);
@@ -311,25 +337,37 @@ function modify(query, res) {
 		} else {
 			res = undefined;
 		}
-	} if(query.modifier == 'COLUMN') {
+	} if(modifier == 'COLUMN') {
 		var ar = [];
 		if(res.length > 0) {
 			var key;
-			if(query.columns && query.columns.length > 0) key = query.columns[0].columnid;
+			if(columns && columns.length > 0) key = columns[0].columnid;
 			else key = Object.keys(res[0])[0];
 			for(var i=0, ilen=res.length; i<ilen; i++){
 				ar.push(res[i][key]);
 			}
 		};
 		res = ar;
-	} if(query.modifier == 'MATRIX') {
-		res = arrayOfArrays(res);
-	} if(query.modifier == 'INDEX') {
+
+	} if(modifier == 'MATRIX') {
+		// Returns square matrix of rows
+		var ar = [];
+		for(var i=0;i<res.length;i++) {		
+			var a = [];
+			var r = res[i];
+			for(var j=0;j<columns.length;j++) {
+				a.push(r[columns[j].columnid]);
+			}
+			ar.push(a);
+		}
+		res = ar;
+
+	} if(modifier == 'INDEX') {
 		var ar = {};
 		var key,val;
-		if(query.columns && query.columns.length > 0) {
-			key = query.columns[0].columnid;
-			val = query.columns[1].columnid;
+		if(columns && columns.length > 0) {
+			key = columns[0].columnid;
+			val = columns[1].columnid;
 		} else {
 			var okeys = Object.keys(res[0]);
 			key = okeys[0];
@@ -340,12 +378,12 @@ function modify(query, res) {
 		}
 		res = ar;
 //		res = arrayOfArrays(res);
-	} if(query.modifier == 'RECORDSET') {
-		res = new alasql.Recordset({data:res, columns:query.columns});
+	} if(modifier == 'RECORDSET') {
+		res = new alasql.Recordset({data:res, columns:columns});
 //		res = arrayOfArrays(res);
-	} if(query.modifier == 'TEXTSTRING') {
+	} if(modifier == 'TEXTSTRING') {
 		var key;
-		if(query.columns && query.columns.length > 0) key = query.columns[0].columnid;
+		if(columns && columns.length > 0) key = columns[0].columnid;
 		else key = Object.keys(res[0])[0];
 		var s = '';
 		for(var i=0, ilen=res.length; i<ilen; i++){