Merge branch 'release/0.3.9'

Author: mathiasrw

.travis.yml

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

CHANGELOG.md

@@ -1,11 +1,16 @@
 # Changelog
 
 
-_0.3.9 "Turua" (xx.04.2017)_
+_0.3.10 "???" (xx.04.2017)_
 
-* ...
+* ...
+
+### 0.3.9 "Turua" (23.03.2017)
+* Add: React native support
+* Fix: CSV error when quote set to empty
+* Fix: autoExt bug when not set for CSV on read
 
-###0.3.8 "Wanaka" (15.03.2017)
+### 0.3.8 "Wanaka" (15.03.2017)
 
 * Added: Lazy promise notation
 * Added: Create user defined function via SQL statement

CONTRIBUTING.md

@@ -4,8 +4,8 @@ Thank you very much or the your intentions! AlaSQL project still has a lot of th
 
 For you to edit the source please do the following:
 
-- Fork the repo here on Github
-- Clone your forked repo and install dependencies `git clone https://github.com/MYUSERNAME/alasql/ && cd alasql && npm install`  
+- Fork the repo here on Github 
+- Clone your forked repo and install dependencies `git clone https://github.com/MYUSERNAME/alasql/ --depth 1 && cd alasql && npm install`  
 - Make sure you work with the develop branch `git checkout develop`
 - Add a test for the issue: Copy `test/test000.js` and replace `000` with a new number. 
 - Implement a test that reflects the issue.

LICENSE

@@ -1,7 +1,6 @@
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2014-2015 Andrey Gershun ([email protected]) & 
-Mathias Rangel Wulff ([email protected])
+Copyright (c) 2017 Andrey Gershun
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -20,9 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
-------------------------------------------------------------------------------
-
-The MIT license on this repo covers all contents of the repo, but does not 
-supercede the existing licenses for products used for this work, including the 
-Chinook Database (covered by the Microsoft Public License) and other products.

README.md

@@ -58,5 +58,5 @@
     "bin",
     "lib"
   ],
-  "version": "0.3.8"
+  "version": "0.3.9"
 }

bower.json

@@ -1,7 +1,7 @@
-//! AlaSQL v0.3.8 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
+//! AlaSQL v0.3.9 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
 /*
 @module alasql
-@version 0.3.8
+@version 0.3.9
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff

dist/alasql-worker.js

@@ -1,7 +1,7 @@
-//! AlaSQL v0.3.8 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
+//! AlaSQL v0.3.9 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
 /*
 @module alasql
-@version 0.3.8
+@version 0.3.9
 
 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.3.8';
+alasql.version = '0.3.9';
 
 /**
 	Debug flag
@@ -3391,7 +3391,7 @@ utils.isMeteor = (function(){
     Find out if code is running on a Meteor client
     @return {boolean} True if code is running on a Meteor client
 */
-utils.isMeteorClient = (utils.isMeteorClient = function(){
+utils.isMeteorClient = utils.isMeteorClient = (function(){
   return utils.isMeteor && Meteor.isClient;
 })();
 
@@ -3413,6 +3413,18 @@ utils.isCordova = (function(){
   return (typeof cordova === 'object')
 })();
 
+utils.isReactNative = (function(){
+  var isReact = false;
+  //*not-for-browser/*
+  try{
+	if(typeof require('react-native') === 'object'){
+		isReact = true;
+	}
+  }catch(e){void 0	}
+  //*/
+  return isReact;
+})();
+
 utils.hasIndexedDB = (function(){
   return !!utils.global.indexedDB;
 })();
@@ -3479,7 +3491,15 @@ var loadFile = utils.loadFile = function(path, asy, success, error) {
                 }
             }
         }
