Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/15utility.js
Original file line number Diff line number Diff line change
Expand Up @@ -1197,7 +1197,7 @@ var like = (utils.like = function (pattern, value, escape) {
} else if (c === '[' || c === ']') {
s += c;
} else if (c === '%') {
s += '.*';
s += '[\\s\\S]*';
} else if (c === '_') {
s += '.';
} else if ('/.*+?|(){}'.indexOf(c) > -1) {
Expand All @@ -1211,7 +1211,7 @@ var like = (utils.like = function (pattern, value, escape) {
s += '$';
// if(value == undefined) return false;
//console.log(s,value,(value||'').search(RegExp(s))>-1);
return ('' + (value || '')).toUpperCase().search(RegExp(s.toUpperCase())) > -1;
return ('' + (value ?? '')).search(RegExp(s, 'i')) > -1;
});

utils.glob = function (value, pattern) {
Expand Down
53 changes: 53 additions & 0 deletions test/test1734.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
if (typeof exports === 'object') {
var assert = require('assert');
var alasql = require('..');
} else {
__dirname = '.';
}

var test = '1666';
describe('Test' + test + 'Newline characters in like', function () {
it('1. LIKE', function (done) {
var data = [
{a: 'one', b: 'first'},
{a: 'two', b: 'second\n\ritem'},
{a: 'THREE', b: 'THI\n\rRD'},
];

var res = alasql('SELECT b FROM ? WHERE b LIKE "t%"', [data]);

//console.log(res);
assert.deepEqual(res, [{b: 'THI\n\rRD'}]);
done();
});

it('2. LIKE', function (done) {
var data = [
{a: 'one', b: 'Nine'},
{a: 'two', b: 'second\n\ritem'},
{a: 'THREE', b: 'THIRD'},
{a: 'FOUR', b: '\n\rFifth'},
{a: 'FIVE', b: 'Six\nth'},
];

var res = alasql('SELECT b FROM ? WHERE b LIKE "%T%"', [data]);

//console.log(res);
assert.deepEqual(res, [{b: 'second\n\ritem'}, {b: 'THIRD'}, {b: '\n\rFifth'}, {b: 'Six\nth'}]);
done();
});

it('3. LIKE', function (done) {
var data = [
{a: 'one', b: 0},
{a: 'three', b: 'three'},
{a: 'two', b: '0ne'},
];

var res = alasql('SELECT b FROM ? WHERE b LIKE "0%"', [data]);

//console.log(res);
assert.deepEqual(res, [{b: 0}, {b: '0ne'}]);
done();
});
});
4 changes: 2 additions & 2 deletions test/test244.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe('Test 244 Case-insensitive LIKE', function () {
var res = alasql('SELECT b FROM ? WHERE a LIKE "T%"', [data]);

//console.log(res);
assert(res, [{b: 'second'}, {b: 'THIRD'}]);
assert.deepEqual(res, [{b: 'second'}, {b: 'THIRD'}]);
done();
});

Expand All @@ -33,7 +33,7 @@ describe('Test 244 Case-insensitive LIKE', function () {

var res = alasql('SELECT * FROM ? WHERE a LIKE "m%"', [data]);
//console.log(res);
assert(res, [{a: 'MOSCOW'}, {a: 'MINSK'}]);
assert.deepEqual(res, [{a: 'MOSCOW'}, {a: 'MINSK'}]);
done();
});
});