This is an automated email from the ASF dual-hosted git repository.
mihaibudiu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/main by this push:
new 4d89fcb23a Temporarily disable some tests to enable Avatica to merge
[CALCITE-7494]
4d89fcb23a is described below
commit 4d89fcb23ab54c5dc42213faa78687e2e34de491
Author: Mihai Budiu <[email protected]>
AuthorDate: Tue Sep 8 00:31:26 2026 -0700
Temporarily disable some tests to enable Avatica to merge [CALCITE-7494]
---
babel/src/test/resources/sql/big-query.iq | 14 --------
.../org/apache/calcite/test/SqlOperatorTest.java | 40 +++++++++++-----------
2 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/babel/src/test/resources/sql/big-query.iq
b/babel/src/test/resources/sql/big-query.iq
index bf4f8de8a9..b8298d0317 100755
--- a/babel/src/test/resources/sql/big-query.iq
+++ b/babel/src/test/resources/sql/big-query.iq
@@ -34,8 +34,6 @@
# Test case for [CALCITE-7491]
https://issues.apache.org/jira/browse/CALCITE-7491
# Literals of type TIMESTAMP WITH TIME ZONE cause crashes
-# The rendering depends on [CALCITE-7494] Avatica conversion to string of
-# TIMESTAMP WITH TIME ZONE does not include time zone, fixed in Avatica 1.29.0
!if (fixed.calcite7494) {
select TIMESTAMP WITH TIME ZONE '2020-01-01 00:00:00 America/New_York';
+-------------------------+
@@ -48,18 +46,6 @@ select TIMESTAMP WITH TIME ZONE '2020-01-01 00:00:00
America/New_York';
!ok
!}
-!if (not.fixed.calcite7494) {
-select TIMESTAMP WITH TIME ZONE '2020-01-01 00:00:00 America/New_York';
-+---------------------+
-| EXPR$0 |
-+---------------------+
-| 2020-01-01 05:00:00 |
-+---------------------+
-(1 row)
-
-!ok
-!}
-
# Two timestamps with time zone are equal if they represent the same UTC time
SELECT TIMESTAMP WITH TIME ZONE '2020-01-01 08:10:10 America/New_York' =
TIMESTAMP WITH TIME ZONE '2020-01-01 05:10:10 America/Los_Angeles';
+--------+
diff --git a/testkit/src/main/java/org/apache/calcite/test/SqlOperatorTest.java
b/testkit/src/main/java/org/apache/calcite/test/SqlOperatorTest.java
index b8e878ac2f..27c28cf2e0 100644
--- a/testkit/src/main/java/org/apache/calcite/test/SqlOperatorTest.java
+++ b/testkit/src/main/java/org/apache/calcite/test/SqlOperatorTest.java
@@ -5914,26 +5914,26 @@ void testBitGetFunc(SqlOperatorFixture f, String
functionName) {
final SqlOperatorFixture f = fixture().withLibrary(SqlLibrary.POSTGRESQL)
.setFor(SqlLibraryOperators.TO_TIMESTAMP_PG);
- // [CALCITE-7494] Avatica 1.29.0 appends the zone to TIMESTAMP WITH TIME
ZONE
- final String tz = Bug.CALCITE_7494_FIXED ? " UTC" : "";
- f.checkString("to_timestamp('2022-06-03 18:34:56', 'YYYY-MM-DD
HH24:MI:SS')",
- "2022-06-03 18:34:56" + tz,
- "TIMESTAMP_TZ(0) NOT NULL");
- f.checkString("to_timestamp('0001-01-01 18:43:56', 'YYYY-MM-DD
HH24:MI:SS')",
- "0001-01-01 18:43:56" + tz,
- "TIMESTAMP_TZ(0) NOT NULL");
- f.checkString("to_timestamp('18:34:56 Jun 03, 2022', 'HH24:MI:SS Mon DD,
YYYY')",
- "2022-06-03 18:34:56" + tz,
- "TIMESTAMP_TZ(0) NOT NULL");
- f.checkString("to_timestamp('18:34:56 2022-June-03', 'HH24:MI:SS
YYYY-Month-DD')",
- "2022-06-03 18:34:56" + tz,
- "TIMESTAMP_TZ(0) NOT NULL");
- f.checkString("to_timestamp('18:34:56 2022-Jun-03', 'HH24:MI:SS
YYYY-Mon-DD')",
- "2022-06-03 18:34:56" + tz,
- "TIMESTAMP_TZ(0) NOT NULL");
- f.checkString("to_timestamp('18:34:56 2022-154', 'HH24:MI:SS YYYY-DDD')",
- "2022-06-03 18:34:56" + tz,
- "TIMESTAMP_TZ(0) NOT NULL");
+ if (Bug.CALCITE_7494_FIXED) {
+ f.checkString("to_timestamp('2022-06-03 18:34:56', 'YYYY-MM-DD
HH24:MI:SS')",
+ "2022-06-03 18:34:56 UTC",
+ "TIMESTAMP_TZ(0) NOT NULL");
+ f.checkString("to_timestamp('0001-01-01 18:43:56', 'YYYY-MM-DD
HH24:MI:SS')",
+ "0001-01-01 18:43:56 UTC",
+ "TIMESTAMP_TZ(0) NOT NULL");
+ f.checkString("to_timestamp('18:34:56 Jun 03, 2022', 'HH24:MI:SS Mon DD,
YYYY')",
+ "2022-06-03 18:34:56 UTC",
+ "TIMESTAMP_TZ(0) NOT NULL");
+ f.checkString("to_timestamp('18:34:56 2022-June-03', 'HH24:MI:SS
YYYY-Month-DD')",
+ "2022-06-03 18:34:56 UTC",
+ "TIMESTAMP_TZ(0) NOT NULL");
+ f.checkString("to_timestamp('18:34:56 2022-Jun-03', 'HH24:MI:SS
YYYY-Mon-DD')",
+ "2022-06-03 18:34:56 UTC",
+ "TIMESTAMP_TZ(0) NOT NULL");
+ f.checkString("to_timestamp('18:34:56 2022-154', 'HH24:MI:SS YYYY-DDD')",
+ "2022-06-03 18:34:56 UTC",
+ "TIMESTAMP_TZ(0) NOT NULL");
+ }
f.checkFails("to_timestamp('ABCD', 'YYYY-MM-DD HH24:MI:SS')",
"java.sql.SQLException: Invalid format: 'YYYY-MM-DD HH24:MI:SS' for
timestamp "
+ "string: 'ABCD'.",
