gizzard 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88a877829e6aca4260c1d12ad9bb00ed8ea7f151da522788059ee05afc09201a
-  data.tar.gz: 2375d635f679a7276211a30864f0e07d12080072dce489c05a5968dc62bdba3c
+  metadata.gz: 3362e107fdc7cd0736d4379fb494c997227ab1a8c5e17185cc24b68aee792a5d
+  data.tar.gz: eb69873cc6a1904f038f7706c14a11182082fa40f01b711b10ade03fdab2f437
 SHA512:
-  metadata.gz: f10dbad52661dd6543b609f4855b2a034e866c96476ebb463a236108ef9bfdd65c2f83c5b239c92d7f3b2cc376fe51d75df4972c95a2429bf5665a82f393e89b
-  data.tar.gz: 658122a292e333b77a2926d96445184a1067589adf1577a00f4a6665b0ccb3204df56fd7b721ef9d7f19f32a6962baad6ce870b11a96dce3d2062ae77fe40751
+  metadata.gz: ec1938dabee7507a844f4e9bba151a638858d9ef16759c6be37159621be97770109ae2ea4881c0bbeeaf44dab36d4dfd6ac5cb1af4b79a17ec19d1cd80744056
+  data.tar.gz: 73cb4bba7160084998dcea8492ffd4c56d44efde5cce81c80cac9324d84cd3f3d1e6cb10086ac41748c49a379369934a03ef72c85665f204ec5e7e3f6d09a33b

data/.github/workflows/main.yml

@@ -0,0 +1,87 @@
+name: Ruby
+
+on:
+  push:
+    branches:
+      - main
+
+  pull_request:
+    branches:
+      - main
+
+env:
+  RAILS_ENV: test
+  DB_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }}
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+      matrix:
+        ruby:
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+        activerecord:
+          - '5.2'
+          - '6.0'
+          - '6.1'
+          - '7.0'
+        exclude: # https://github.com/sue445/activerecord-compatible_legacy_migration/blob/master/.github/workflows/test.yml
+          - ruby: '2.6'
+            activerecord: '7.0'
+          - ruby: '3.0'
+            activerecord: '5.2'
+          - ruby: '3.1'
+            activerecord: '5.2'
+    services:
+      mysql:
+        image: mysql:5.7
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_ROOT_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }}
+          MYSQL_DATABASE: ${{ env.DB_NAME }}
+        options: >-
+          --health-cmd "mysqladmin ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    env:
+      BUNDLE_GEMFILE: gemfiles/activerecord${{ matrix.activerecord }}.gemfile
+      DB_HOST: 127.0.0.1
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: set MySQL sql_mode
+        run: |
+          mysql --ssl-mode=DISABLE --protocol=tcp --host 127.0.0.1 --user=root --password=${{ env.DB_PASSWORD }} mysql <<SQL
+          SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION';
+          SET GLOBAL character_set_server = 'utf8mb4';
+          SET GLOBAL innodb_file_per_table = 1;
+          SET GLOBAL innodb_large_prefix = ON;
+          SQL
+
+      - name: set ENV
+        run: |
+          echo "DB_PORT=${{ job.services.mysql.ports[3306] }}" >> $GITHUB_ENV
+
+      - name: Setup DB
+        run: |
+          ./scripts/setup.sh
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+
+      - name: Run tests
+        run: bundle exec rspec
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}

data/.github/workflows/release.yml

@@ -0,0 +1,33 @@
+name: Release gem
+
+on:
+  workflow_dispatch:
+    inputs:
+      rubygems-otp-code:
+        description: RubyGems OTP code
+        required: true
+
+permissions:
+  contents: write
+
+jobs:
+  release-gem:
+    runs-on: ubuntu-latest
+    env:
+      GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
+      GEM_HOST_OTP_CODE: ${{ github.event.inputs.rubygems-otp-code }}
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0 # bundle exec rake release で git tag を見るため、tagをfetchするようにしている
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.1.1
+      - name: Bundle install
+        run: bundle install
+      - name: Setup git config # bundle exec rake release でgit tagが打たれていない場合、タグを打ってpushしてくれるため用意している
+        run: |
+          git config --global user.email "taka0125@gmail.com"
+          git config --global user.name "Takahiro Ooishi"
+      - name: Release gem
+        run: bundle exec rake release

data/.gitignore

@@ -12,3 +12,5 @@
 
 vendor/
 Gemfile.lock
