aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorAndrew White <andrew.white@unboxed.co>2018-03-11 18:30:19 +0000
committerAndrew White <andrew.white@unboxed.co>2018-03-11 18:30:19 +0000
commit7c479cbf6211d7efadc0a9573cf82c05291f7ef1 (patch)
tree01b4fed3ccf05af042af1af1f91f71730ec55a5e /activerecord/lib/active_record
parent3f95054f1c5ffe9e9b3bccdabc1ab1a7a4beb24a (diff)
downloadrails-7c479cbf6211d7efadc0a9573cf82c05291f7ef1.tar.gz
rails-7c479cbf6211d7efadc0a9573cf82c05291f7ef1.tar.bz2
rails-7c479cbf6211d7efadc0a9573cf82c05291f7ef1.zip
Ensure that leading date is stripped by quoted_time
In #24542, quoted_time was introduced to strip the leading date component for time columns because it was having a significant effect in mariadb. However, it assumed that the date component was always 2000-01-01 which isn't the case, especially if the source wasn't another time column.
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/quoting.rb2
1 files changed, 1 insertions, 1 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: