alasql 2.0.6 → 2.1.0

package/dist/alasql.js

@@ -1,7 +1,7 @@
-//! AlaSQL v2.0.6-develop-b16970f3undefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v2.1.0-develop-2f9d1182undefined | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 2.0.6-develop-b16970f3undefined
+@version 2.1.0-develop-2f9d1182undefined
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -142,7 +142,7 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '2.0.6-develop-b16970f3undefined';
+alasql.version = '2.1.0-develop-2f9d1182undefined';
 
 /**
 	Debug flag
@@ -4109,6 +4109,15 @@ var extend = (utils.extend = function extend(a, b) {
 	return a;
 });
 
+/**
+ * Extracts the primitive data
+ */
+var getValueOf = (utils.getValueOf = function (val) {
+	return typeof val === 'object' && (val instanceof String || val instanceof Number)
+		? val.valueOf()
+		: val;
+});
+
 /**
  Flat array by first row
  */
@@ -4121,7 +4130,7 @@ var flatArray = (utils.flatArray = function (a) {
 	// For recordsets
 	if (typeof a === 'object' && a instanceof alasql.Recordset) {
 		return a.data.map(function (ai) {
-			return ai[a.columns[0].columnid];
+			return getValueOf(ai[a.columns[0].columnid]);
 		});
 	}
 	// Else for other arrays
@@ -9871,7 +9880,13 @@ yy.Select.prototype.compileOrder = function (query, params) {
 				var columnid = ord.expression.columnid;
 				if (query.xcolumns[columnid]) {
 					var dbtypeid = query.xcolumns[columnid].dbtypeid;
-					if (dbtypeid == 'DATE' || dbtypeid == 'DATETIME' || dbtypeid == 'DATETIME2')
+					if (
+						dbtypeid == 'DATE' ||
+						dbtypeid == 'DATETIME' ||
+						dbtypeid == 'DATETIME2' ||
+						dbtypeid == 'STRING' ||
+						dbtypeid == 'NUMBER'
+					)
 						dg = '.valueOf()';
 					// TODO Add other types mapping
 				} else {
@@ -9883,7 +9898,13 @@ yy.Select.prototype.compileOrder = function (query, params) {
 				var columnid = params[ord.expression.param];
 				if (query.xcolumns[columnid]) {
 					var dbtypeid = query.xcolumns[columnid].dbtypeid;
-					if (dbtypeid == 'DATE' || dbtypeid == 'DATETIME' || dbtypeid == 'DATETIME2')
+					if (
+						dbtypeid == 'DATE' ||
+						dbtypeid == 'DATETIME' ||
+						dbtypeid == 'DATETIME2' ||
+						dbtypeid == 'STRING' ||
+						dbtypeid == 'NUMBER'
+					)
 						dg = '.valueOf()';
 					// TODO Add other types mapping
 				} else {
@@ -10949,10 +10970,15 @@ yy.Op.prototype.toJS = function (context, tableid, defcols) {
 				context +
 				'))';
 			s += '.indexOf(';
-			s += leftJS() + ')>-1)';
+			s += 'alasql.utils.getValueOf(' + leftJS() + '))>-1)';
 		} else if (Array.isArray(this.right)) {
 			//			if(this.right.length == 0) return 'false';
-			s = '([' + this.right.map(ref).join(',') + '].indexOf(' + leftJS() + ')>-1)';
+			s =
+				'([' +
+				this.right.map(ref).join(',') +
+				'].indexOf(alasql.utils.getValueOf(' +
+				leftJS() +
+				'))>-1)';
 
 		} else {
 			s = '(' + rightJS() + '.indexOf(' + leftJS() + ')>-1)';
@@ -10969,11 +10995,11 @@ yy.Op.prototype.toJS = function (context, tableid, defcols) {
 			//			s += 'alasql.utils.flatArray(this.query.queriesfn['+(this.queriesidx)+'](params,null,p))';
 			s += 'alasql.utils.flatArray(this.queriesfn[' + this.queriesidx + '](params,null,p))';
 			s += '.indexOf(';
-			s += leftJS() + ')<0)';
+			s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
 		} else if (Array.isArray(this.right)) {
 			//			if(this.right.length == 0) return 'true';
 			s = '([' + this.right.map(ref).join(',') + '].indexOf(';
-			s += leftJS() + ')<0)';
+			s += 'alasql.utils.getValueOf(' + leftJS() + '))<0)';
 		} else {
 			s = '(' + rightJS() + '.indexOf(';
 			s += leftJS() + ')==-1)';
@@ -12347,7 +12373,7 @@ alasql.stdfn.CONVERT = function (value, args) {
 		if (/\d{8}/.test(val)) {
 			t = new Date(+val.substr(0, 4), +val.substr(4, 2) - 1, +val.substr(6, 2));
 		} else {
-			t = new Date(val);
+			t = newDate(val);
 		}
 		switch (args.style) {
 			case 1: // mm/dd/yy
@@ -12518,9 +12544,9 @@ alasql.stdfn.CONVERT = function (value, args) {
 	var udbtypeid = args.dbtypeid.toUpperCase();
 
 	if (args.dbtypeid == 'Date') {
-		return new Date(val);
+		return newDate(val);
 	} else if (udbtypeid == 'DATE') {
-		var d = new Date(val);
+		var d = newDate(val);
 		var s =
 			d.getFullYear() +
 			'.' +
@@ -12529,7 +12555,7 @@ alasql.stdfn.CONVERT = function (value, args) {
 			('0' + d.getDate()).substr(-2);
 		return s;
 	} else if (udbtypeid == 'DATETIME' || udbtypeid == 'DATETIME2') {
-		var d = new Date(val);
+		var d = newDate(val);
 		var s =
 			d.getFullYear() +
 			'.' +
@@ -13305,7 +13331,7 @@ stdfn.OBJECT_ID = function (objid) {
 
 stdfn.DATE = function (d) {
 	if (/\d{8}/.test(d)) return new Date(+d.substr(0, 4), +d.substr(4, 2) - 1, +d.substr(6, 2));
-	return new Date(d);
+	return newDate(d);
 };
 
 stdfn.NOW = function () {
@@ -13331,37 +13357,37 @@ stdfn.GETDATE = stdfn.NOW;
 stdfn.CURRENT_TIMESTAMP = stdfn.NOW;
 
 stdfn.SECOND = function (d) {
-	var d = new Date(d);
+	var d = newDate(d);
 	return d.getSeconds();
 };
 
 stdfn.MINUTE = function (d) {
-	var d = new Date(d);
+	var d = newDate(d);
 	return d.getMinutes();
 };
 
 stdfn.HOUR = function (d) {
-	var d = new Date(d);
+	var d = newDate(d);
 	return d.getHours();
 };
 
 stdfn.DAYOFWEEK = stdfn.WEEKDAY = function (d) {
-	var d = new Date(d);
+	var d = newDate(d);
 	return d.getDay();
 };
 
 stdfn.DAY = stdfn.DAYOFMONTH = function (d) {
-	var d = new Date(d);
+	var d = newDate(d);
 	return d.getDate();
 };
 
 stdfn.MONTH = function (d) {
-	var d = new Date(d);
+	var d = newDate(d);
 	return d.getMonth() + 1;
 };
 
 stdfn.YEAR = function (d) {
-	var d = new Date(d);
+	var d = newDate(d);
 	return d.getFullYear();
 };
 
@@ -13381,13 +13407,30 @@ var PERIODS = {
 };
 
 alasql.stdfn.DATEDIFF = function (period, d1, d2) {
-	var interval = new Date(d2).getTime() - new Date(d1).getTime();
+	var interval = newDate(d2).getTime() - newDate(d1).getTime();
 	return interval / PERIODS[period.toLowerCase()];
 };
 
 alasql.stdfn.DATEADD = function (period, interval, d) {
-	var nd = new Date(d).getTime() + interval * PERIODS[period.toLowerCase()];
-	return new Date(nd);
+	var nd = newDate(d);
+	var period = period.toLowerCase();
+
+	switch (period) {
+		case 'year':
+			nd.setFullYear(nd.getFullYear() + interval);
+			break;
+		case 'quarter':
+			nd.setMonth(nd.getMonth() + interval * 3);
+			break;
+		case 'month':
+			nd.setMonth(nd.getMonth() + interval);
+			break;
+		default:
+			nd = new Date(nd.getTime() + interval * PERIODS[period]);
+			break;
+	}
+
+	return nd;
 };
 
 alasql.stdfn.INTERVAL = function (interval, period) {
@@ -13395,15 +13438,25 @@ alasql.stdfn.INTERVAL = function (interval, period) {
 };
 
 alasql.stdfn.DATE_ADD = alasql.stdfn.ADDDATE = function (d, interval) {
-	var nd = new Date(d).getTime() + interval;
+	var nd = newDate(d).getTime() + interval;
 	return new Date(nd);
 };
 
 alasql.stdfn.DATE_SUB = alasql.stdfn.SUBDATE = function (d, interval) {
-	var nd = new Date(d).getTime() - interval;
+	var nd = newDate(d).getTime() - interval;
 	return new Date(nd);
 };
 
+var dateRegexp = /^\d{4}\.\d{2}\.\d{2} \d{2}:\d{2}:\d{2}/;
+function newDate(d) {
+	if (typeof d === 'string') {
+		if (dateRegexp.test(d)) {
+			d = d.replace('.', '-').replace('.', '-');
+		}
+	}
+	return new Date(d);
+}
+
 /*
 //
 // DROP TABLE for Alasql.js