+
+gemfiles/*.gemfile.lock

data/Appraisals

@@ -0,0 +1,17 @@
+appraise 'activerecord5.2' do
+  gem 'activerecord', '~> 5.2'
+end
+
+appraise 'activerecord6.0' do
+  gem 'activerecord', '~> 6.0'
+end
+
+appraise 'activerecord6.1' do
+  gem 'activerecord', '~> 6.1'
+end
+
+if RUBY_VERSION >= '2.7.0'
+  appraise 'activerecord7.0' do
+    gem 'activerecord', '~> 7.0'
+  end
+end

data/README.md

@@ -1,5 +1,7 @@
 # Gizzard
 
+[![Build Status](https://github.com/taka0125/gizzard/workflows/Ruby/badge.svg?branch=main)](https://github.com/taka0125/gizzard/actions)
+
 Often use snippet for ActiveRecord.
 
 ## Installation
@@ -31,6 +33,15 @@ class ApplicationRecord < ActiveRecord::Base
 end
 ```
 
+## Run Test
+
+```
+$ bundle install
+$ docker-compose up -d
+$ ./scripts/setup.sh
+$ bundle exec rspec
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/docker-compose.yml

@@ -0,0 +1,25 @@
+version: '3.9'
+
+x-mysql: &mysql
+  image: mysql:5.7
+  container_name: gizzard_mysql57
+  environment:
+    MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-5y8m2jzTamDS6M85ateGrA6pihhyCm}
+  platform: linux/x86_64
+  ports:
+    - 127.0.0.1:${DB_PORT:-33306}:3306
+  volumes:
+    - mysql:/var/lib/mysql
+  command: >
+    mysqld 
+      --sql-mode=NO_ENGINE_SUBSTITUTION
+      --character-set-server=utf8mb4
+      --innodb-file-per-table=1
+      --innodb-large-prefix
+
+services:
+  mysql:
+    <<: *mysql
+
+volumes:
+  mysql:

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/activerecord5.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.2"
+
+gemspec path: "../"

data/gemfiles/activerecord6.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0"
+
+gemspec path: "../"

data/gemfiles/activerecord6.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.1"
+
+gemspec path: "../"

data/gemfiles/activerecord7.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.0"
+
+gemspec path: "../"

data/gizzard.gemspec

@@ -25,6 +25,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activerecord", ">= 5.2"
   spec.add_dependency "activesupport", ">= 5.2"
 
+  spec.add_development_dependency "ridgepole"
+  spec.add_development_dependency "database_cleaner-active_record"
+  spec.add_development_dependency "mysql2"
+  spec.add_development_dependency "psych", "~> 3.1"
+  spec.add_development_dependency "standalone_activerecord_boot_loader"
+  spec.add_development_dependency "appraisal"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/gizzard/base.rb

@@ -3,6 +3,14 @@ module Gizzard
     extend ActiveSupport::Concern
 
     class_methods do
+      def preload_associations(records:, associations:, scope: nil)
+        if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new(7)
+          ActiveRecord::Associations::Preloader.new(records: records, associations: associations, scope: scope).call
+        else
+          ActiveRecord::Associations::Preloader.new.preload(records, associations, scope)
+        end
+      end
+
       def delete_all_by_id(batch_size: 1000)
         ids = pluck(:id)
         ids.sort!

data/lib/gizzard/mysql.rb

@@ -78,7 +78,7 @@ module Gizzard
 
         c = connection
         joins <<-SQL
-        #{join} #{c.quote_table_name(join_table_name)} #{index_hint} (#{Array(indexes).join(', ')}) ON #{c.quote_table_name(table_name)}.#{c.quote_column_name(relation.association_primary_key)} = #{c.quote_table_name(join_table_name)}.#{c.quote_column_name(relation.foreign_key)}
+        #{join} #{c.quote_table_name(join_table_name)} #{index_hint}(#{Array(indexes).join(', ')}) ON #{c.quote_table_name(table_name)}.#{c.quote_column_name(relation.association_primary_key)} = #{c.quote_table_name(join_table_name)}.#{c.quote_column_name(relation.foreign_key)}
         SQL
       end
     end

data/lib/gizzard/version.rb

@@ -1,3 +1,3 @@
 module Gizzard
-  VERSION = "0.6.0"
+  VERSION = "0.7.1"
 end

data/scripts/setup.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+set -ex
+
+CURRENT=$(cd $(dirname $0);pwd)
+DOCKER_MYSQL_PORT=$(docker port gizzard_mysql57 3306 2>/dev/null | cut -f 2 -d ':')
+DOCKER_MYSQL_PORT=${DOCKER_MYSQL_PORT:-3306}
+
+export DB_HOST=${DB_HOST:-127.0.0.1}
+export DB_PORT=${DB_PORT:-${DOCKER_MYSQL_PORT}}
+export DB_NAME=${DB_NAME:-gizzard_test}
+export DB_USER=${DB_USER:-root}
+export DB_PASSWORD=${DB_PASSWORD:-5y8m2jzTamDS6M85ateGrA6pihhyCm}
+
+mysql \
+  -u ${DB_USER} \
+  -h ${DB_HOST} \
+  -p${DB_PASSWORD} \
+  --port ${DB_PORT} \
+  -e "CREATE DATABASE IF NOT EXISTS ${DB_NAME}"
+
+bundle exec ridgepole \
+  -c ${CURRENT}/../spec/dummy/config/database.yml \
+  --apply \
+  -f ${CURRENT}/../spec/dummy/db/Schemafile \
+  -E test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gizzard
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Takahiro Ooishi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-25 00:00:00.000000000 Z
+date: 2022-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,6 +38,90 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: ridgepole
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner-active_record
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: standalone_activerecord_boot_loader
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,20 +171,30 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- docker-compose.yml
+- gemfiles/.bundle/config
+- gemfiles/activerecord5.2.gemfile
+- gemfiles/activerecord6.0.gemfile
+- gemfiles/activerecord6.1.gemfile
+- gemfiles/activerecord7.0.gemfile
 - gizzard.gemspec
 - lib/gizzard.rb
 - lib/gizzard/base.rb
 - lib/gizzard/mysql.rb
 - lib/gizzard/version.rb
+- scripts/setup.sh
 homepage: https://github.com/taka0125/gizzard
 licenses: []
 metadata: {}
@@ -119,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Often use snippet for ActiveRecord.