Skip to content

Commit 0960c04

Browse files
yahondaclaude
andcommitted
Fix ActiveRecord 8.0 default_timezone API and add debug-frozen-string-literal
ActiveRecord 8.0 removed ActiveRecord::Base.default_timezone= in favor of ActiveRecord.default_timezone. Update both the library code and spec. Also add --debug-frozen-string-literal to help identify frozen string literal warnings. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 9c87685 commit 0960c04

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ jobs:
8484
bundle install --jobs 4 --retry 3
8585
- name: Run RSpec
8686
run: |
87-
RUBYOPT=-w bundle exec rspec
87+
RUBYOPT="-w --debug-frozen-string-literal" bundle exec rspec

.github/workflows/test_11g.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,4 @@ jobs:
8585
bundle install --jobs 4 --retry 3
8686
- name: Run RSpec
8787
run: |
88-
RUBYOPT=-w bundle exec rspec
88+
RUBYOPT="-w --debug-frozen-string-literal" bundle exec rspec

lib/plsql/schema.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ def default_timezone
9999
@original_schema.default_timezone
100100
else
101101
@default_timezone ||
102-
# Use ActiveRecord class default_timezone when ActiveRecord connection is used
103-
(@connection && (ar_class = @connection.activerecord_class) && ar_class.default_timezone) ||
102+
# Use ActiveRecord default_timezone when ActiveRecord connection is used
103+
(@connection && @connection.activerecord_class && ActiveRecord.default_timezone) ||
104104
# default to local timezone
105105
:local
106106
end

spec/plsql/schema_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,8 @@ class TestModel < TestBaseModel
209209
expect(plsql.schema_name).to eq("HR")
210210
end
211211

212-
it "should use ActiveRecord::Base.default_timezone as default" do
213-
ActiveRecord::Base.default_timezone = :utc
212+
it "should use ActiveRecord.default_timezone as default" do
213+
ActiveRecord.default_timezone = :utc
214214
expect(plsql.default_timezone).to eq(:utc)
215215
end
216216

0 commit comments

Comments
 (0)