Skip to content

Commit

Permalink
Merge branch 'release/0.1.10'
Browse files Browse the repository at this point in the history
  • Loading branch information
agershun committed Jun 2, 2015
2 parents 6bb10d9 + cb293fa commit 6720c30
Show file tree
Hide file tree
Showing 9 changed files with 66 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "alasql",
"description":"Versatile SQL database for browser or node. Handles both your (traditional) relational tables and nested JSON data (noSQL). Export, store, and import data from localStorage, IndexedDB, or Excel.",
"version": "0.1.9",
"version": "0.1.10",
"license": "MIT",
"keywords": [
"sql",
Expand Down
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Changelog

### 0.1.10 "Genova" (31.05.2015 - ....06.2015)
### 0.1.10 "Genova" (31.05.2015 - 02.06.2015)
* CALL procedure() statement

* bitHound advices
* bower.json file updated

### 0.1.9 "Torino" (29.05.2015 - 31.05.2015)
* SERIAL data type added
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ gulp.task('js-merge', function () {
'./src/70insert.js',
'./src/72delete.js',
'./src/74update.js',
'./src/74update.js',
// './src/74update.js',
'./src/75merge.js',
'./src/76usedatabase.js',
'./src/77declare.js',
Expand Down
2 changes: 1 addition & 1 deletion meteor/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
name: 'agershun:alasql',
version: '0.1.19',
version: '0.1.20',
// Brief, one-line summary of the package.
summary: 'AlaSQL - JavaScript SQL database library',
// URL to the Git repository containing the source code for this package.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "alasql",
"description": "Versatile SQL database for browser or node. Handles both your (traditional) relational tables and nested JSON data (noSQL). Export, store, and import data from localStorage, IndexedDB, or Excel.",
"version": "0.1.9",
"version": "0.1.10",
"author": "Andrey Gershun <[email protected]>",
"directories": {
"test": "test"
Expand Down
4 changes: 2 additions & 2 deletions src/05copyright.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*! AlaSQL v0.1.9 (c) 2014-2015 Andrey Gershun | alasql.org/license */
/*! AlaSQL v0.1.10 (c) 2014-2015 Andrey Gershun | alasql.org/license */
/*
@module alasql
@version 0.1.8
@version 0.1.10
AlaSQL - JavaScript SQL database
(ñ) 2014-2015, Andrey Gershun
Expand Down
2 changes: 1 addition & 1 deletion src/10start.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ var alasql = function alasql(sql, params, cb, scope) {
Current version of alasql
@constant {string}
*/
alasql.version = "0.1.9";
alasql.version = "0.1.10";

/**
Debug flag
Expand Down
7 changes: 7 additions & 0 deletions stuff/keywords/badwords.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
This is a list of keywords to be removed:

VALUE
MATRIX
RECORDSET
TEXTSTRING
ROW
49 changes: 49 additions & 0 deletions test/test352.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
if(typeof exports === 'object') {
var assert = require("assert");
var alasql = require('..');
} else {
__dirname = '.';
};


describe('Test 352 TEST EQUALITY', function() {
it('1. CREATE DATABASE',function(done){
alasql('CREATE DATABASE test352;USE test352');
done();
});

it('2. TEST =',function(done){
var res = alasql('= 1=1');
assert.deepEqual(res,true);
var res = alasql('= 1=NULL');
assert.deepEqual(res,false);
var res = alasql('= 0=NULL');
assert.deepEqual(res,false);
done();
});

it('3. TEST ==',function(done){
var res = alasql('= 1==1');
assert.deepEqual(res,true);
var res = alasql('= 1==NULL');
assert.deepEqual(res,false);
var res = alasql('= 0==NULL');
assert.deepEqual(res,false);
done();
});

it('4. TEST == deepEqual',function(done){
var res = alasql('= {a:1}=={a:1}');
assert.deepEqual(res,true);
var res = alasql('= {a:1}=={a:2}');
assert.deepEqual(res,false);
done();
});

it('99. DROP DATABASE',function(done){
alasql.options.modifier = undefined;
alasql('DROP DATABASE test352');
done();
});

});

0 comments on commit 6720c30

Please sign in to comment.