aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2015-10-08 08:06:47 -0600
committerSean Griffin <sean@seantheprogrammer.com>2015-10-08 08:06:47 -0600
commit4516bb93e913a24949345ed5a7c319f3829eaa82 (patch)
tree2653a0e92d14eb88ad07e4cb6b8b4a17e79aa037
parent8a6cfbf3ac9dfddef00a527c35b16baf68311ad7 (diff)
parent94d2499156a020a1aee9fedd737975bcaef1b127 (diff)
downloadrails-4516bb93e913a24949345ed5a7c319f3829eaa82.tar.gz
rails-4516bb93e913a24949345ed5a7c319f3829eaa82.tar.bz2
rails-4516bb93e913a24949345ed5a7c319f3829eaa82.zip
Merge pull request #21913 from kamipo/fix_subsecond_precision_supported_version
Fix subsecond precision supported version
-rw-r--r--activerecord/test/cases/helper.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 8773986882..89bd3f888e 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -47,9 +47,7 @@ def in_memory_db?
end
def subsecond_precision_supported?
- !current_adapter?(:MysqlAdapter, :Mysql2Adapter) ||
- (ActiveRecord::Base.connection.send(:version) >= '5.6.0' &&
- ActiveRecord::Base.connection.send(:version) < '5.7.0')
+ !current_adapter?(:MysqlAdapter, :Mysql2Adapter) || ActiveRecord::Base.connection.send(:version) >= '5.6.4'
end
def mysql_enforcing_gtid_consistency?