Use older mysql to avoid trilogy error, fix docker compose and instructions, mount code for easier development

Author: arielj

CONTRIBUTE.md

@@ -12,15 +12,28 @@ upstream:
 
 The gem uses Appraisal to configure different Gemfiles to test different Rails versions.
 
-- You can run all the databases through docker if needed with `docker compose up` (you can also have them running on your system, just comment out the ones you don't need from the `docker-compose.yml` file)
-- Copy `spec/support/sample.config.yml` to `spec/support/config.yml` and edit it
+### Run tests without Docker (or using Docker only for the databases)
+
+- You can run all the databases through docker if needed with `docker compose -f docker-compose.db.yml up` (you can also have them running on your system, just comment out the ones you don't need from the `docker-compose.db.yml` file)
+- Copy `spec/support/sample.config.yml` to `spec/support/config.yml` and edit it as needed
 - `BUNDLE_GEMFILE=gemfiles/rails_6.1.gemfile bundle install` (change `6.1` with any version from the `gemfiles` directory)
 - `BUNDLE_GEMFILE=gemfiles/rails_6.1.gemfile bundle exec rake`
 
 Note that if you don't have all the supported databases installed and running,
 some tests will fail.
 
-> Note that you can check the `.github/workflows/ci.yml` file for different combinations of Ruby and Rails that are expected to work
+> Check the `.github/workflows/ci.yml` file for different combinations of Ruby and Rails that are expected to work
+
+### Run tests with Docker
+
+- Open `docker-compose.yml` and configure the Ruby version and Gemfile file to use
+- Copy `spec/support/sample.docker.config.yml` to `spec/support/config.yml` (not this config file is specific for the Docker setup)
+- Run `docker compose up` to start the container, run the tests, and exit
+- Run `docker compose run ruby bash` to open `bash` inside the container for more control, run `rake` to run the tests
+
+> Note that the code is mounted inside the docker container, so changes in the container will reflect in the code. There's no need to re-build the container for code changes, but changing the Ruby version or Gemfile in the docker-compose.yml will require a container re-build with `docker compose build --no-cache`
+
+> Check the `.github/workflows/ci.yml` file for different combinations of Ruby and Rails that are expected to work
 
 ## 3. Prepare your contribution
 

Dockerfile

@@ -1,13 +1,16 @@
-FROM ruby:3.3
+ARG RUBY_VERSION=3.3
+FROM ruby:${RUBY_VERSION}
 
 # Set the working directory in the container
 WORKDIR /app
 
 # Copy the current directory contents into the container at /app
+# This is copied so we can bundle the application, but it's replaced
+# by a mounted volume with the current code when executed with docker compose
 COPY . /app
 
-# Copy the sample config to the actual config (performed at build time)
-RUN cp spec/support/sample.docker.config.yml spec/support/config.yml
+ARG BUNDLE_GEMFILE=Gemfile
+ENV BUNDLE_GEMFILE=${BUNDLE_GEMFILE}
 
 # Install any needed packages specified in Gemfile
 RUN bundle install

docker-compose.db.yml

@@ -0,0 +1,19 @@
+services:
+  postgres:
+    image: postgres:16 # specify the version needed for a given app
+    environment:
+      - POSTGRES_PASSWORD=postgres # this is required
+    ports:
+      - "127.0.0.1:5432:5432" # so we can use `localhost` as the host
+  mysql:
+    image: mysql:5.7
+    environment:
+      - MYSQL_ROOT_PASSWORD=mysql
+    ports:
+      - "127.0.0.1:3306:3306"
+  redis:
+    image: redis:6.2-alpine
+    restart: always
+    ports:
+      - "127.0.0.1:6379:6379"
+    command: redis-server --save 20 1 --loglevel warning

docker-compose.yml

@@ -3,26 +3,23 @@ services:
     image: postgres:16 # specify the version needed for a given app
     environment:
       - POSTGRES_PASSWORD=postgres # this is required
-    ports:
-      - "127.0.0.1:5432:5432" # so we can use `localhost` as the host
   mysql:
-    image: mysql:9.3
+    image: mysql:5.7
     environment:
       - MYSQL_ROOT_PASSWORD=mysql
-    ports:
-      - "127.0.0.1:3306:3306"
   redis:
     image: redis:6.2-alpine
     restart: always
-    ports:
-      - "127.0.0.1:6379:6379"
     command: redis-server --save 20 1 --loglevel warning
   ruby:
-    image: ruby:3.3 # Manually change this based on the desired Ruby version
-    working_dir: /app
-    build: .
-    environment:
-      BUNDLE_GEMFILE: gemfiles/rails_7.2.gemfile # Manually change this based on the desired Rails version
+    build:
+      context: .
+      args:
+        BUNDLE_GEMFILE: gemfiles/rails_7.2.gemfile # Manually change this based on the desired Rails version
+        RUBY_VERSION: 3.3 # Manually change this based on the desired Ruby version
+    volumes:
+      - ".:/app:delegated"
+    command: rake
     depends_on:
       - mysql
       - postgres

lib/database_cleaner/active_record/truncation.rb

@@ -21,7 +21,7 @@ def initialize(opts={})
       def clean
         connection.disable_referential_integrity do
           if pre_count? && connection.respond_to?(:pre_count_truncate_tables)
-            connection.pre_count_truncate_tables(tables_to_clean(connection), { truncate_option: @truncate_option })
+            connection.pre_count_truncate_tables(tables_to_clean(connection))
           else
             connection.truncate_tables(tables_to_clean(connection), { truncate_option: @truncate_option })
           end
@@ -109,8 +109,8 @@ def truncate_tables(tables, opts)
       end
 
       module AbstractMysqlAdapter
-        def pre_count_truncate_tables(tables, opts = {})
-          truncate_tables(pre_count_tables(tables), opts)
+        def pre_count_truncate_tables(tables)
+          truncate_tables(pre_count_tables(tables))
         end
 
         def pre_count_tables(tables)
@@ -157,8 +157,8 @@ def truncate_tables(tables, opts)
           tables.each { |t| truncate_table(t) }
         end
 
-        def pre_count_truncate_tables(tables, opts = {})
-          truncate_tables(pre_count_tables(tables), opts)
+        def pre_count_truncate_tables(tables)
+          truncate_tables(pre_count_tables(tables))
         end
 
         def pre_count_tables(tables)
@@ -200,8 +200,8 @@ def truncate_tables(table_names, opts)
           execute("TRUNCATE TABLE #{table_names.map{|name| quote_table_name(name)}.join(', ')} RESTART IDENTITY #{opts[:truncate_option]};")
         end
 
-        def pre_count_truncate_tables(tables, opts = {})
-          truncate_tables(pre_count_tables(tables), opts)
+        def pre_count_truncate_tables(tables)
+          truncate_tables(pre_count_tables(tables))
         end
 
         def pre_count_tables(tables)