Merge pull request #454 from gocardless/thom/fix_mysql_ci_image

Fix CI issues
gocardless · Feb 4, 2022 · 923b63f · 923b63f
2 parents 16207a9 + 20be31e
commit 923b63f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -58,7 +58,7 @@ references:
     - "main"
 
   mysql_versions: &mysql_versions
-    - "5.7.18"
+    - "5.7"
 
   psql_versions: &psql_versions
     - "9.6"
@@ -79,7 +79,7 @@ jobs:
           CIRCLE_TEST_REPORTS: /tmp/circle_artifacts/
           DATABASE_URL: mysql2://foobar:[email protected]/statesman_test
           DATABASE_DEPENDENCY_PORT: "3306"
-      - image: circleci/mysql:<< parameters.mysql_version >>
+      - image: cimg/mysql:<< parameters.mysql_version >>
         environment:
           MYSQL_ROOT_PASSWORD: password
           MYSQL_USER: foobar

diff --git a/lib/statesman/adapters/active_record.rb b/lib/statesman/adapters/active_record.rb
@@ -309,8 +309,11 @@ def updated_column_and_timestamp
       end
 
       def default_timezone
-        # Rails 7 deprecates ActiveRecord::Base.default_timezone in favour of ActiveRecord.default_timezone
-        return ::ActiveRecord.default_timezone if ::ActiveRecord.respond_to?(:default_timezone)
+        # Rails 7 deprecates ActiveRecord::Base.default_timezone
+        # in favour of ActiveRecord.default_timezone
+        if ::ActiveRecord.respond_to?(:default_timezone)
+          return ::ActiveRecord.default_timezone
+        end
 
         ::ActiveRecord::Base.default_timezone
       end