Skip to content

A platform for community discussion. Free, open, simple.

FIX: Canonicalize cakeday timezones for PostgreSQL

Alan Guo Xiang Tanf4547032cbd8
diff --git a/plugins/discourse-cakeday/app/controllers/discourse_cakeday/cakeday_controller.rb b/plugins/discourse-cakeday/app/controllers/discourse_cakeday/cakeday_controller.rb
index 8816acf5bd5..0bd716e4221 100644
--- a/plugins/discourse-cakeday/app/controllers/discourse_cakeday/cakeday_controller.rb
+++ b/plugins/discourse-cakeday/app/controllers/discourse_cakeday/cakeday_controller.rb
@@ -37,7 +37,7 @@ module DiscourseCakeday
end.to_date
if apply_timezone && @timezone.present? && @timezone != "UTC"
- if (iana_timezone = ActiveSupport::TimeZone[@timezone]&.tzinfo&.identifier)
+ if (iana_timezone = ActiveSupport::TimeZone[@timezone]&.tzinfo&.canonical_identifier)
quoted_timezone = ActiveRecord::Base.connection.quote(iana_timezone)
column_sql = "#{column_sql} AT TIME ZONE 'UTC' AT TIME ZONE #{quoted_timezone}"
end
diff --git a/plugins/discourse-cakeday/spec/integration/cakeday_spec.rb b/plugins/discourse-cakeday/spec/integration/cakeday_spec.rb
index 4903b481078..ffed46605c8 100644
--- a/plugins/discourse-cakeday/spec/integration/cakeday_spec.rb
+++ b/plugins/discourse-cakeday/spec/integration/cakeday_spec.rb
@@ -71,8 +71,8 @@ RSpec.describe "Anniversaries and Birthdays" do
end
it "accounts for the current user's timezone" do
- # Asia/Calcutta is +5.5 hours from UTC
- current_user.user_option.update!(timezone: "Asia/Calcutta")
+ # Asia/Kolkata is +5.5 hours from UTC
+ current_user.user_option.update!(timezone: "Asia/Kolkata")
freeze_time(time) do
created_at = time - 1.year