seed-snapshot 0.4.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8512d5e57f07a3cfb04a207a8b56cd6a05b850fae598c24d3e263ff6566de613
-  data.tar.gz: 3385c0eedecfa2451fefdb088b3ff98a5fbe1f41254baaf387197c019bc7155c
+  metadata.gz: 0c087a187bb04a6153e749da89995c78fecc2b4882484142ebb45f59aace24e0
+  data.tar.gz: 187f259b3f887ca6f37ffdea9f8a5c87878a12f482235248656ce6e925c3cd07
 SHA512:
-  metadata.gz: 1725747fea9e450d1ad025cf58b600105c50afd02e1c1509da33448b53d7738a16e1cdffa87ad33824392d5215fb3cabfa7eb1b870ab1b945b580e77893724e7
-  data.tar.gz: a25b69dd1e508c9b507ffce260a26fea3a276fb9fc4d483c4e561f5ecd929800ea60a9aad83045cf317dff1c0be4173a9dae614a1abc6ba4369632df5d79d381
+  metadata.gz: b2608a4f75c7e9820a19852e3fc2a8faf8ebc9ca2d4ae18762d385e124c1b38069640b9e007e1dd0f4506e0fd7ec66d55d9ab542a768d50c79f4d72bc7806e02
+  data.tar.gz: 34f9e31f6d64e6c1ad59d19521adba47a1ce1bf9f125ff6031bd1e41ab4406320b364c72f87da47b552a4a87aed6562dec95320e346c2e846c5322b91d30f53f

data/.github/workflows/main.yml

@@ -0,0 +1,53 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - '**.md'
+      - '**.txt'
+  pull_request:
+    paths-ignore:
+      - '**.md'
+      - '**.txt'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE: 'activerecord_unittest'
+        ports:
+          - 3306:3306
+        options: --health-cmd "mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 10
+ 
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7']
+        gemfile: ['Gemfile', 'gemfiles/ar_6_1.gemfile']
+
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+
+    - name: Install dependencies
+      run: |
+        gem install bundler
+        bundle install --jobs 3 --retry 3
+
+    - name: Run tests
+      run: bundle exec rake

data/.gitignore

@@ -12,4 +12,3 @@
 /vendor
 
 debug.log
-test/config.yml

data/Gemfile

@@ -1,6 +1,11 @@
 source 'https://rubygems.org'
 
-gem "activerecord", "~> #{ENV['AR_VERSION']}" if ENV['AR_VERSION']
+gem 'bundler'
+gem 'rake'
+gem 'pry'
+gem 'minitest'
+gem 'erubis'
+gem 'mysql2', '>= 0.4.4', '< 0.6.0'
 
 # Specify your gem's dependencies in seed-snapshot.gemspec
 gemspec

data/gemfiles/ar_6_1.gemfile

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem 'bundler'
+gem 'rake'
+gem 'pry'
+gem 'minitest'
+gem 'erubis'
+gem 'mysql2', '>= 0.4.4', '< 0.6.0'
+gem 'activerecord', '~> 6.1.0'

data/lib/seed/configuration.rb

@@ -16,6 +16,10 @@ module Seed
       @schema_version ||= Digest::SHA1.hexdigest(get_all_versions.sort.join)
     end
 
+    def client_version
+      @client_version ||= ActiveRecord::Base.connection.raw_connection.info[:version]
+    end
+
     def database_options
       @options ||= ActiveRecord::Base.connection.raw_connection.query_options
     end

data/lib/seed/mysql.rb

@@ -1,8 +1,16 @@
 module Seed
   class Mysql
-    def self.dump(file_path, username:, password:, host:, port:, database:, tables:, ignore_tables:)
+    def self.dump(file_path, username:, password:, host:, port:, database:, tables:, ignore_tables:, client_version:)
       host = 'localhost' unless host
-      cmd = "MYSQL_PWD=#{password} mysqldump -u #{username} -h #{host} #{database} -t #{allow_tables_option(tables)} #{ignore_tables_option(ignore_tables)} > #{file_path}"
+
+      additional_options =
+        if client_version.match?(/\A8/)
+          '--skip-column-statistics'
+        else
+          ''
+        end
+
+      cmd = "MYSQL_PWD=#{password} mysqldump -u #{username} -h #{host} #{database} -t #{allow_tables_option(tables)} #{ignore_tables_option(ignore_tables)} --no-tablespaces #{additional_options} > #{file_path}"
       system cmd
     end
 

data/lib/seed/snapshot.rb

@@ -14,9 +14,10 @@ module Seed
 
       Mysql.dump(
         @configuration.current_version_path,
-        options.merge({
+        **options.merge({
           tables: tables(classes),
-          ignore_tables: ignore_tables(ignore_classes)
+          ignore_tables: ignore_tables(ignore_classes),
+          client_version: @configuration.client_version
         })
       )
     end
@@ -31,7 +32,7 @@ module Seed
 
       Mysql.restore(
         @configuration.current_version_path,
-        options
+        **options
       )
     end
 

data/lib/seed_snapshot/version.rb

@@ -1,3 +1,3 @@
 module SeedSnapshot
-  VERSION = "0.4.0"
+  VERSION = "0.5.2"
 end

data/seed-snapshot.gemspec

@@ -17,11 +17,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'erubis'
-  spec.add_development_dependency 'mysql2', '>= 0.4.4', '< 0.6.0'
   spec.add_runtime_dependency 'activerecord', '>= 4.2'
 end

metadata

@@ -1,105 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: seed-snapshot
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.2
 platform: ruby
 authors:
 - yo_waka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2022-07-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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: rake
-  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: pry
-  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: minitest
-  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: erubis
-  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.4.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -121,14 +31,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/ar_6_1.gemfile
 - lib/seed-snapshot.rb
 - lib/seed/configuration.rb
 - lib/seed/manifest.rb
@@ -156,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Easy dump/restore tool for ActiveRecord.

data/.travis.yml

@@ -1,20 +0,0 @@
-language: ruby
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-services:
-  - mysql
-env:
-  - "AR_VERSION=4.2.8"
-  - "AR_VERSION=4.2.9"
-  - "AR_VERSION=5.0.4"
-  - "AR_VERSION=5.1.3"
-  - "AR_VERSION=5.2.3"
-sudo: false
-cache: bundler
-branches:
-  only:
-    - master
-before_install:
-  - mysql -e "create database activerecord_unittest;"