kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Normalize time value not to be affected by summer time

Browse source 
Follow up of #33358 for SQLite3.
This commit is contained in:
Ryuta Kamizono 2018-07-25 09:42:36 +09:00
parent ec387c6dd9
commit c02f3578c1
3 changed files with 41 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb
View file

@ -17,6 +17,7 @@ module ActiveRecord
end
def quoted_time(value)
value = value.change(year: 2000, month: 1, day: 1)
quoted_date(value).sub(/\A\d\d\d\d-\d\d-\d\d /, "2000-01-01 ")
end

26
activerecord/test/cases/adapters/sqlite3/quoting_test.rb
View file

@ -62,4 +62,30 @@ class SQLite3QuotingTest < ActiveRecord::SQLite3TestCase
assert_equal "'2000-01-01 12:30:00.999999'", @conn.quote(type.serialize(value))
end
def test_quoted_time_dst_utc
with_env_tz "America/New_York" do
with_timezone_config default: :utc do
t = Time.new(2000, 7, 1, 0, 0, 0, "+04:30")
expected = t.change(year: 2000, month: 1, day: 1)
expected = expected.getutc.to_s(:db).sub(/\A\d\d\d\d-\d\d-\d\d /, "2000-01-01 ")
assert_equal expected, @conn.quoted_time(t)
end
end
end
def test_quoted_time_dst_local
with_env_tz "America/New_York" do
with_timezone_config default: :local do
t = Time.new(2000, 7, 1, 0, 0, 0, "+04:30")
expected = t.change(year: 2000, month: 1, day: 1)
expected = expected.getlocal.to_s(:db).sub(/\A\d\d\d\d-\d\d-\d\d /, "2000-01-01 ")
assert_equal expected, @conn.quoted_time(t)
end
end
end
end

24
activerecord/test/cases/quoting_test.rb
View file

@ -90,24 +90,28 @@ module ActiveRecord
end
def test_quoted_time_dst_utc
with_timezone_config default: :utc do
t = Time.new(2000, 7, 1, 0, 0, 0, "+04:30")
with_env_tz "America/New_York" do
with_timezone_config default: :utc do
t = Time.new(2000, 7, 1, 0, 0, 0, "+04:30")
expected = t.change(year: 2000, month: 1, day: 1)
expected = expected.getutc.to_s(:db).slice(11..-1)
expected = t.change(year: 2000, month: 1, day: 1)
expected = expected.getutc.to_s(:db).slice(11..-1)
assert_equal expected, @quoter.quoted_time(t)
assert_equal expected, @quoter.quoted_time(t)
end
end
end
def test_quoted_time_dst_local
with_timezone_config default: :local do
t = Time.new(2000, 7, 1, 0, 0, 0, "+04:30")
with_env_tz "America/New_York" do
with_timezone_config default: :local do
t = Time.new(2000, 7, 1, 0, 0, 0, "+04:30")
expected = t.change(year: 2000, month: 1, day: 1)
expected = expected.getlocal.to_s(:db).slice(11..-1)
expected = t.change(year: 2000, month: 1, day: 1)
expected = expected.getlocal.to_s(:db).slice(11..-1)
assert_equal expected, @quoter.quoted_time(t)
assert_equal expected, @quoter.quoted_time(t)
end
end
end