honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

SQL: Lowercase the datatypes in validation error msgs (#37524)

Browse Source 
To follow the ES convention display the datatypes in lowercase
in error messages thrown during validation if `IN` and conditional
functions.
This commit is contained in:
Marios Trivyzas 2019-01-16 18:41:10 +02:00 committed by GitHub
parent 4e72f3c5c6
commit ecf0de30ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Verifier.java
View File

@ -636,7 +636,7 @@ public final class Verifier {
for (Expression value : in.list()) { for (Expression value : in.list()) {
if (areTypesCompatible(dt, value.dataType()) == false) { if (areTypesCompatible(dt, value.dataType()) == false) {
localFailures.add(fail(value, "expected data type [%s], value provided is of type [%s]", localFailures.add(fail(value, "expected data type [%s], value provided is of type [%s]",
dt, value.dataType())); dt.esType, value.dataType().esType));
return; return;
} }
} }
@ -657,7 +657,7 @@ public final class Verifier {
} else { } else {
if (areTypesCompatible(dt, child.dataType()) == false) { if (areTypesCompatible(dt, child.dataType()) == false) {
localFailures.add(fail(child, "expected data type [%s], value provided is of type [%s]", localFailures.add(fail(child, "expected data type [%s], value provided is of type [%s]",
dt, child.dataType())); dt.esType, child.dataType().esType));
return; return;
} }
} }
@ -676,4 +676,4 @@ public final class Verifier {
(left.isNumeric() && right.isNumeric()); (left.isNumeric() && right.isNumeric());
} }
} }
} }

24
x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/analysis/analyzer/VerifierErrorMessagesTests.java
View File

