From ad712ddb1dba4189c7553f45f22f891f164a2762 Mon Sep 17 00:00:00 2001 From: Jan Provaznik Date: Mon, 13 Aug 2018 12:15:41 +0200 Subject: Disable ONLY_FULL_GROUP_BY mode for mysql * disables ONLY_FULL_GROUP_BY option which is enabled by default in rails 5 * reverts 'uniq' workaround which was necessary only when this option was enabled --- lib/mysql_zero_date.rb | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 lib/mysql_zero_date.rb (limited to 'lib/mysql_zero_date.rb') diff --git a/lib/mysql_zero_date.rb b/lib/mysql_zero_date.rb deleted file mode 100644 index 64634f789da..00000000000 --- a/lib/mysql_zero_date.rb +++ /dev/null @@ -1,18 +0,0 @@ -# Disable NO_ZERO_DATE mode for mysql in rails 5. -# We use zero date as a default value -# (config/initializers/active_record_mysql_timestamp.rb), in -# Rails 5 using zero date fails by default (https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/75450216) -# and NO_ZERO_DATE has to be explicitly disabled. Disabling strict mode -# is not sufficient. - -require 'active_record/connection_adapters/abstract_mysql_adapter' - -module MysqlZeroDate - def configure_connection - super - - @connection.query "SET @@SESSION.sql_mode = REPLACE(@@SESSION.sql_mode, 'NO_ZERO_DATE', '');" # rubocop:disable Gitlab/ModuleWithInstanceVariables - end -end - -ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.prepend(MysqlZeroDate) if Gitlab.rails5? -- cgit v1.2.1