-        //*/
+	} else if(utils.isReactNative) {
+        // If ReactNative
+		var RNFS = require('react-native-fs');
+        RNFS.readFile(path,'utf8').then(function(contents){
+			success(cutbom(contents));
+		}).catch(function(err){
+			throw err;
+		});
+	//*/
     } else if(utils.isCordova) {
         /* If Cordova */
         utils.global.requestFileSystem(LocalFileSystem.PERSISTENT, 0, function (fileSystem) {
@@ -3609,9 +3629,18 @@ var loadBinaryFile = utils.loadBinaryFile = function(path, asy, success, error)
                 success(arr.join(""));
             }
         }
-		//*/
+	} else if(utils.isReactNative) {
+        // If ReactNative
+		//var RNFS = require('react-native-fs');
+		var RNFetchBlob = require('react-native-fetch-blob').default
+		var dirs = RNFetchBlob.fs.dirs
+		//should use readStream instead if the file is large
+		RNFetchBlob.fs.readFile(path, 'base64').then(function(data){
+			//RNFetchBlob.base64.decode(data) //need more test on excel
+		    success(data);
+		})
+	//*/
     } else {
-
         if(typeof path === "string") {
             // For browser
             var xhr = new XMLHttpRequest();
@@ -3657,7 +3686,15 @@ var removeFile = utils.removeFile = function(path,cb) {
                 cb && cb(); // jshint ignore:line
             });
         });
-      	//*/
+	} else if(utils.isReactNative) {
+        // If ReactNative
+		var RNFS = require('react-native-fs');
+        RNFS.unlink(path).then(function(){
+			cb && cb();
+		}).catch(function(err){
+			throw err;
+		});
+	//*/
     } else {
         throw new Error('You can remove files only in Node.js and Apache Cordova');
     }
@@ -3669,13 +3706,22 @@ var deleteFile = utils.deleteFile = function(path,cb){
     if(utils.isNode) {
         var fs = require('fs');
         fs.unlink(path, cb);
+	} else if(utils.isReactNative) {
+        // If ReactNative
+		var RNFS = require('react-native-fs');
+        RNFS.unlink(path).then(function(){
+			cb && cb();
+		}).catch(function(err){
+			throw err;
+		});
     }
     //*/
 
 };
 
 utils.autoExtFilename = function(filename,ext,config) {
-	if(typeof filename !== 'string' || filename.match(/\..{2,4}$/) || config.autoExt === 0 || config.autoExt === false){
+	config = config || {};
+	if(typeof filename !== 'string' || filename.match(/^[A-z]+:\/\/|\n|\..{2,4}$/) || config.autoExt === 0 || config.autoExt === false){
 		return filename;
 	}
 	return filename+'.'+ext
@@ -3694,7 +3740,15 @@ var fileExists = utils.fileExists = function(path,cb){
                 cb(false);
             });
         });
-        //*/
+	} else if(utils.isReactNative) {
+        // If ReactNative
+		var RNFS = require('react-native-fs');
+        RNFS.exists(path).then(function(yes){
+			cb && cb(yes);
+		}).catch(function(err){
+			throw err;
+		});
+	//*/
     } else {
         // TODO Cordova, etc.
         throw new Error('You can use exists() only in Node.js or Apach Cordova');
@@ -3721,14 +3775,20 @@ var saveFile = utils.saveFile = function(path, data, cb, opts) {
             res = cb(res);
         }
     } else {
-
         if(utils.isNode) {
             //*not-for-browser/*
             var fs = require('fs');
             data = fs.writeFileSync(path,data);
             if(cb){
                 res = cb(res);
             }
+        }else if(utils.isReactNative) {
+			var RNFS = require('react-native-fs');
+			RNFS.writeFile(path, data).then(function(success){ //, 'utf8'
+				if(cb) res = cb(res);
+			}).catch(function(err){
+				console.log(err.message);
+			});
         } else if(utils.isCordova) {
             utils.global.requestFileSystem(LocalFileSystem.PERSISTENT, 0, function (fileSystem) {
 
@@ -14454,7 +14514,10 @@ alasql.into.CSV = function(filename, opts, data, columns, cb) {
 	data.forEach(function(d){
 		s += columns.map(function(col){
 			var s = d[col.columnid];
-			s = (s+"").replace(new RegExp('\\'+opt.quote,"g"),'""');
+			// escape the character wherever it appears in the field
+			if (opt.quote !== '') {
+				s = (s+"").replace(new RegExp('\\'+opt.quote,"g"), opt.quote + opt.quote);
+			}
 
       //Excel 2013 needs quotes around strings - thanks for _not_ complying with RFC for CSV 
       if(+s!=s){  // jshint ignore:line