cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tests: Use "UNION ALL" instead of "UNION" to improve performance

Browse Source
This commit is contained in:
Raul Marin 2018-07-17 12:43:29 +02:00
parent 7d5469ed1c
commit cd31f998dd
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/acceptance/ported/torque.js
View File

@ -164,7 +164,7 @@ describe('torque', function() {
version: '1.1.0',
layers: [
{ type: 'torque', options: {
sql: "select 1 as id, '1970-01-02'::date as d, 'POINT(0 0)'::geometry as the_geom UNION select 2, " +
sql: "select 1 as id, '1970-01-02'::date as d, 'POINT(0 0)'::geometry as the_geom UNION ALL select 2, " +
"'1970-01-01'::date, 'POINT(1 1)'::geometry",
geom_column: 'the_geom',
cartocss: 'Map { -torque-frame-count:2; -torque-resolution:3; -torque-time-attribute:d; ' +
@ -359,7 +359,7 @@ describe('torque', function() {
version: '1.1.0',
layers: [
{ type: 'torque', options: {
sql: "select 1 as id, '1970-01-03'::date as d, 'POINT(0 0)'::geometry as the_geom UNION select 2, " +
sql: "select 1 as id, '1970-01-03'::date as d, 'POINT(0 0)'::geometry as the_geom UNION ALL select 2, " +
"'1970-01-01'::date, 'POINT(1 1)'::geometry",
geom_column: 'the_geom',
cartocss: 'Map { -torque-frame-count:2; -torque-resolution:3; -torque-time-attribute:d; ' +

8
test/acceptance/turbo-carto/anonymous-maps.js
View File

@ -21,13 +21,13 @@ function makeMapconfig(cartocss) {
"sql": [
'SELECT test_table.*, _prices.price FROM test_table JOIN (' +
' SELECT 1 AS cartodb_id, 10.00 AS price',
' UNION',
' UNION ALL',
' SELECT 2, 10.50',
' UNION',
' UNION ALL',
' SELECT 3, 11.00',
' UNION',
' UNION ALL',
' SELECT 4, 12.00',
' UNION',
' UNION ALL',
' SELECT 5, 21.00',
') _prices ON _prices.cartodb_id = test_table.cartodb_id'
].join('\n'),

8
test/acceptance/turbo-carto/named-maps.js
View File

@ -45,13 +45,13 @@ describe('turbo-carto for named maps', function() {
sql: [
'SELECT ' + table + '.*, _prices.price FROM ' + table + ' JOIN (' +
' SELECT 1 AS cartodb_id, 10.00 AS price',
' UNION',
' UNION ALL',
' SELECT 2, 10.50',
' UNION',
' UNION ALL',
' SELECT 3, 11.00',
' UNION',
' UNION ALL',
' SELECT 4, 12.00',
' UNION',
' UNION ALL',
' SELECT 5, 21.00',
') _prices ON _prices.cartodb_id = ' + table + '.cartodb_id'
].join('\n'),

4
test/acceptance/widgets/regressions.js
View File

@ -265,12 +265,12 @@ describe('widgets-regressions', function() {
ST_TRANSFORM(ST_SETSRID(ST_GeomFromGeoJSON(
'${JSON.stringify(notIntersectingLeftTriangle)}'
), 4326), 3857) AS the_geom_webmercator, 1 AS cartodb_id, 'notIntersectingLeftTriangle' AS name
UNION
UNION ALL
SELECT
ST_TRANSFORM(ST_SETSRID(ST_GeomFromGeoJSON(
'${JSON.stringify(notIntersectingRightTriangle)}'
), 4326), 3857), 2, 'notIntersectingRightTriangle'
UNION
UNION ALL
SELECT
ST_TRANSFORM(ST_SETSRID(ST_GeomFromGeoJSON(
'${JSON.stringify(intersectingTriangle)}'