Skip to content

Commit

Permalink
SQL: Fix ODBC metadata for DATE & TIME data types (elastic#55316)
Browse files Browse the repository at this point in the history 
Fix MINIMUM_SCALE, MAXIMUM_SCALE and SQL_DATETIME_SUB
ODBC metadata for the DATE & TIME data types.

Fixes: elastic#42086
(cherry picked from commit c23677c)
  • Loading branch information
@matriv
matriv committed Apr 16, 2020
1 parent 7a0693a commit fbf19a5
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 9 deletions.
8 changes: 7 additions & 1 deletion x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/type/SqlDataTypes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,12 @@ public static Integer metaSqlDateTimeSub(DataType t) {
if (t == DATETIME) {
// ODBC SQL_CODE_TIMESTAMP
return Integer.valueOf(3);
} else if (t == DATE) {
// ODBC SQL_CODE_DATE
return Integer.valueOf(1);
} else if (t == TIME) {
// ODBC SQL_CODE_TIME
return Integer.valueOf(2);
}
// ODBC null
return 0;
Expand All @@ -677,7 +683,7 @@ private static Short metaSqlSameScale(DataType t) {
if (t.isInteger()) {
return Short.valueOf((short) 0);
}
if (isDateBased(t) || t.isRational()) {
if (t == DATETIME || t == TIME || t.isRational()) {
return Short.valueOf((short) defaultPrecision(t));
}
return null;
Expand Down
26 changes: 18 additions & 8 deletions x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/type/SqlDataTypesTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static org.elasticsearch.xpack.ql.type.DataTypes.KEYWORD;
import static org.elasticsearch.xpack.ql.type.DataTypes.LONG;
import static org.elasticsearch.xpack.sql.expression.literal.interval.Intervals.compatibleInterval;
import static org.elasticsearch.xpack.sql.type.SqlDataTypes.DATE;
import static org.elasticsearch.xpack.sql.type.SqlDataTypes.INTERVAL_DAY;
import static org.elasticsearch.xpack.sql.type.SqlDataTypes.INTERVAL_DAY_TO_HOUR;
import static org.elasticsearch.xpack.sql.type.SqlDataTypes.INTERVAL_DAY_TO_MINUTE;
Expand All @@ -33,6 +34,7 @@
import static org.elasticsearch.xpack.sql.type.SqlDataTypes.INTERVAL_SECOND;
import static org.elasticsearch.xpack.sql.type.SqlDataTypes.INTERVAL_YEAR;
import static org.elasticsearch.xpack.sql.type.SqlDataTypes.INTERVAL_YEAR_TO_MONTH;
import static org.elasticsearch.xpack.sql.type.SqlDataTypes.TIME;
import static org.elasticsearch.xpack.sql.type.SqlDataTypes.defaultPrecision;
import static org.elasticsearch.xpack.sql.type.SqlDataTypes.isInterval;
import static org.elasticsearch.xpack.sql.type.SqlDataTypes.metaSqlDataType;
Expand All @@ -44,25 +46,33 @@

public class SqlDataTypesTests extends ESTestCase {

public void testMetaDataType() {
public void testMetadataType() {
assertEquals(Integer.valueOf(91), metaSqlDataType(DATE));
assertEquals(Integer.valueOf(92), metaSqlDataType(TIME));
assertEquals(Integer.valueOf(9), metaSqlDataType(DATETIME));
DataType t = randomDataTypeNoDateTime();
assertEquals(sqlType(t).getVendorTypeNumber(), metaSqlDataType(t));
}

public void testMetaDateTypeSub() {
assertEquals(Integer.valueOf(1), metaSqlDateTimeSub(DATE));
assertEquals(Integer.valueOf(2), metaSqlDateTimeSub(TIME));
assertEquals(Integer.valueOf(3), metaSqlDateTimeSub(DATETIME));
assertEquals(Integer.valueOf(0), metaSqlDateTimeSub(randomDataTypeNoDateTime()));
}

public void testMetaMinimumScale() {
assertNull(metaSqlMinimumScale(DATE));
assertEquals(Short.valueOf((short) 3), metaSqlMinimumScale(TIME));
assertEquals(Short.valueOf((short) 3), metaSqlMinimumScale(DATETIME));
assertEquals(Short.valueOf((short) 0), metaSqlMinimumScale(LONG));
assertEquals(Short.valueOf((short) defaultPrecision(FLOAT)), metaSqlMaximumScale(FLOAT));
assertNull(metaSqlMinimumScale(KEYWORD));
}

public void testMetaMaximumScale() {
assertNull(metaSqlMinimumScale(DATE));
assertEquals(Short.valueOf((short) 3), metaSqlMinimumScale(TIME));
assertEquals(Short.valueOf((short) 3), metaSqlMaximumScale(DATETIME));
assertEquals(Short.valueOf((short) 0), metaSqlMaximumScale(LONG));
assertEquals(Short.valueOf((short) defaultPrecision(FLOAT)), metaSqlMaximumScale(FLOAT));
Expand All @@ -78,7 +88,7 @@ public void testMetaRadix() {


// type checks
public void testIsInterval() throws Exception {
public void testIsInterval() {
for (DataType dataType : asList(INTERVAL_YEAR,
INTERVAL_MONTH,
INTERVAL_DAY,
Expand All @@ -96,14 +106,14 @@ public void testIsInterval() throws Exception {
}
}

public void testIntervalCompatibilityYearMonth() throws Exception {
public void testIntervalCompatibilityYearMonth() {
assertEquals(INTERVAL_YEAR_TO_MONTH, compatibleInterval(INTERVAL_YEAR, INTERVAL_MONTH));
assertEquals(INTERVAL_YEAR_TO_MONTH, compatibleInterval(INTERVAL_YEAR, INTERVAL_YEAR_TO_MONTH));
assertEquals(INTERVAL_YEAR_TO_MONTH, compatibleInterval(INTERVAL_MONTH, INTERVAL_YEAR));
assertEquals(INTERVAL_YEAR_TO_MONTH, compatibleInterval(INTERVAL_MONTH, INTERVAL_YEAR_TO_MONTH));
}

public void testIntervalCompatibilityDayTime() throws Exception {
public void testIntervalCompatibilityDayTime() {
assertEquals(INTERVAL_DAY_TO_HOUR, compatibleInterval(INTERVAL_DAY, INTERVAL_HOUR));
assertEquals(INTERVAL_DAY_TO_HOUR, compatibleInterval(INTERVAL_DAY_TO_HOUR, INTERVAL_HOUR));
assertEquals(INTERVAL_DAY_TO_MINUTE, compatibleInterval(INTERVAL_DAY, INTERVAL_MINUTE));
Expand All @@ -121,14 +131,14 @@ public void testIntervalCompatibilityDayTime() throws Exception {
assertEquals(INTERVAL_MINUTE_TO_SECOND, compatibleInterval(INTERVAL_SECOND, INTERVAL_MINUTE));
}

public void testIncompatibleInterval() throws Exception {
public void testIncompatibleInterval() {
assertNull(compatibleInterval(INTERVAL_YEAR, INTERVAL_SECOND));
assertNull(compatibleInterval(INTERVAL_YEAR, INTERVAL_DAY_TO_HOUR));
assertNull(compatibleInterval(INTERVAL_HOUR, INTERVAL_MONTH));
assertNull(compatibleInterval(INTERVAL_MINUTE_TO_SECOND, INTERVAL_MONTH));
}

public void testEsToDataType() throws Exception {
public void testEsToDataType() {
List<String> types = new ArrayList<>(Arrays.asList("null", "boolean", "bool",
"byte", "tinyint",
"short", "smallint",
Expand Down Expand Up @@ -157,6 +167,6 @@ public void testEsToDataType() throws Exception {
}

private DataType randomDataTypeNoDateTime() {
return randomValueOtherThan(DATETIME, () -> randomFrom(SqlDataTypes.types()));
return randomValueOtherThanMany(SqlDataTypes::isDateOrTimeBased, () -> randomFrom(SqlDataTypes.types()));
}
}
}

0 comments on commit fbf19a5

Please sign in to comment.