diff options
author | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-14 21:41:07 -0700 |
---|---|---|
committer | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-14 21:41:07 -0700 |
commit | a2de667b2eb97b387a9067277ab0829542f24841 (patch) | |
tree | 9b02bdbd9259b86b35685a4ac2f6d1cf77071b20 /activerecord | |
parent | 4769fc4b4d5af7a8e93cc497d744151086aa5034 (diff) | |
parent | 73af7945d534f866b2a11624be36d905fdc92b51 (diff) | |
download | rails-a2de667b2eb97b387a9067277ab0829542f24841.tar.gz rails-a2de667b2eb97b387a9067277ab0829542f24841.tar.bz2 rails-a2de667b2eb97b387a9067277ab0829542f24841.zip |
Merge pull request #24549 from kamipo/fix_quoted_time
Should keep quoting behaivor of a time column value in sqlite3 adapter
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb | 4 | ||||
-rw-r--r-- | activerecord/test/cases/adapters/sqlite3/quoting_test.rb | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb b/activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb index d3a91f73c8..d5a181d3e2 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb @@ -14,6 +14,10 @@ module ActiveRecord @quoted_column_names[name] ||= %Q("#{super.gsub('"', '""')}") end + def quoted_time(value) + quoted_date(value) + end + private def _quote(value) diff --git a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb index 87a892db37..f3ec2b98d3 100644 --- a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb +++ b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb @@ -8,9 +8,7 @@ module ActiveRecord class SQLite3Adapter class QuotingTest < ActiveRecord::SQLite3TestCase def setup - @conn = Base.sqlite3_connection :database => ':memory:', - :adapter => 'sqlite3', - :timeout => 100 + @conn = ActiveRecord::Base.connection end def test_type_cast_binary_encoding_without_logger @@ -89,6 +87,13 @@ module ActiveRecord assert_equal "'hello'", @conn.quote(type.serialize(value)) end + + def test_quoted_time_returns_date_qualified_time + value = ::Time.utc(2000, 1, 1, 12, 30, 0, 999999) + type = Type::Time.new + + assert_equal "'2000-01-01 12:30:00.999999'", @conn.quote(type.serialize(value)) + end end end end |