From d485be631b9164b66a65757f38e9971c2e055eec Mon Sep 17 00:00:00 2001 From: Andrei Stefan Date: Thu, 21 Mar 2019 10:56:29 +0200 Subject: [PATCH] Moving tests in locale-aware test file (#40254) (cherry picked from commit 9beb31fd3c5a8323cb08cc524f1a2268e9c72c24) --- .../sql/qa/src/main/resources/agg-ordering.sql-spec | 8 +------- .../sql/qa/src/main/resources/case-functions.sql-spec | 8 +++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/x-pack/plugin/sql/qa/src/main/resources/agg-ordering.sql-spec b/x-pack/plugin/sql/qa/src/main/resources/agg-ordering.sql-spec index b96d77399af..ed206da6d13 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/agg-ordering.sql-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/agg-ordering.sql-spec @@ -110,11 +110,5 @@ SELECT gender AS g, first_name AS f, last_name AS l FROM test_emp GROUP BY f, ge multipleGroupingsAndOrderingByGroups_8 SELECT gender AS g, first_name, last_name FROM test_emp GROUP BY g, last_name, first_name ORDER BY gender ASC, first_name DESC, last_name ASC; -multipleGroupingsAndOrderingByGroupsWithFunctions_1 -SELECT first_name f, last_name l, gender g, CONCAT(UCASE(first_name), LCASE(last_name)) c FROM test_emp GROUP BY gender, l, f, c ORDER BY c DESC, first_name, l ASC, g; - -multipleGroupingsAndOrderingByGroupsWithFunctions_2 +multipleGroupingsAndOrderingByGroupsWithFunctions SELECT first_name f, last_name l, gender g, CONCAT(first_name, last_name) c FROM test_emp GROUP BY gender, l, f, c ORDER BY gender, c DESC, first_name, last_name ASC; - -multipleGroupingsAndOrderingByGroupsWithFunctions_3 -SELECT first_name f, last_name l, LCASE(gender) g, CONCAT(UCASE(first_name), LCASE(last_name)) c FROM test_emp GROUP BY f, LCASE(gender), l, c ORDER BY c DESC, first_name, l ASC, g; \ No newline at end of file diff --git a/x-pack/plugin/sql/qa/src/main/resources/case-functions.sql-spec b/x-pack/plugin/sql/qa/src/main/resources/case-functions.sql-spec index 90244975549..d3a92b5eeec 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/case-functions.sql-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/case-functions.sql-spec @@ -16,4 +16,10 @@ ucaseInline1 SELECT UCASE('ElAsTiC') upper; ucaseInline3 -SELECT UCASE(' elastic ') upper; \ No newline at end of file +SELECT UCASE(' elastic ') upper; + +multipleGroupingsAndOrderingByGroupsWithFunctions_1 +SELECT first_name f, last_name l, gender g, CONCAT(UCASE(first_name), LCASE(last_name)) c FROM test_emp GROUP BY gender, l, f, c ORDER BY c DESC, first_name, l ASC, g; + +multipleGroupingsAndOrderingByGroupsWithFunctions_2 +SELECT first_name f, last_name l, LCASE(gender) g, CONCAT(UCASE(first_name), LCASE(last_name)) c FROM test_emp GROUP BY f, LCASE(gender), l, c ORDER BY c DESC, first_name, l ASC, g;