Merge branch 'release/0.4.2'

.travis.yml

@@ -7,6 +7,7 @@ branches:
 language: node_js
 node_js:
   - "node"
+  - "7"
   - "6"
   - "5"
   - "4"

CHANGELOG.md

@@ -1,10 +1,18 @@
 # Changelog
 
 
-_0.4.1 "....." (xx.08.2017)_
+_0.4.3 "Hajjah" (xx.08.2017)_
 
 * ...
 
+## 0.4.2 "Baraqish" (xx.08.2017)
+
+* Added: SQL function LTRIM
+* Added: SQL function RTRIM
+* Better: Remove implicit any in type script definitioni
+* Better: Out-of-the-box Webpack and Browserify compatibility without hacks
+* Fix: Use created database id on foreign key check as default database
+
 
 ## 0.4.1 "Sayhut" (23.07.2017)
 

README.md

@@ -181,7 +181,7 @@ The results are good. Check out AlaSQL vs. other JavaScript SQL databases:
 
 * **2x speed** [compared to Linq](http://jsperf.com/alasql-vs-linq-on-groupby/3) for `GROUP BY` on 1,048,576 rows
 
-Please remember to set indexes on your tables to speed up your queries. [Have a look here](https://www.tutorialspoint.com/sql/sql-indexes.htm) [SQL Index(http://www.guru99.com/indexes.html) if you are unfamiliar with this concept.
+Please remember to set indexes on your tables to speed up your queries. [Have a look here](https://www.tutorialspoint.com/sql/sql-indexes.htm) and [SQL Index](http://www.guru99.com/indexes.html) page if you are unfamiliar with this concept (this is a part of [SQL Tutorial](http://www.guru99.com/sql.html)).
 
 
 See more [speed related info on the wiki](https://github.com/agershun/alasql/wiki/Speed)
@@ -346,7 +346,7 @@ Pinpointing data on a map should be easy. AlaSQL is great to prepare source data
 
 ### AlaSQL ♥ Google Spreadsheets
 
-AlaSQL can query data directly from a Google spreadsheet. A good "partnership" for easy editing and powerfull data manipulation. See more about [Google Spreadsheets and AlaSQL in the wiki](https://github.com/agershun/alasql/wiki/Google-maps)
+AlaSQL can query data directly from a Google spreadsheet. A good "partnership" for easy editing and powerfull data manipulation. See more about [Google Spreadsheets and AlaSQL in the wiki](https://github.com/agershun/alasql/wiki/Google-Spreadsheets)
 
 
 
@@ -455,21 +455,34 @@ If using AlaSQL as Web Worker, you can import it traditionally as a script:
 
 
 
+### Webpack, Browserify and React (Native)
 
-### Use Webpack and Browserify
+To use AlaSQL within a `create-react-app` (CRA) setup **without** ejecting it is: Please [have a look at this comment](https://github.com/agershun/alasql/issues/930#issuecomment-322413745).
 
 When targeting the browser, several code bundlers like Webpack and Browserify will pick up modules you might not want.
 
-Here's a list of modules that AlaSQL requires:
-* fs
-* cptable
-* jszip
-* xlsx
-* cpexcel
-* path
-* es6-promise
-* net
-* tls
+Here's a list of modules that AlaSQL may require in certain enviroments or for certain features:
+
+* Node.js
+	* fs
+	* net
+	* tls
+	* request
+	* path
+* React Native
+	* react-native
+	* react-native-fs
+	* react-native-fetch-blob
+* Vertx
+	* vertx
+* Agonostic
+	* XLSX/XLS support
+		* cptable
+		* jszip
+		* xlsx
+		* cpexcel
+	* es6-promise
+
 
 #### Webpack
 
@@ -486,8 +499,8 @@ var IgnorePlugin =  require("webpack").IgnorePlugin;
 
 module.exports = {
   ...
-  //Will ignore the modules fs, path, xlsx
-  plugins:[new IgnorePlugin(/(^fs$|cptable|jszip|xlsx|^es6-promise$|^net$|^tls$|^forever-agent$|^tough-cookie$|cpexcel|^path$)/)]
+  //Will ignore the modules fs, path, xlsx, request, vertx, and react-native modules
+  plugins:[new IgnorePlugin(/(^fs$|cptable|jszip|xlsx|^es6-promise$|^net$|^tls$|^forever-agent$|^tough-cookie$|cpexcel|^path$|^request$|react-native|^vertx$)/)]
 };
 ```
 

bower.json

@@ -58,5 +58,5 @@
     "bin",
     "lib"
   ],
-  "version": "0.4.1"
+  "version": "0.4.2"
 }

dist/alasql-worker.js

@@ -1,7 +1,7 @@
-//! AlaSQL v0.4.1 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
+//! AlaSQL v0.4.2 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
 /*
 @module alasql
-@version 0.4.1
+@version 0.4.2
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff

dist/alasql.fs.js

@@ -1,7 +1,7 @@
-//! AlaSQL v0.4.1 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
+//! AlaSQL v0.4.2 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
 /*
 @module alasql
-@version 0.4.1
+@version 0.4.2
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -137,7 +137,7 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '0.4.1';
+alasql.version = '0.4.2';
 
 /**
 	Debug flag
@@ -10625,7 +10625,17 @@ stdlib.LEN = stdlib.LENGTH = function(s) {return und(s,'y.length');}
 stdlib.LOWER = stdlib.LCASE = function(s) {return und(s,'String(y).toLowerCase()');}
 //stdlib.LCASE = function(s) {return '('+s+').toLowerCase()';}
 
-// LTRIM
+// Returns a character expression after it removes leading blanks.
+// see https://docs.microsoft.com/en-us/sql/t-sql/functions/ltrim-transact-sql
+stdlib.LTRIM = function(s) {
+    return und(s, 'y.replace(/^[ ]+/,"")');
+}
+
+// Returns a character string after truncating all trailing spaces.
+// see https://docs.microsoft.com/en-us/sql/t-sql/functions/rtrim-transact-sql
+stdlib.RTRIM = function(s) {
+    return und(s, 'y.replace(/[ ]+$/,"")');
+}
 
 stdlib.MAX = stdlib.GREATEST = function(){
       return 'Math.max('+Array.prototype.join.call(arguments, ',')+')'
@@ -11327,7 +11337,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 			if(col.foreignkey) {
 
 				var fk = col.foreignkey.table;
-				var fktable = alasql.databases[fk.databaseid||alasql.useid].tables[fk.tableid];
+				var fktable = alasql.databases[fk.databaseid||databaseid].tables[fk.tableid];
 				if(typeof fk.columnid === 'undefined') {
 					if(fktable.pk.columns && fktable.pk.columns.length >0 ){
 						fk.columnid = fktable.pk.columns[0];
@@ -11403,7 +11413,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 			if(con.fkcolumns && con.fkcolumns.length>0){
 				fk.columnid = con.fkcolumns[0];
  			}
- 			var fktable = alasql.databases[fk.databaseid||alasql.useid].tables[fk.tableid];
+ 			var fktable = alasql.databases[fk.databaseid||databaseid].tables[fk.tableid];
 			if(typeof fk.columnid === 'undefined') {
 				fk.columnid = fktable.pk.columns[0];
 			}

dist/alasql.js

@@ -1,7 +1,7 @@
-//! AlaSQL v0.4.1 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
+//! AlaSQL v0.4.2 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
 /*
 @module alasql
-@version 0.4.1
+@version 0.4.2
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -137,7 +137,7 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '0.4.1';
+alasql.version = '0.4.2';
 
 /**
 	Debug flag
@@ -10625,7 +10625,17 @@ stdlib.LEN = stdlib.LENGTH = function(s) {return und(s,'y.length');}
 stdlib.LOWER = stdlib.LCASE = function(s) {return und(s,'String(y).toLowerCase()');}
 //stdlib.LCASE = function(s) {return '('+s+').toLowerCase()';}
 
-// LTRIM
+// Returns a character expression after it removes leading blanks.
+// see https://docs.microsoft.com/en-us/sql/t-sql/functions/ltrim-transact-sql
+stdlib.LTRIM = function(s) {
+    return und(s, 'y.replace(/^[ ]+/,"")');
+}
+
+// Returns a character string after truncating all trailing spaces.
+// see https://docs.microsoft.com/en-us/sql/t-sql/functions/rtrim-transact-sql
+stdlib.RTRIM = function(s) {
+    return und(s, 'y.replace(/[ ]+$/,"")');
+}
 
 stdlib.MAX = stdlib.GREATEST = function(){
       return 'Math.max('+Array.prototype.join.call(arguments, ',')+')'
@@ -11327,7 +11337,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 			if(col.foreignkey) {
 
 				var fk = col.foreignkey.table;
-				var fktable = alasql.databases[fk.databaseid||alasql.useid].tables[fk.tableid];
+				var fktable = alasql.databases[fk.databaseid||databaseid].tables[fk.tableid];
 				if(typeof fk.columnid === 'undefined') {
 					if(fktable.pk.columns && fktable.pk.columns.length >0 ){
 						fk.columnid = fktable.pk.columns[0];
@@ -11403,7 +11413,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 			if(con.fkcolumns && con.fkcolumns.length>0){
 				fk.columnid = con.fkcolumns[0];
  			}
- 			var fktable = alasql.databases[fk.databaseid||alasql.useid].tables[fk.tableid];
+ 			var fktable = alasql.databases[fk.databaseid||databaseid].tables[fk.tableid];
 			if(typeof fk.columnid === 'undefined') {
 				fk.columnid = fktable.pk.columns[0];
 			}

package.json

@@ -1,14 +1,15 @@
 {
   "name": "alasql",
   "description": "Use SQL to select and filter javascript data - including relational joins and search in nested objects (JSON). Export to and import from Excel and CSV",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "author": "Andrey Gershun <[email protected]>",
   "contributors": [
     "Mathias Rangel Wulff <[email protected]>"
   ],
   "directories": {
     "test": "test"
   },
+  "browser": "./dist/alasql.js",
   "scripts": {
     "test": "gulp && cd test && mocha . --reporter dot",
     "test:this": "gulp && cd test && mocha",
@@ -20,7 +21,7 @@
     "build:watch": "gulp watch",
     "bump": "mversion --no-prefix",
     "uptodate": "npm-check -u --skip-unused",
-    "release": "f='/TMP/alasql.tmp' && curl https://raw.githubusercontent.com/wiki/agershun/alasql/How-to-release.md > $f && sh $f ; rm $f",
+    "release": "f='/tmp/alasql.tmp' && curl https://raw.githubusercontent.com/wiki/agershun/alasql/How-to-release.md > $f && sh $f ; rm $f",
     "jison": "jison ./src/alasqlparser.jison -o ./src/alasqlparser.js"
   },
   "dependencies": {

src/55functions.js

@@ -157,7 +157,17 @@ stdlib.LOWER = stdlib.LCASE = function(s) {return und(s,'String(y).toLowerCase()
 //stdlib.LCASE = function(s) {return '('+s+').toLowerCase()';}
 
 
-// LTRIM
+// Returns a character expression after it removes leading blanks.
+// see https://docs.microsoft.com/en-us/sql/t-sql/functions/ltrim-transact-sql
+stdlib.LTRIM = function(s) {
+    return und(s, 'y.replace(/^[ ]+/,"")');
+}
+
+// Returns a character string after truncating all trailing spaces.
+// see https://docs.microsoft.com/en-us/sql/t-sql/functions/rtrim-transact-sql
+stdlib.RTRIM = function(s) {
+    return und(s, 'y.replace(/[ ]+$/,"")');
+}
 
 stdlib.MAX = stdlib.GREATEST = function(){
       return 'Math.max('+Array.prototype.join.call(arguments, ',')+')'

src/60createtable.js

@@ -168,7 +168,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 			if(col.foreignkey) {
 //				console.log(138,col.foreignkey);
 				var fk = col.foreignkey.table;
-				var fktable = alasql.databases[fk.databaseid||alasql.useid].tables[fk.tableid];
+				var fktable = alasql.databases[fk.databaseid||databaseid].tables[fk.tableid];
 				if(typeof fk.columnid === 'undefined') {
 					if(fktable.pk.columns && fktable.pk.columns.length >0 ){
 						fk.columnid = fktable.pk.columns[0];
@@ -253,7 +253,7 @@ yy.CreateTable.prototype.execute = function (databaseid, params, cb) {
 			if(con.fkcolumns && con.fkcolumns.length>0){
 				fk.columnid = con.fkcolumns[0];
  			}
- 			var fktable = alasql.databases[fk.databaseid||alasql.useid].tables[fk.tableid];
+ 			var fktable = alasql.databases[fk.databaseid||databaseid].tables[fk.tableid];
 			if(typeof fk.columnid === 'undefined') {
 				fk.columnid = fktable.pk.columns[0];
 			}