diff --git a/test/test1684.js b/test/test1684.js index 96e4b5d48..f64be8510 100644 --- a/test/test1684.js +++ b/test/test1684.js @@ -7,24 +7,30 @@ if (typeof exports === 'object') { describe('Test 1684 - UNION ALL still not returning correct results bug', function () { it('1. should not insert empty objects in results when using UNION ALL Expression', function (done) { - var data = [ - { "city": "Madrid", "population": 3041579 }, - { "city": "Rome", "population": 2863223 }, - { "city": "Paris", "population": 2249975 } - ] - var sql = "SELECT city FROM :data WHERE city = 'Madrid' \ + var data = [ + {city: 'Madrid', population: 3041579}, + {city: 'Rome', population: 2863223}, + {city: 'Paris', population: 2249975}, + ]; + var sql = + "SELECT city FROM :data WHERE city = 'Madrid' \ UNION ALL SELECT city FROM :data WHERE city = 'Rome' \ UNION ALL SELECT city FROM :data WHERE city = 'Paris' \ - " - var res = alasql(sql, { data }); - assert.deepEqual(res, [{ city: 'Madrid' }, { city: 'Rome' }, { city: 'Paris' }]); + "; + var res = alasql(sql, {data}); + assert.deepEqual(res, [{city: 'Madrid'}, {city: 'Rome'}, {city: 'Paris'}]); - var sql = "SELECT * FROM :data WHERE city = 'Madrid' \ + var sql = + "SELECT * FROM :data WHERE city = 'Madrid' \ UNION ALL SELECT * FROM :data WHERE city = 'Rome' \ UNION ALL SELECT * FROM :data WHERE city = 'Paris' \ - " - var res = alasql(sql, { data }); - assert.deepEqual(res, [{ city: 'Madrid', population: 3041579 }, { city: 'Rome', population: 2863223 }, { city: 'Paris', population: 2249975 }]); + "; + var res = alasql(sql, {data}); + assert.deepEqual(res, [ + {city: 'Madrid', population: 3041579}, + {city: 'Rome', population: 2863223}, + {city: 'Paris', population: 2249975}, + ]); done(); }); diff --git a/test/test1936.js b/test/test1936.js index f00b97f7e..fe0d8274b 100644 --- a/test/test1936.js +++ b/test/test1936.js @@ -6,43 +6,47 @@ if (typeof exports === 'object') { describe('Test 1936 - Check CURDATE', function () { it('CURDATE in SELECT - as Date', function () { alasql.options.dateAsString = false; - let result = alasql("SELECT CURDATE AS date1, CURRENT_DATE AS date2, CURDATE(), CURRENT_DATE()"); - - assert.ok(result[0]["date1"] instanceof Date); - assert.ok(result[0]["date1"].getHours() === 0); - assert.ok(result[0]["date1"].getMinutes() === 0); - assert.ok(result[0]["date1"].getSeconds() === 0); - - assert.ok(result[0]["date2"] instanceof Date); - assert.ok(result[0]["date2"].getHours() === 0); - assert.ok(result[0]["date2"].getMinutes() === 0); - assert.ok(result[0]["date2"].getSeconds() === 0); - - assert.ok(result[0]["CURDATE()"] instanceof Date); - assert.ok(result[0]["CURDATE()"].getHours() === 0); - assert.ok(result[0]["CURDATE()"].getMinutes() === 0); - assert.ok(result[0]["CURDATE()"].getSeconds() === 0); - - assert.ok(result[0]["CURRENT_DATE()"] instanceof Date); - assert.ok(result[0]["CURRENT_DATE()"].getHours() === 0); - assert.ok(result[0]["CURRENT_DATE()"].getMinutes() === 0); - assert.ok(result[0]["CURRENT_DATE()"].getSeconds() === 0); + let result = alasql( + 'SELECT CURDATE AS date1, CURRENT_DATE AS date2, CURDATE(), CURRENT_DATE()' + ); + + assert.ok(result[0]['date1'] instanceof Date); + assert.ok(result[0]['date1'].getHours() === 0); + assert.ok(result[0]['date1'].getMinutes() === 0); + assert.ok(result[0]['date1'].getSeconds() === 0); + + assert.ok(result[0]['date2'] instanceof Date); + assert.ok(result[0]['date2'].getHours() === 0); + assert.ok(result[0]['date2'].getMinutes() === 0); + assert.ok(result[0]['date2'].getSeconds() === 0); + + assert.ok(result[0]['CURDATE()'] instanceof Date); + assert.ok(result[0]['CURDATE()'].getHours() === 0); + assert.ok(result[0]['CURDATE()'].getMinutes() === 0); + assert.ok(result[0]['CURDATE()'].getSeconds() === 0); + + assert.ok(result[0]['CURRENT_DATE()'] instanceof Date); + assert.ok(result[0]['CURRENT_DATE()'].getHours() === 0); + assert.ok(result[0]['CURRENT_DATE()'].getMinutes() === 0); + assert.ok(result[0]['CURRENT_DATE()'].getSeconds() === 0); }); it('CURDATE in SELECT - as String', function () { alasql.options.dateAsString = true; - let result = alasql("SELECT CURDATE AS date1, CURRENT_DATE AS date2, CURDATE(), CURRENT_DATE()"); + let result = alasql( + 'SELECT CURDATE AS date1, CURRENT_DATE AS date2, CURDATE(), CURRENT_DATE()' + ); - assert.ok(typeof result[0]["date1"] === 'string'); - assert.ok(!result[0]["date1"].includes("00:00:00")); + assert.ok(typeof result[0]['date1'] === 'string'); + assert.ok(!result[0]['date1'].includes('00:00:00')); - assert.ok(typeof result[0]["date2"] === 'string'); - assert.ok(!result[0]["date2"].includes("00:00:00")); + assert.ok(typeof result[0]['date2'] === 'string'); + assert.ok(!result[0]['date2'].includes('00:00:00')); - assert.ok(typeof result[0]["CURDATE()"] === 'string'); - assert.ok(!result[0]["CURDATE()"].includes("00:00:00")); + assert.ok(typeof result[0]['CURDATE()'] === 'string'); + assert.ok(!result[0]['CURDATE()'].includes('00:00:00')); - assert.ok(typeof result[0]["CURRENT_DATE()"] === 'string'); - assert.ok(!result[0]["CURRENT_DATE()"].includes("00:00:00")); + assert.ok(typeof result[0]['CURRENT_DATE()'] === 'string'); + assert.ok(!result[0]['CURRENT_DATE()'].includes('00:00:00')); }); });