Merge branch '50-stable' into 51-stable

enebo · enebo · commit ced8b4c32c51 · 2019-01-09T10:05:15.000-06:00
diff --git a/test/rails/excludes/mysql2/DateTimePrecisionTest.rb b/test/rails/excludes/mysql2/DateTimePrecisionTest.rb
@@ -0,0 +1 @@
+exclude :test_datetime_precision_is_truncated_on_assignment, 'Intermittent test failures, double rounding problem?'
diff --git a/test/rails/excludes/mysql2/Mysql2ConnectionTest.rb b/test/rails/excludes/mysql2/Mysql2ConnectionTest.rb
@@ -2,3 +2,7 @@
 exclude :test_passing_flags_by_array_to_adapter, 'no support for passing flags: ... not supported by JDBC adapter'
 exclude :test_quote_after_disconnect, 'AR-JDBC does not rely on driver to do quoting - thus wont raise an error'
 exclude :test_mysql_connection_collation_is_configured, "Issue #884"
+
+if ActiveRecord::Base.connection.jdbc_connection(true).java_class.name.start_with?('org.mariadb.jdbc')
+  exclude :test_mysql_strict_mode_specified_default, 'MariaDB driver reports more options'
+end
diff --git a/test/rails/excludes/mysql2/UniquenessValidationTest.rb b/test/rails/excludes/mysql2/UniquenessValidationTest.rb
diff --git a/test/rails/excludes/postgresql/DateTimePrecisionTest.rb b/test/rails/excludes/postgresql/DateTimePrecisionTest.rb
@@ -0,0 +1 @@
+exclude :test_datetime_precision_is_truncated_on_assignment, 'Intermittent test failures, double rounding problem?'
diff --git a/test/rails/excludes/sqlite3/DateTimePrecisionTest.rb b/test/rails/excludes/sqlite3/DateTimePrecisionTest.rb
@@ -0,0 +1 @@
+exclude :test_datetime_precision_is_truncated_on_assignment, 'Intermittent test failures, double rounding problem?'

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+exclude :test_datetime_precision_is_truncated_on_assignment, 'Intermittent test failures, double rounding problem?'`