aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2018-03-15 11:59:47 +0000
committerGitHub <noreply@github.com>2018-03-15 11:59:47 +0000
commit8fc2b519d601e9d39e611d82f53361bbfc28a132 (patch)
treeb30e4d2e9931cb1711c07f6d27807b4eb4c84873 /activerecord/lib
parent2d2da1861576a3900a295dc3950b447027f9ed9d (diff)
parent7c479cbf6211d7efadc0a9573cf82c05291f7ef1 (diff)
downloadrails-8fc2b519d601e9d39e611d82f53361bbfc28a132.tar.gz
rails-8fc2b519d601e9d39e611d82f53361bbfc28a132.tar.bz2
rails-8fc2b519d601e9d39e611d82f53361bbfc28a132.zip
Merge pull request #32220 from rails/fix-time-columns-on-sqlite3
Time column improvements
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/quoting.rb2
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
index 92e46ccf9f..aec5fa6ba1 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
@@ -130,7 +130,7 @@ module ActiveRecord
end
def quoted_time(value) # :nodoc:
- quoted_date(value).sub(/\A2000-01-01 /, "")
+ quoted_date(value).sub(/\A\d\d\d\d-\d\d-\d\d /, "")
end
def quoted_binary(value) # :nodoc:
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb b/activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb
index 8042dbfea2..70de96326c 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb
@@ -17,7 +17,7 @@ module ActiveRecord
end
def quoted_time(value)
- quoted_date(value)
+ quoted_date(value).sub(/\A\d\d\d\d-\d\d-\d\d /, "2000-01-01 ")
end
def quoted_binary(value)