Skip to content

Commit 59f26a0

Browse files
committed
Merge branch 'release/0.3.7'
2 parents 544d20b + 85c0842 commit 59f26a0

22 files changed

+17279
-17041
lines changed

CHANGELOG.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
# Changelog
2-
3-
_0.3.7 "Niau" (xx.02.2017)_
2+
3+
_0.3.8 "XXX" (xx.03.2017)_
44

55
* ...
6+
7+
8+
### 0.3.7 "Niau" (xx.02.2017)
9+
10+
* Added: Last `S` in `VALUES` can be omitted when insterting (For the lazy ones)
11+
* Added: The `VALUES` keyword is optional when insterting (For the very lazy ones)
12+
* Fix: Multiple worksheet Excel with custom headers
13+
614

715
### 0.3.6 "Hipu" (24.01.2017)
816

917
* Addded: Support for "use strict"
18+
* Fix: Select.toString() had bugs
1019
* Update: Better and faster deep compare of objects
11-
* Fix: Select.toString() had bugs
12-
1320

1421

1522
### 0.3.5 "Maiao" (22.12.2016)

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ _Got a question? Ask on [Stack Overflow](http://stackoverflow.com/questions/ask?
1616

1717
# AlaSQL
1818

19+
<div align="center"><a href="http://alasql.org"><img src="https://cloud.githubusercontent.com/assets/1063454/19309516/94f8007e-9085-11e6-810f-62fd60b42185.png" alt="AlaSQL logo" styl="max-width:80%"/></a>
20+
</div>
1921

2022
_( [à la](http://en.wiktionary.org/wiki/%C3%A0_la) [SQL](http://en.wikipedia.org/wiki/SQL) ) [ælæ ɛskju:ɛl]_ - AlaSQL is a free and open source SQL database for Javascript with a strong focus on query speed and datasource flexibility for relational data, schemaless data, and graph data. It works in your browser, Node.js, IO.js and Cordova.
2123

@@ -25,8 +27,7 @@ The library is designed for:
2527
* Easy ETL and option for persistency by data import / manipulation / export for several formats
2628
* All major browsers, Node.js, and mobile applications
2729

28-
<div align="center"><a href="http://alasql.org"><img src="https://cloud.githubusercontent.com/assets/1063454/19309516/94f8007e-9085-11e6-810f-62fd60b42185.png" alt="AlaSQL logo" styl="max-width:80%"/></a>
29-
</div>
30+
3031

3132
We focus on [speed](https://github.com/agershun/alasql/wiki/Speed) by taking advantage of the dynamic nature of javascript when building up queries. Real world solutions demands flexibility regarding where data comes from and where it is to be stored. We focus on flexibility by making sure you can [import/export](https://github.com/agershun/alasql/wiki/Import-export) and query directly on data stored in Excel (both `xls` and `.xlsx`), CSV, JSON, TAB, IndexedDB, LocalStorage, and SQLite files.
3233

@@ -696,4 +697,4 @@ and other people for useful tools, which make our work much easier.
696697
697698
----
698699
<a href="http://alasql.org"><img src="https://cloud.githubusercontent.com/assets/1063454/14003946/d6e5c076-f156-11e5-8238-e62d2a8d20dc.png" align="right" alt="AlaSQL logo"/></a>
699-
© 2014-2016, Andrey Gershun ([email protected]) & M. Rangel Wulff ([email protected])
700+
© 2014-2017, Andrey Gershun ([email protected]) & M. Rangel Wulff ([email protected])

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@
5858
"bin",
5959
"lib"
6060
],
61-
"version": "0.3.6"
61+
"version": "0.3.7"
6262
}

dist/alasql-worker.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
//! AlaSQL v0.3.6 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT
1+
//! AlaSQL v0.3.7 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT
22
/*
33
@module alasql
4-
@version 0.3.6
4+
@version 0.3.7
55
66
AlaSQL - JavaScript SQL database
77
© 2014-2016 Andrey Gershun & Mathias Rangel Wulff

dist/alasql-worker.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/alasql.fs.js

Lines changed: 523 additions & 492 deletions
Large diffs are not rendered by default.

dist/alasql.js

Lines changed: 322 additions & 291 deletions
Large diffs are not rendered by default.

dist/alasql.min.js

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "alasql",
33
"description": "Versatile SQL database for browser or node. Handles relational data and nested JSON (noSQL). Export to and import from Excel, localStorage or IndexedDB",
4-
"version": "0.3.6",
4+
"version": "0.3.7",
55
"author": "Andrey Gershun <[email protected]>",
66
"contributors": [
77
{
@@ -28,15 +28,15 @@
2828
},
2929
"dependencies": {
3030
"dom-storage": "^2.0.1",
31-
"es6-promise": "^3.3.1",
32-
"lodash": "^4.17.2",
31+
"es6-promise": "^4.0.5",
32+
"lodash": "^4.17.4",
3333
"request": "^2.79.0",
3434
"xlsjs": "^0.7.5",
35-
"xlsx": "^0.8.0",
35+
"xlsx": "^0.8.4",
3636
"yargs": "^5.0.0"
3737
},
3838
"devDependencies": {
39-
"blueimp-md5": "^2.6.0",
39+
"blueimp-md5": "^2.7.0",
4040
"gulp": "^3.9.1",
4141
"gulp-concat": "^2.6.1",
4242
"gulp-dereserve": "^0.2.1",
@@ -45,15 +45,15 @@
4545
"gulp-rename": "^1.2.2",
4646
"gulp-replace": "^0.5.4",
4747
"gulp-shell": "^0.5.2",
48-
"gulp-uglify": "^2.0.0",
48+
"gulp-uglify": "^2.0.1",
4949
"istanbul": "^0.4.5",
5050
"jison": "^0.4.17",
5151
"mocha": "^3.2.0",
52-
"mocha.parallel": "^0.12.0",
52+
"mocha.parallel": "^0.15.0",
5353
"mversion": "^1.10.1",
5454
"npm-check": "^5.2.3",
5555
"open": "0.0.5",
56-
"strftime": "^0.9.2",
56+
"strftime": "^0.10.0",
5757
"uglify-js": "^2.7.5"
5858
},
5959
"engines": [

src/17alasql.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ alasql.dexec = function (databaseid, sql, params, cb, scope) {
229229
if(ast.statements[0].compile) {
230230

231231
// Compile and Execute
232-
var statement = ast.statements[0].compile(databaseid);
232+
var statement = ast.statements[0].compile(databaseid, params);
233233
if(!statement){
234234
return;
235235
}

0 commit comments

Comments
 (0)