diff --git a/x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/TypeConverter.java b/x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/TypeConverter.java index 907206dc083..d08496b611e 100644 --- a/x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/TypeConverter.java +++ b/x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/TypeConverter.java @@ -232,6 +232,8 @@ final class TypeConverter { case INTERVAL_HOUR_TO_SECOND: case INTERVAL_MINUTE_TO_SECOND: return Duration.parse(v.toString()); + case IP: + return v.toString(); default: throw new SQLException("Unexpected column type [" + typeString + "]"); diff --git a/x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/jdbc/CsvSpecTestCase.java b/x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/jdbc/CsvSpecTestCase.java index 463ec35e88f..81516154bf5 100644 --- a/x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/jdbc/CsvSpecTestCase.java +++ b/x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/jdbc/CsvSpecTestCase.java @@ -36,7 +36,6 @@ public abstract class CsvSpecTestCase extends SpecBaseIntegrationTestCase { tests.addAll(readScriptSpec("/arithmetic.csv-spec", parser)); tests.addAll(readScriptSpec("/columns.csv-spec", parser)); tests.addAll(readScriptSpec("/command.csv-spec", parser)); - //tests.addAll(readScriptSpec("/command-sys.csv-spec", parser)); tests.addAll(readScriptSpec("/date.csv-spec", parser)); tests.addAll(readScriptSpec("/datetime.csv-spec", parser)); tests.addAll(readScriptSpec("/datetime-interval.csv-spec", parser)); @@ -44,7 +43,7 @@ public abstract class CsvSpecTestCase extends SpecBaseIntegrationTestCase { tests.addAll(readScriptSpec("/filter.csv-spec", parser)); tests.addAll(readScriptSpec("/fulltext.csv-spec", parser)); tests.addAll(readScriptSpec("/functions.csv-spec", parser)); - //tests.addAll(readScriptSpec("/ip.csv-spec", parser)); + tests.addAll(readScriptSpec("/ip.csv-spec", parser)); tests.addAll(readScriptSpec("/math.csv-spec", parser)); tests.addAll(readScriptSpec("/null.csv-spec", parser)); tests.addAll(readScriptSpec("/nested.csv-spec", parser)); diff --git a/x-pack/plugin/sql/qa/src/main/resources/command-sys.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/command-sys.csv-spec deleted file mode 100644 index 2ed05aadb6c..00000000000 --- a/x-pack/plugin/sql/qa/src/main/resources/command-sys.csv-spec +++ /dev/null @@ -1,11 +0,0 @@ -// -// Sys Commands -// - -sysTableTypes -SYS TABLE TYPES; - - TABLE_TYPE:s -BASE TABLE -VIEW -;