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

SQL: Add missing handling of IP field in JDBC (#40384)

Browse Source 
Fix #40358

(cherry picked from commit ee286fa4893817637c05d72b93b254b36efc0dae)
(cherry picked from commit d2296249499e31bd512390ac3d20bc38009612b3)
This commit is contained in:
Costin Leau 2019-03-23 12:41:51 +02:00 committed by Costin Leau
parent 150d1332cf
commit 558adc0f28
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 + "]");

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

@ -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));

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

@ -1,11 +0,0 @@
//
// Sys Commands
//
sysTableTypes
SYS TABLE TYPES;
TABLE_TYPE:s
BASE TABLE
VIEW
;