Skip to content

Commit 8ea08df

Browse files
committed
SQL: Add missing handling of IP field in JDBC (#40384)
Fix #40358 (cherry picked from commit ee286fa) (cherry picked from commit d229624)
1 parent ca745db commit 8ea08df

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/TypeConverter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,8 @@ static Object convert(Object v, EsType columnType, String typeString) throws SQL
232232
case INTERVAL_HOUR_TO_SECOND:
233233
case INTERVAL_MINUTE_TO_SECOND:
234234
return Duration.parse(v.toString());
235+
case IP:
236+
return v.toString();
235237
default:
236238
throw new SQLException("Unexpected column type [" + typeString + "]");
237239

x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/jdbc/CsvSpecTestCase.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,14 @@ public static List<Object[]> readScriptSpec() throws Exception {
3636
tests.addAll(readScriptSpec("/arithmetic.csv-spec", parser));
3737
tests.addAll(readScriptSpec("/columns.csv-spec", parser));
3838
tests.addAll(readScriptSpec("/command.csv-spec", parser));
39-
//tests.addAll(readScriptSpec("/command-sys.csv-spec", parser));
4039
tests.addAll(readScriptSpec("/date.csv-spec", parser));
4140
tests.addAll(readScriptSpec("/datetime.csv-spec", parser));
4241
tests.addAll(readScriptSpec("/datetime-interval.csv-spec", parser));
4342
tests.addAll(readScriptSpec("/field-alias.csv-spec", parser));
4443
tests.addAll(readScriptSpec("/filter.csv-spec", parser));
4544
tests.addAll(readScriptSpec("/fulltext.csv-spec", parser));
4645
tests.addAll(readScriptSpec("/functions.csv-spec", parser));
47-
//tests.addAll(readScriptSpec("/ip.csv-spec", parser));
46+
tests.addAll(readScriptSpec("/ip.csv-spec", parser));
4847
tests.addAll(readScriptSpec("/math.csv-spec", parser));
4948
tests.addAll(readScriptSpec("/null.csv-spec", parser));
5049
tests.addAll(readScriptSpec("/nested.csv-spec", parser));

x-pack/plugin/sql/qa/src/main/resources/command-sys.csv-spec

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)