Skip to content

Commit 6720c30

Browse files
committed
Merge branch 'release/0.1.10'
2 parents 6bb10d9 + cb293fa commit 6720c30

File tree

9 files changed

+66
-9
lines changed

9 files changed

+66
-9
lines changed

.bower.json

Lines changed: 1 addition & 1 deletion
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 both your (traditional) relational tables and nested JSON data (noSQL). Export, store, and import data from localStorage, IndexedDB, or Excel.",
4-
"version": "0.1.9",
4+
"version": "0.1.10",
55
"license": "MIT",
66
"keywords": [
77
"sql",

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Changelog
22

3-
### 0.1.10 "Genova" (31.05.2015 - ....06.2015)
3+
### 0.1.10 "Genova" (31.05.2015 - 02.06.2015)
44
* CALL procedure() statement
5-
5+
* bitHound advices
6+
* bower.json file updated
67

78
### 0.1.9 "Torino" (29.05.2015 - 31.05.2015)
89
* SERIAL data type added

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ gulp.task('js-merge', function () {
8888
'./src/70insert.js',
8989
'./src/72delete.js',
9090
'./src/74update.js',
91-
'./src/74update.js',
91+
// './src/74update.js',
9292
'./src/75merge.js',
9393
'./src/76usedatabase.js',
9494
'./src/77declare.js',

meteor/package.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package.describe({
22
name: 'agershun:alasql',
3-
version: '0.1.19',
3+
version: '0.1.20',
44
// Brief, one-line summary of the package.
55
summary: 'AlaSQL - JavaScript SQL database library',
66
// URL to the Git repository containing the source code for this package.

package.json

Lines changed: 1 addition & 1 deletion
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 both your (traditional) relational tables and nested JSON data (noSQL). Export, store, and import data from localStorage, IndexedDB, or Excel.",
4-
"version": "0.1.9",
4+
"version": "0.1.10",
55
"author": "Andrey Gershun <[email protected]>",
66
"directories": {
77
"test": "test"

src/05copyright.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
/*! AlaSQL v0.1.9 (c) 2014-2015 Andrey Gershun | alasql.org/license */
1+
/*! AlaSQL v0.1.10 (c) 2014-2015 Andrey Gershun | alasql.org/license */
22
/*
33
@module alasql
4-
@version 0.1.8
4+
@version 0.1.10
55
66
AlaSQL - JavaScript SQL database
77
(ñ) 2014-2015, Andrey Gershun

src/10start.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ var alasql = function alasql(sql, params, cb, scope) {
9494
Current version of alasql
9595
@constant {string}
9696
*/
97-
alasql.version = "0.1.9";
97+
alasql.version = "0.1.10";
9898

9999
/**
100100
Debug flag

stuff/keywords/badwords.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
This is a list of keywords to be removed:
2+
3+
VALUE
4+
MATRIX
5+
RECORDSET
6+
TEXTSTRING
7+
ROW

test/test352.js

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
if(typeof exports === 'object') {
2+
var assert = require("assert");
3+
var alasql = require('..');
4+
} else {
5+
__dirname = '.';
6+
};
7+
8+
9+
describe('Test 352 TEST EQUALITY', function() {
10+
it('1. CREATE DATABASE',function(done){
11+
alasql('CREATE DATABASE test352;USE test352');
12+
done();
13+
});
14+
15+
it('2. TEST =',function(done){
16+
var res = alasql('= 1=1');
17+
assert.deepEqual(res,true);
18+
var res = alasql('= 1=NULL');
19+
assert.deepEqual(res,false);
20+
var res = alasql('= 0=NULL');
21+
assert.deepEqual(res,false);
22+
done();
23+
});
24+
25+
it('3. TEST ==',function(done){
26+
var res = alasql('= 1==1');
27+
assert.deepEqual(res,true);
28+
var res = alasql('= 1==NULL');
29+
assert.deepEqual(res,false);
30+
var res = alasql('= 0==NULL');
31+
assert.deepEqual(res,false);
32+
done();
33+
});
34+
35+
it('4. TEST == deepEqual',function(done){
36+
var res = alasql('= {a:1}=={a:1}');
37+
assert.deepEqual(res,true);
38+
var res = alasql('= {a:1}=={a:2}');
39+
assert.deepEqual(res,false);
40+
done();
41+
});
42+
43+
it('99. DROP DATABASE',function(done){
44+
alasql.options.modifier = undefined;
45+
alasql('DROP DATABASE test352');
46+
done();
47+
});
48+
49+
});

0 commit comments

Comments
 (0)