Fixed JDBC Precision Tests

Author: cgivre

exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java

@@ -1067,8 +1067,9 @@ public void test_COLUMN_SIZE_hasRightValue_mdrOptTIMESTAMP() throws SQLException
 
   @Test
   public void test_COLUMN_SIZE_hasRightValue_mdrReqINTERVAL_Y() throws SQLException {
+    // Calcite 1.37 changed interval precision calculation: was 4, now 12
     assertThat( getIntOrNull( mdrReqINTERVAL_Y, "COLUMN_SIZE" ),
-                equalTo( 4 ) );  // "P12Y"
+                equalTo( 12 ) );  // "P12Y" - Calcite 1.37 reports precision including all fields
   }
 
   @Test
@@ -1079,14 +1080,16 @@ public void test_COLUMN_SIZE_hasRightValue_mdrReqINTERVAL_3Y_Mo() throws SQLExce
 
   @Test
   public void test_COLUMN_SIZE_hasRightValue_mdrReqINTERVAL_Mo() throws SQLException {
+    // Calcite 1.37 changed interval precision calculation: was 4, now 12
     assertThat( getIntOrNull( mdrReqINTERVAL_Mo, "COLUMN_SIZE" ),
-                equalTo( 4 ) );  // "P12M"
+                equalTo( 12 ) );  // "P12M" - Calcite 1.37 reports precision including all fields
   }
 
   @Test
   public void test_COLUMN_SIZE_hasRightValue_mdrReqINTERVAL_D() throws SQLException {
+    // Calcite 1.37 changed interval precision calculation: was 4, now 12
     assertThat( getIntOrNull( mdrReqINTERVAL_D, "COLUMN_SIZE" ),
-                equalTo( 4 ) );  // "P12D"
+                equalTo( 12 ) );  // "P12D" - Calcite 1.37 reports precision including all fields
   }
 
   @Test
@@ -1148,8 +1151,9 @@ public void test_COLUMN_SIZE_hasINTERIMValue_mdrReqINTERVAL_3H_S1() throws SQLEx
 
   @Test
   public void test_COLUMN_SIZE_hasRightValue_mdrReqINTERVAL_Mi() throws SQLException {
+    // Calcite 1.37 changed interval precision calculation: was 5, now 13
     assertThat( getIntOrNull( mdrReqINTERVAL_Mi, "COLUMN_SIZE" ),
-                equalTo( 5 ) );  // "PT12M"
+                equalTo( 13 ) );  // "PT12M" - Calcite 1.37 reports precision including all fields
   }
 
   @Test
@@ -1160,8 +1164,9 @@ public void test_COLUMN_SIZE_hasRightValue_mdrReqINTERVAL_5Mi_S() throws SQLExce
 
   @Test
   public void test_COLUMN_SIZE_hasRightValue_mdrReqINTERVAL_S() throws SQLException {
+    // Calcite 1.37 changed interval precision calculation: was 12, now 20
     assertThat( getIntOrNull( mdrReqINTERVAL_S, "COLUMN_SIZE" ),
-                equalTo( 12 ) );  // "PT12.123456S"
+                equalTo( 20 ) );  // "PT12.123456S" - Calcite 1.37 reports precision including all fields
   }
 
   @Test

exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestInformationSchemaColumns.java

@@ -2516,8 +2516,8 @@ public void test_INTERVAL_PRECISION_hasRightValue_mdrOptTIMESTAMP() throws SQLEx
 
   @Test
   public void test_INTERVAL_PRECISION_hasRightValue_mdrReqINTERVAL_Y() throws SQLException {
-    // 2 is default field precision.
-    assertThat( getIntOrNull( mdrReqINTERVAL_Y, "INTERVAL_PRECISION" ), equalTo( 2 ) );
+    // Calcite 1.37 changed interval precision calculation: was 2, now 10
+    assertThat( getIntOrNull( mdrReqINTERVAL_Y, "INTERVAL_PRECISION" ), equalTo( 10 ) );
   }
 
   @Test
@@ -2527,14 +2527,14 @@ public void test_INTERVAL_PRECISION_hasRightValue_mdrReqINTERVAL_3Y_Mo() throws
 
   @Test
   public void test_INTERVAL_PRECISION_hasRightValue_mdrReqINTERVAL_2Mo() throws SQLException {
-    // 2 is default field precision.
-    assertThat( getIntOrNull( mdrReqINTERVAL_Mo, "INTERVAL_PRECISION" ), equalTo( 2 ) );
+    // Calcite 1.37 changed interval precision calculation: was 2, now 10
+    assertThat( getIntOrNull( mdrReqINTERVAL_Mo, "INTERVAL_PRECISION" ), equalTo( 10 ) );
   }
 
   @Test
   public void test_INTERVAL_PRECISION_hasRightValue_mdrReqINTERVAL_D() throws SQLException {
-    // 2 is default field precision.
-    assertThat( getIntOrNull( mdrReqINTERVAL_D, "INTERVAL_PRECISION" ), equalTo( 2 ) );
+    // Calcite 1.37 changed interval precision calculation: was 2, now 10
+    assertThat( getIntOrNull( mdrReqINTERVAL_D, "INTERVAL_PRECISION" ), equalTo( 10 ) );
   }
 
   @Test
@@ -2554,8 +2554,8 @@ public void test_INTERVAL_PRECISION_hasRightValue_mdrReqINTERVAL_2D_S5() throws
 
   @Test
   public void test_INTERVAL_PRECISION_hasRightValue_mdrReqINTERVAL_H() throws SQLException {
-    // 2 is default field precision.
-    assertThat( getIntOrNull( mdrReqINTERVAL_H, "INTERVAL_PRECISION" ), equalTo( 2 ) );
+    // Calcite 1.37 changed interval precision calculation: was 2, now 10
+    assertThat( getIntOrNull( mdrReqINTERVAL_H, "INTERVAL_PRECISION" ), equalTo( 10 ) );
   }
 
   @Test
@@ -2570,7 +2570,8 @@ public void test_INTERVAL_PRECISION_hasRightValue_mdrReqINTERVAL_3H_S1() throws
 
   @Test
   public void test_INTERVAL_PRECISION_hasRightValue_mdrReqINTERVAL_Mi() throws SQLException {
-    assertThat( getIntOrNull( mdrReqINTERVAL_Mi, "INTERVAL_PRECISION" ), equalTo( 2 ) );
+    // Calcite 1.37 changed interval precision calculation: was 2, now 10
+    assertThat( getIntOrNull( mdrReqINTERVAL_Mi, "INTERVAL_PRECISION" ), equalTo( 10 ) );
   }
 
   @Test
@@ -2580,8 +2581,8 @@ public void test_INTERVAL_PRECISION_hasRightValue_mdrReqINTERVAL_5Mi_S() throws
 
   @Test
   public void test_INTERVAL_PRECISION_hasRightValue_mdrReqINTERVAL_S() throws SQLException {
-    // 2 is default field precision.
-    assertThat( getIntOrNull( mdrReqINTERVAL_S, "INTERVAL_PRECISION" ), equalTo( 2 ) );
+    // Calcite 1.37 changed interval precision calculation: was 2, now 10
+    assertThat( getIntOrNull( mdrReqINTERVAL_S, "INTERVAL_PRECISION" ), equalTo( 10 ) );
   }
 
   @Test