@ -333,42 +333,42 @@ public class VerifierErrorMessagesTests extends ESTestCase {
} }
public void testInWithDifferentDataTypes_SelectClause() { public void testInWithDifferentDataTypes_SelectClause() {
assertEquals("1:17: expected data type [INTEGER], value provided is of type [KEYWORD]", assertEquals("1:17: expected data type [integer], value provided is of type [keyword]",
error("SELECT 1 IN (2, '3', 4)")); error("SELECT 1 IN (2, '3', 4)"));
} }
public void testInNestedWithDifferentDataTypes_SelectClause() { public void testInNestedWithDifferentDataTypes_SelectClause() {
assertEquals("1:27: expected data type [INTEGER], value provided is of type [KEYWORD]", assertEquals("1:27: expected data type [integer], value provided is of type [keyword]",
error("SELECT 1 = 1 OR 1 IN (2, '3', 4)")); error("SELECT 1 = 1 OR 1 IN (2, '3', 4)"));
} }
public void testInWithDifferentDataTypesFromLeftValue_SelectClause() { public void testInWithDifferentDataTypesFromLeftValue_SelectClause() {
assertEquals("1:14: expected data type [INTEGER], value provided is of type [KEYWORD]", assertEquals("1:14: expected data type [integer], value provided is of type [keyword]",
error("SELECT 1 IN ('foo', 'bar')")); error("SELECT 1 IN ('foo', 'bar')"));
} }
public void testInNestedWithDifferentDataTypesFromLeftValue_SelectClause() { public void testInNestedWithDifferentDataTypesFromLeftValue_SelectClause() {
assertEquals("1:29: expected data type [KEYWORD], value provided is of type [INTEGER]", assertEquals("1:29: expected data type [keyword], value provided is of type [integer]",
error("SELECT 1 = 1 OR 'foo' IN (2, 3)")); error("SELECT 1 = 1 OR 'foo' IN (2, 3)"));
} }
public void testInWithDifferentDataTypes_WhereClause() { public void testInWithDifferentDataTypes_WhereClause() {
assertEquals("1:49: expected data type [TEXT], value provided is of type [INTEGER]", assertEquals("1:49: expected data type [text], value provided is of type [integer]",
error("SELECT * FROM test WHERE text IN ('foo', 'bar', 4)")); error("SELECT * FROM test WHERE text IN ('foo', 'bar', 4)"));
} }
public void testInNestedWithDifferentDataTypes_WhereClause() { public void testInNestedWithDifferentDataTypes_WhereClause() {
assertEquals("1:60: expected data type [TEXT], value provided is of type [INTEGER]", assertEquals("1:60: expected data type [text], value provided is of type [integer]",
error("SELECT * FROM test WHERE int = 1 OR text IN ('foo', 'bar', 2)")); error("SELECT * FROM test WHERE int = 1 OR text IN ('foo', 'bar', 2)"));
} }
public void testInWithDifferentDataTypesFromLeftValue_WhereClause() { public void testInWithDifferentDataTypesFromLeftValue_WhereClause() {
assertEquals("1:35: expected data type [TEXT], value provided is of type [INTEGER]", assertEquals("1:35: expected data type [text], value provided is of type [integer]",
error("SELECT * FROM test WHERE text IN (1, 2)")); error("SELECT * FROM test WHERE text IN (1, 2)"));
} }
public void testInNestedWithDifferentDataTypesFromLeftValue_WhereClause() { public void testInNestedWithDifferentDataTypesFromLeftValue_WhereClause() {
assertEquals("1:46: expected data type [TEXT], value provided is of type [INTEGER]", assertEquals("1:46: expected data type [text], value provided is of type [integer]",
error("SELECT * FROM test WHERE int = 1 OR text IN (1, 2)")); error("SELECT * FROM test WHERE int = 1 OR text IN (1, 2)"));
} }
@ -478,13 +478,13 @@ public class VerifierErrorMessagesTests extends ESTestCase {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
String function = randomFrom(IfNull.class, NullIf.class).getSimpleName(); String function = randomFrom(IfNull.class, NullIf.class).getSimpleName();
assertEquals("1:" + (22 + function.length()) + assertEquals("1:" + (22 + function.length()) +
": expected data type [INTEGER], value provided is of type [KEYWORD]", ": expected data type [integer], value provided is of type [keyword]",
error("SELECT 1 = 1 OR " + function + "(3, '4') > 1")); error("SELECT 1 = 1 OR " + function + "(3, '4') > 1"));
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
String arbirtraryArgsfunction = randomFrom(Coalesce.class, Greatest.class, Least.class).getSimpleName(); String arbirtraryArgsfunction = randomFrom(Coalesce.class, Greatest.class, Least.class).getSimpleName();
assertEquals("1:" + (34 + arbirtraryArgsfunction.length()) + assertEquals("1:" + (34 + arbirtraryArgsfunction.length()) +
": expected data type [INTEGER], value provided is of type [KEYWORD]", ": expected data type [integer], value provided is of type [keyword]",
error("SELECT 1 = 1 OR " + arbirtraryArgsfunction + "(null, null, 3, '4') > 1")); error("SELECT 1 = 1 OR " + arbirtraryArgsfunction + "(null, null, 3, '4') > 1"));
} }
@ -492,13 +492,13 @@ public class VerifierErrorMessagesTests extends ESTestCase {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
String function = randomFrom(IfNull.class, NullIf.class).getSimpleName(); String function = randomFrom(IfNull.class, NullIf.class).getSimpleName();
assertEquals("1:" + (34 + function.length()) + assertEquals("1:" + (34 + function.length()) +
": expected data type [KEYWORD], value provided is of type [INTEGER]", ": expected data type [keyword], value provided is of type [integer]",
error("SELECT * FROM test WHERE " + function + "('foo', 4) > 1")); error("SELECT * FROM test WHERE " + function + "('foo', 4) > 1"));
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
String arbirtraryArgsfunction = randomFrom(Coalesce.class, Greatest.class, Least.class).getSimpleName(); String arbirtraryArgsfunction = randomFrom(Coalesce.class, Greatest.class, Least.class).getSimpleName();
assertEquals("1:" + (46 + arbirtraryArgsfunction.length()) + assertEquals("1:" + (46 + arbirtraryArgsfunction.length()) +
": expected data type [KEYWORD], value provided is of type [INTEGER]", ": expected data type [keyword], value provided is of type [integer]",
error("SELECT * FROM test WHERE " + arbirtraryArgsfunction + "(null, null, 'foo', 4) > 1")); error("SELECT * FROM test WHERE " + arbirtraryArgsfunction + "(null, null, 'foo', 4) > 1"));
} }