Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: AlaSQL/alasql
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8f4550a802f2e8c2556fc360c8f548064eaf17f4
Choose a base ref
...
head repository: AlaSQL/alasql
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b1a58b1bf0d039c924934de27e372eeb2144e8ef
Choose a head ref
  • 7 commits
  • 14 files changed
  • 3 contributors

Commits on Nov 11, 2020

  1. Updated version in files to 0.6.5

    @mathiasrw
    mathiasrw committed Nov 11, 2020
    Copy the full SHA
    ef75a14 View commit details

Commits on Dec 13, 2020

  1. Bump ini from 1.3.5 to 1.3.7 (#1269) 

    Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](npm/ini@v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot
    dependabot[bot] authored Dec 13, 2020
    Copy the full SHA
    82864ed View commit details

Commits on Dec 14, 2020

  1. Bump husky from 4.3.0 to 4.3.6 (#1270) 

    Bumps [husky](https://github.com/typicode/husky) from 4.3.0 to 4.3.6.
- [Release notes](https://github.com/typicode/husky/releases)
- [Commits](typicode/husky@v4.3.0...v4.3.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot
    dependabot[bot] authored Dec 14, 2020
    Copy the full SHA
    6b6e5e8 View commit details

Commits on Jan 8, 2021

  1. Return empty results in group by when input is empty (#1279)

    @forestfang-stripe
    forestfang-stripe authored Jan 8, 2021
    Copy the full SHA
    6ceefd4 View commit details

Commits on Feb 2, 2021

  1. Bump uglify-js from 3.11.3 to 3.12.6 (#1286) 

    Bumps [uglify-js](https://github.com/mishoo/UglifyJS) from 3.11.3 to 3.12.6.
- [Release notes](https://github.com/mishoo/UglifyJS/releases)
- [Commits](mishoo/UglifyJS@v3.11.3...v3.12.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot
    dependabot[bot] authored Feb 2, 2021
    Copy the full SHA
    a8d3cb0 View commit details

Commits on Feb 3, 2021

  1. Bump prettier from 2.1.2 to 2.2.1 (#1261) 

    Bumps [prettier](https://github.com/prettier/prettier) from 2.1.2 to 2.2.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](prettier/prettier@2.1.2...2.2.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot
    dependabot[bot] authored Feb 3, 2021
    Copy the full SHA
    f1c0d8f View commit details

Commits on Mar 3, 2021

  1. Fix #1302

    @mathiasrw
    mathiasrw committed Mar 3, 2021
    Copy the full SHA
    b1a58b1 View commit details
Showing with 16,820 additions and 16,715 deletions.
  1. +6 −0 CHANGELOG.md
  2. +7 −3 bower.json
  3. +4 −4 package.json
  4. +2 −2 src/38query.js
  5. +2 −2 src/55functions.js
  6. +2 −2 src/alasqlparser.jison
  7. +261 −261 src/alasqlparser.js
  8. +1 −1 test/coverage/coverage.json
  9. +1 −1 test/coverage/lcov-report/index.html
  10. +16,423 −16,423 test/coverage/lcov.info
  11. +1 −1 test/test238.json
  12. +34 −0 test/test813.js
  13. +61 −0 test/test814.js
  14. +15 −15 yarn.lock
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

### 0.6.5 (11.11.2020)

- Fix: Do not include null in COUNT or AVG fixes #1251



### 0.6.4 (24.09.2020)

- Add: String and Number objects supported as values
10 changes: 7 additions & 3 deletions bower.json
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,9 @@
"CSV",
"worker"
],
"authors": ["Andrey Gershun <agershun@gmail.com>"],
"authors": [
"Andrey Gershun <agershun@gmail.com>"
],
"homepage": "alasql.org",
"repository": {
"type": "git",
@@ -40,7 +42,9 @@
"jison": "0.4.15",
"lodash": "3.7.0"
},
"main": ["./dist/alasql.min.js"],
"main": [
"./dist/alasql.min.js"
],
"ignore": [
"src",
"test",
@@ -53,5 +57,5 @@
"bin",
"lib"
],
"version": "0.6.4"
"version": "0.6.5"
}
8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"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.6.4",
"version": "0.6.5",
"author": "Andrey Gershun <agershun@gmail.com>",
"contributors": [
"Mathias Rangel Wulff <m@rawu.dk>"
@@ -69,18 +69,18 @@
"gulp-replace": "^1.0.0",
"gulp-shell": "0.8.0",
"gulp-uglify": "^3.0.2",
"husky": "4.3.0",
"husky": "4.3.6",
"istanbul": "^0.4.5",
"jison-gho": "^0.6.1-216",
"lint-staged": "10.4.2",
"mocha": "8.1.3",
"mocha.parallel": "^0.15.6",
"mversion": "2.0.1",
"open": "7.3.0",
"prettier": "2.1.2",
"prettier": "2.2.1",
"strftime": "^0.10.0",
"tabletop": "1.6.3",
"uglify-js": "3.11.3",
"uglify-js": "3.12.6",
"version-bump-prompt": "6.1.0"
},
"engines": {
4 changes: 2 additions & 2 deletions src/38query.js
View file
Original file line number Diff line number Diff line change
@@ -143,7 +143,7 @@ function queryfn3(query) {
// console.log(query.havingfns);
if (query.groupfn) {
query.data = [];
if (0 === query.groups.length) {
if (query.groups.length === 0 && query.allgroups.length === 0) {
var g = {};
if (query.selectGroup.length > 0) {
// console.log(query.selectGroup);
@@ -377,7 +377,7 @@ function queryfn3(query) {
// if(query.explain) {
// if(query.cb) query.cb(query.explaination,query.A, query.B);
// return query.explaination;
// } else
// } else
*/

//console.log(190,query.intofns);
4 changes: 2 additions & 2 deletions src/55functions.js
View file
Original file line number Diff line number Diff line change
@@ -85,7 +85,7 @@ yy.FuncValue.prototype.toJS = function (context, tableid, defcols) {
}
} else if (!alasql.fn[funcid] && alasql.stdfn[funcid.toUpperCase()]) {
if (this.newid) s += 'new ';
s += 'alasql.stdfn.' + this.funcid.toUpperCase() + '(';
s += 'alasql.stdfn[' + JSON.stringify(this.funcid.toUpperCase()) + '](';
// if(this.args) s += this.args.toJS(context, tableid);
if (this.args && this.args.length > 0) {
s += this.args
@@ -100,7 +100,7 @@ yy.FuncValue.prototype.toJS = function (context, tableid, defcols) {
// TODO arguments!!!
// var s = '';
if (this.newid) s += 'new ';
s += 'alasql.fn.' + this.funcid + '(';
s += 'alasql.fn[' + JSON.stringify(this.funcid) + '](';
// if(this.args) s += this.args.toJS(context, tableid);
if (this.args && this.args.length > 0) {
s += this.args
4 changes: 2 additions & 2 deletions src/alasqlparser.jison
View file
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@
\[\?\] return 'BRAQUESTION'
'@[' return 'ATLBRA'
'ARRAY[' return 'ARRAYLBRA'
\[([^\]])*?\] return 'BRALITERAL'
\`([^\`])*?\` return 'BRALITERAL'
\[([^\]'])*?\] return 'BRALITERAL'
\`([^\`'])*?\` return 'BRALITERAL'

N(['](\\.|[^']|\\\')*?['])+ return 'NSTRING'
X(['](\\.|[^']|\\\')*?['])+ return 'NSTRING'
Loading