Skip to content

Revert "work around illumos#16834 in test suite" #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iliana merged 1 commit into from
Feb 26, 2026
Merged

Revert "work around illumos#16834 in test suite" #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions pkg/sql/logictest/testdata/logic_test/timestamp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,15 +270,12 @@ true
subtest regression_django-cockroachdb_120

statement ok
SET TIME ZONE 'America/Halifax'
SET TIME ZONE 'America/Chicago'

query T
SELECT '1882-05-23T00:00:00-04:15'::timestamptz::text
SELECT '1882-05-23T00:00:00-05:51'::timestamptz::text
----
1882-05-23 00:00:36-04:14:24

statement ok
SET TIME ZONE 'America/Chicago'
1882-05-23 00:00:24-05:50:36

query B
SELECT '2011-03-13'::date = '2011-03-13'::timestamp
Expand Down
8 changes: 4 additions & 4 deletions pkg/sql/pgwire/testdata/pgtest/timezone
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,24 @@ ReadyForQuery
{"Type":"ReadyForQuery","TxStatus":"I"}

send
Query {"String": "SET TIME ZONE \"America/Halifax\""}
Query {"String": "SET TIME ZONE \"America/Chicago\""}
----

until
ReadyForQuery
----
{"Type":"ParameterStatus","Name":"TimeZone","Value":"America/Halifax"}
{"Type":"ParameterStatus","Name":"TimeZone","Value":"America/Chicago"}
{"Type":"CommandComplete","CommandTag":"SET"}
{"Type":"ReadyForQuery","TxStatus":"I"}

send
Query {"String": "SELECT '1882-05-23T00:00:00-04:15'::\"timestamptz\""}
Query {"String": "SELECT '1882-05-23T00:00:00-05:51'::\"timestamptz\""}
----

until ignore_data_type_sizes
ReadyForQuery
----
{"Type":"RowDescription","Fields":[{"Name":"timestamptz","TableOID":0,"TableAttributeNumber":0,"DataTypeOID":1184,"DataTypeSize":0,"TypeModifier":-1,"Format":0}]}
{"Type":"DataRow","Values":[{"text":"1882-05-23 00:00:36-04:14:24"}]}
{"Type":"DataRow","Values":[{"text":"1882-05-23 00:00:24-05:50:36"}]}
{"Type":"CommandComplete","CommandTag":"SELECT 1"}
{"Type":"ReadyForQuery","TxStatus":"I"}