Added "datetime_format" URL parameter to handle jdbc date and time fo…

…rmatting with new engine
opendistro-for-elasticsearch · Aug 22, 2021 · 60da9ed · 60da9ed
1 parent 39380c2
commit 60da9ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 36 deletions.
diff --git a/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/sql/JdbcFormatIT.java b/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/sql/JdbcFormatIT.java
@@ -17,7 +17,6 @@
 package com.amazon.opendistroforelasticsearch.sql.sql;
 
 import static com.amazon.opendistroforelasticsearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
-import static com.amazon.opendistroforelasticsearch.sql.legacy.TestsConstants.TEST_INDEX_DATE_TIME;
 import static com.amazon.opendistroforelasticsearch.sql.util.MatcherUtils.*;
 
 import com.amazon.opendistroforelasticsearch.sql.legacy.SQLIntegTestCase;
@@ -56,37 +55,4 @@ public void testAliasInSchema() {
     verifySchema(response, schema("account_number", "acc", "long"));
   }
 
-  @Test
-  public void testDatetimeFormat1() {
-    String response = executeQuery(
-            "SELECT login_time FROM " + TEST_INDEX_DATE_TIME,
-            "jdbc", "always_include_time");
-
-    assertTrue(response.contains("\"2015-01-01 00:00:00\""));
-    assertTrue(response.contains("\"2015-01-01 12:10:30\""));
-    assertTrue(response.contains("\"2020-04-08 06:10:30\""));
-  }
-
-  @Test
-  public void testDatetimeFormat2() {
-    String response = executeQuery(
-            "SELECT login_time FROM " + TEST_INDEX_DATE_TIME,
-            "jdbc", "never_include_time");
-
-    assertTrue(response.contains("\"2015-01-01\""));
-    assertFalse(response.contains("\"2015-01-01 12:10:30\""));
-    assertTrue(response.contains("\"2020-04-08\""));
-  }
-
-  @Test
-  public void testDatetimeFormat3() {
-    String response = executeQuery(
-            "SELECT login_time FROM " + TEST_INDEX_DATE_TIME,
-            "jdbc", "include_time_when_nonzero");
-
-    assertTrue(response.contains("\"2015-01-01\""));
-    assertTrue(response.contains("\"2015-01-01 12:10:30\""));
-    assertTrue(response.contains("\"2020-04-08 06:10:30\""));
-  }
-
 }
diff --git a/integ-test/src/test/resources/datetime.json b/integ-test/src/test/resources/datetime.json
@@ -2,7 +2,7 @@
 {"login_time":"2015-01-01"}
 {"index":{"_id":"2"}}
 {"login_time":"2015-01-01T12:10:30Z"}
-//{"index":{"_id":"3"}}
-//{"login_time":"1585882955"}
+{"index":{"_id":"3"}}
+{"login_time":"1585882955"}
 {"index":{"_id":"4"}}
 {"login_time":"2020-04-08T11:10:30+05:00"}