Merge branch 'release/0.2.1'

.gitattributes

@@ -2,9 +2,7 @@
 *.xlsx binary
 *.xls binary
 
-alasql.js binary merge=ours
-alasql.js.map binary merge=ours
-alasql.min.js binary merge=ours
+/dist/* binary merge=ours
 
 # absolute paths are ok, as are globs
 #/**/postinst* text eol=lf

.gitignore

@@ -1,7 +1,5 @@
 # Results of tests
 test/res*
-
-
-
 node_modules/
+npm-debug.log
 

.travis.yml

@@ -1,11 +1,14 @@
+# whitelisted branches
+branches:
+  only:
+    - master
+    - develop
+
 language: node_js
 node_js:
   - "iojs"
   - "node"
   - "0.12"
   - "0.11"
   - "0.10"
-  - "0.8"
-  - "0.6"
-  - "0.5"
-  - "0.4"
+

CHANGELOG.md

@@ -1,19 +1,33 @@
 # Changelog
-
-### Version 0.2.1 "Rodos" (13.07.2015 - ...)
-*
+* Check https://trello.com/b/qxz65pVi/alasql-roadmap for roadmap
+
+### 0.2.1 "Rodos" (28.09.2015)
+* Added: AlaSQL CLI: Support for --version flag
+* Added: AlaSQL CLI: support for CLI exit code 
+* Added: AlaSQL CLI: Missing file now won't throw exception (but log error text) nor if its a folder
+* Added: Support for using _ as a single wildcard in LIKE queries
+* Added: Support for FETCH NEXT syntax in queries (MSSQL/T-SQL)
+* Added: SUBSTR() alias for MID() function (for SQLite compatibility)
+* Added: LIKE ESCAPE functionality
+* Added: REGEXP operator (like MySQL) and REGEXP_LIKE() function (like in Oracle)
+* Added: INSERT OR REPLACE VALUE, INSERT OR REPLACE SELECT
+* Added: Read Blob as parameter for from-functions like XLS()
+* Fix: .CSV files made Excel 2013 compliant 
+* Fix: misbehavour related to 'NOT' and '=' predecession
+* Fix: alasql running from cordova on iOS
 
 ## Version 0.2.0 "Athens" (13.07.2015)
 The purpose of this release were hard work on:
-a) documentation
-b) resolving bugs
-c) document and refactoring code
+* Documentation
+* Resolving bugs
+* Refactoring code
+
+Minor verison updated to sync lib, Meteor and npm version
 
-### 0.1.11 "San Remo" (03.06.2015 - 13.07.2015)
+### 0.1.11 "San Remo" (03.06.2015)
 * Code partially refactored with help of bitHound 
 * New directory 'partners' added
 * Added file for codecomplexity.com
-* Released as 0.2.0
 
 ### 0.1.10 "Genova" (31.05.2015 - 02.06.2015)
 * CALL procedure() statement
@@ -126,7 +140,7 @@ c) document and refactoring code
 * XML() from function
 * SEARCH INTO functions
 
-### 0.1.0 (aka 0.0.52) "Venice" (02.05.2015 - 03.05.2015)
+## 0.1.0 (aka 0.0.52) "Venice" (02.05.2015 - 03.05.2015)
 * Added INFORMATION_SCHEMA from variable
 * Fixed localstorage dropTable with AUTOCOMMIT OFF
 * STD() function added, STDEV(),STEDEVP(),VAR(),VARP()

CONTRIBUTING.md

@@ -0,0 +1,15 @@
+# Contributing to AlaSQL
+
+**All contributions are much welcome and greatly appreciated(!)** 
+
+- Please work with the code from the develop branch (do a `npm install` first time you clone)
+- Add a test for the issue: Copy `test/test000.js` and replace `000` with a new number. 
+- Impelement a test that reflects the issue.
+- Run `npm test` to verify only the new test fails
+- Implement your contributions in `src/`
+- Run `npm test` and verify all tests are OK
+- Pull-request to the develop branch
+
+_Please note that `npm test` will also compile from `src/`_ 
+
+