fix

Author: youngsofun

databend-jdbc/src/test/java/com/databend/jdbc/TestPrepareStatement.java

@@ -724,6 +724,7 @@ public void testSelectWithPreparedStatement()
             ResultSet r = statement.executeQuery();
             r.next();
             Assert.assertEquals(r.getString(1), "2021-01-01 00:00:00.000000");
+            Assert.assertFalse(r.next());
         }
     }
 }

databend-jdbc/src/test/java/com/databend/jdbc/TestTypes.java

@@ -38,34 +38,43 @@ public void testGetTimestamp(boolean sameTZ)
             if (Compatibility.skipBugLowerThenOrEqualTo("1.2.844", "0.4.2")) {
                 return;
             }
-            calTz = "Asia/Shanghai";
+            calTz = "America/Los_Angeles"; // -8/-7
             sessionTz = "Europe/Moscow"; // +3
         }
         TimeZone targetZone = TimeZone.getTimeZone(calTz);
         Calendar cal = Calendar.getInstance(targetZone);
+        System.out.println("testGetTimestamp sameTZ=" + sameTZ);
 
 
         try (Connection connection = Utils.createConnectionWithPresignedUrlDisable();
              Statement statement = connection.createStatement()) {
 
             statement.execute(String.format("set timezone='%s'", sessionTz));
-            ResultSet r;
-            Instant exp;
 
             Object[][] cases = new Object[][]{
                     // use tz in string, ignore session timezone
-                    {"2021-07-12T21:30:55+0700", "2021-07-12T14:30:55.000Z"},
+                    {"2021-07-12T21:30:55+0700", "2021-07-12T14:30:55.000Z", "same"},
                     // use tz in string, ignore session timezone
-                    {"2022-07-12 14:30:55Z", "2022-07-12T14:30:55.000Z"},
-                    {"2023-07-12 14:30:55", "2023-07-12T06:30:55.000Z"},
+                    {"2022-07-12 14:30:55Z", "2022-07-12T14:30:55.000Z", "same"},
+                    {"2023-07-12 14:30:55", "2023-07-12T06:30:55.000Z", "2023-07-12T11:30:55.000Z"},
             };
 
             for (int i = 0; i < cases.length; i++) {
                 String sql = String.format("SELECT '%s'::timestamp", cases[i][0]);
-                r = statement.executeQuery(sql);
+                ResultSet r = statement.executeQuery(sql);
                 r.next();
-                exp = Instant.parse((String) cases[i][1]);
+                String expS;
+                if (sameTZ) {
+                    expS = (String) cases[i][1];
+                } else {
+                    expS = (String) cases[i][2];
+                    if (expS.equals("same")) {
+                        expS = (String) cases[i][1];
+                    }
+                }
+                Instant exp = Instant.parse(expS);
                 Assert.assertEquals(exp, r.getTimestamp(1).toInstant());
+                // ignore cal
                 Assert.assertEquals(exp, r.getTimestamp(1, cal).toInstant());
                 r.close();
             }
@@ -135,7 +144,7 @@ public void testTypeTimestampTz()
 
             r = statement.executeQuery("SELECT '1983-07-12 21:30:55 +0700'::timestamp_tz");
             r.next();
-            Instant exp =  Instant.parse("1983-07-12 14:30:55.000Z");
+            Instant exp =  Instant.parse("1983-07-12T14:30:55.000Z");
             Assert.assertEquals(exp, r.getTimestamp(1).toInstant());
             r.close();