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 da19a169b4 [CALCITE-7769] Re-enable Calcite tests disabled to merge
Avatica [CALCITE-7494
da19a169b4 is described below
commit da19a169b46590363f96a2b4c64353108d58048c
Author: Mihai Budiu <[email protected]>
AuthorDate: Thu Sep 24 15:07:00 2026 -0700
[CALCITE-7769] Re-enable Calcite tests disabled to merge Avatica
[CALCITE-7494
Signed-off-by: Mihai Budiu <[email protected]>
---
babel/src/test/resources/sql/big-query.iq | 2 --
babel/src/test/resources/sql/postgresql.iq | 8 -----
.../src/main/java/org/apache/calcite/util/Bug.java | 7 ----
.../java/org/apache/calcite/test/QuidemTest.java | 2 --
.../org/apache/calcite/test/SqlOperatorTest.java | 38 ++++++++++------------
5 files changed, 18 insertions(+), 39 deletions(-)
diff --git a/babel/src/test/resources/sql/big-query.iq
b/babel/src/test/resources/sql/big-query.iq
index b8298d0317..a759697954 100755
--- a/babel/src/test/resources/sql/big-query.iq
+++ b/babel/src/test/resources/sql/big-query.iq
@@ -34,7 +34,6 @@
# Test case for [CALCITE-7491]
https://issues.apache.org/jira/browse/CALCITE-7491
# Literals of type TIMESTAMP WITH TIME ZONE cause crashes
-!if (fixed.calcite7494) {
select TIMESTAMP WITH TIME ZONE '2020-01-01 00:00:00 America/New_York';
+-------------------------+
| EXPR$0 |
@@ -44,7 +43,6 @@ select TIMESTAMP WITH TIME ZONE '2020-01-01 00:00:00
America/New_York';
(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/babel/src/test/resources/sql/postgresql.iq
b/babel/src/test/resources/sql/postgresql.iq
index 42e5cee2e4..7432634672 100644
--- a/babel/src/test/resources/sql/postgresql.iq
+++ b/babel/src/test/resources/sql/postgresql.iq
@@ -526,9 +526,6 @@ EXPR$0
null
!ok
-# [CALCITE-7494] Avatica 1.29.0 renders TIMESTAMP WITH TIME ZONE with its zone
-!if (fixed.calcite7494) {
-### disabled until Bug.CALCITE_7494_FIXED ###
select to_timestamp('01', 'HH');
EXPR$0
0001-01-01 01:00:00 UTC
@@ -1163,7 +1160,6 @@ select to_timestamp('ix', 'rm');
EXPR$0
0001-09-01 00:00:00 UTC
!ok
-!}
select to_date('2022-06-03', 'YYYY-MM-DD');
EXPR$0
@@ -1245,9 +1241,6 @@ EXPR$0
0001-01-01
!ok
-# [CALCITE-7494] Avatica 1.29.0 renders TIMESTAMP WITH TIME ZONE with its zone
-!if (fixed.calcite7494) {
-### disabled until Bug.CALCITE_7494_FIXED ###
select to_timestamp('18:46:32 2022-06-03', 'HH24:MI:SS YYYY-MM-DD');
EXPR$0
2022-06-03 18:46:32 UTC
@@ -1257,7 +1250,6 @@ select to_timestamp('18:46:32 Jun 03, 2022', 'HH24:MI:SS
Mon DD, YYYY');
EXPR$0
2022-06-03 18:46:32 UTC
!ok
-!}
select date_part('microsecond', timestamp '2022-06-03 12:15:48.678');
EXPR$0
diff --git a/core/src/main/java/org/apache/calcite/util/Bug.java
b/core/src/main/java/org/apache/calcite/util/Bug.java
index b96b22022e..cbdc1980a4 100644
--- a/core/src/main/java/org/apache/calcite/util/Bug.java
+++ b/core/src/main/java/org/apache/calcite/util/Bug.java
@@ -185,13 +185,6 @@ public abstract class Bug {
* is fixed. */
public static final boolean CALCITE_6611_FIXED = false;
- /** Whether
- * <a
href="https://issues.apache.org/jira/browse/CALCITE-7494";>[CALCITE-7494]
- * Avatica conversion to string of TIMESTAMP WITH TIME ZONE does not include
- * time zone</a> is fixed.
- * Fix to be available with Avatica 1.29.0. */
- public static final boolean CALCITE_7494_FIXED = false;
-
/**
* Use this to flag temporary code.
*/
diff --git a/testkit/src/main/java/org/apache/calcite/test/QuidemTest.java
b/testkit/src/main/java/org/apache/calcite/test/QuidemTest.java
index 476bfcfcb6..e9d18930d4 100644
--- a/testkit/src/main/java/org/apache/calcite/test/QuidemTest.java
+++ b/testkit/src/main/java/org/apache/calcite/test/QuidemTest.java
@@ -171,8 +171,6 @@ protected boolean useTopDownGeneralDecorrelator() {
return Bug.CALCITE_1045_FIXED;
case "calcite1048":
return Bug.CALCITE_1048_FIXED;
- case "calcite7494":
- return Bug.CALCITE_7494_FIXED;
}
return null;
};
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 e584e59c37..7d9dd1946c 100644
--- a/testkit/src/main/java/org/apache/calcite/test/SqlOperatorTest.java
+++ b/testkit/src/main/java/org/apache/calcite/test/SqlOperatorTest.java
@@ -5949,26 +5949,24 @@ void testBitGetFunc(SqlOperatorFixture f, String
functionName) {
final SqlOperatorFixture f = fixture().withLibrary(SqlLibrary.POSTGRESQL)
.setFor(SqlLibraryOperators.TO_TIMESTAMP_PG);
- 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.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'.",
