persistent_enum 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cde6573673d70f73eb38d09bd9e4f0fc445e7953f9cf63cb3f631afc2c2b3da
-  data.tar.gz: 2713d64c90a9e857120099c07a7cad9d51dc477f9f1c859086d1cd3d1ac2a0cb
+  metadata.gz: d11d2cd28eb40b76c5f0a286ba1f382342beaa62a216905357860c02e4078579
+  data.tar.gz: 031273743a7a2d2fa85c41c6bc0bd232e6741ac3ed96dc6cc70d2548fb5727fa
 SHA512:
-  metadata.gz: 6c45dd0b3fb7f72e9709f8972f0a7d03b247f542f169c6534680034dee043d1287f2c29a036da1a386bf9f5cce3418f2ff30a17f6da4d4454dc290602c5a5bd7
-  data.tar.gz: 0037fd38a29ae4da1368b0cb13d6da4ae826163dffc4b9c9c02870ee7bf66f897a533f586e73a34037e94603eba1bc015d87d2d5f95cafd062e16b26804c9c5a
+  metadata.gz: b1b9f31ed175df65e7cd60783c4e8892e1c7d776972dbae259581912b266a4648f5926ef0e67500d8cceaaeba603cce5b770151b91cd0a0cf849710f57e3415a
+  data.tar.gz: 2b1d79ba03dc20042189b6d76e785f7167b2345236b75a1ab59d66ec3c828cdba433d42d3bffbc4e6c0b3c5cb68f350510c26e63d727599df5a4f04e089b1b0f

data/.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 
 executors:
   ruby-sqlite: &ruby
-    parameters:
+    parameters: &ruby_params
       ruby-version:
         type: string
         default: "2.6"
@@ -22,26 +22,36 @@ executors:
           BUNDLE_GEMFILE: << parameters.gemfile >>
   ruby-pg:
     <<: *ruby
+    parameters:
+      <<: *ruby_params
+      pg-version:
+        type: string
+        default: "11"
     environment:
       TEST_DATABASE_ENVIRONMENT: postgresql
       PGHOST: 127.0.0.1
       PGUSER: eikaiwa
     docker:
       - *ruby_docker_ruby
-      - image: circleci/postgres:11-alpine
+      - image: circleci/postgres:<< parameters.pg-version >>-alpine
         environment:
           POSTGRES_USER: eikaiwa
           POSTGRES_DB: persistent_enum_test
           POSTGRES_PASSWORD: ""
   ruby-mysql:
     <<: *ruby
+    parameters:
+      <<: *ruby_params
+      mysql-version:
+        type: string
+        default: "5.6"
     environment:
       TEST_DATABASE_ENVIRONMENT: mysql2
       MYSQL_HOST: 127.0.0.1
       MYSQL_USER: root
     docker:
       - *ruby_docker_ruby
-      - image: tkuchiki/delayed-mysql
+      - image: circleci/mysql:<< parameters.mysql-version >>
         environment:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
           MYSQL_ROOT_PASSWORD: ''
@@ -50,12 +60,19 @@ executors:
 jobs:
   test:
     parameters:
-      ex:
-        type: executor
+      executor-name:
+        type: string
+      ruby-version:
+        type: string
+      gemfile:
+        type: string
       database-steps:
         type: steps
         default: []
-    executor: << parameters.ex >>
+    executor:
+      name: << parameters.executor-name >>
+      ruby-version: << parameters.ruby-version >>
+      gemfile: << parameters.gemfile >>
     parallelism: 1
     steps:
       - checkout
@@ -71,15 +88,15 @@ jobs:
 
       - restore_cache:
           keys:
-            - iknow_viewmodels-{{ checksum "/tmp/gem-lock" }}
-            - iknow_viewmodels-
+            - persistent_enum-<< parameters.ruby-version >>-{{ checksum "/tmp/gem-lock" }}
+            - persistent_enum-
 
       - run:
           name: Bundle Install
           command: bundle check || bundle install
 
       - save_cache:
-          key: iknow_viewmodels-{{ checksum "/tmp/gem-lock" }}
+          key: persistent_enum-<< parameters.ruby-version >>-{{ checksum "/tmp/gem-lock" }}
           paths:
             - vendor/bundle
 
@@ -114,45 +131,39 @@ workflows:
     jobs:
       - test:
           name: 'ruby 2.6 rails 5.2 sqlite'
-          ex:
-            name: ruby-sqlite
-            ruby-version: "2.6"
-            gemfile: gemfiles/rails_5_2.gemfile
+          executor-name: ruby-sqlite
+          ruby-version: "2.6"
+          gemfile: gemfiles/rails_5_2.gemfile
       - test:
           name: 'ruby 2.6 rails 6.0 sqlite'
-          ex:
-            name: ruby-sqlite
-            ruby-version: "2.6"
-            gemfile: gemfiles/rails_6_0_beta.gemfile
+          executor-name: ruby-sqlite
+          ruby-version: "2.6"
+          gemfile: gemfiles/rails_6_0_beta.gemfile
       - test:
           name: 'ruby 2.6 rails 5.2 pg'
-          ex:
-            name: ruby-pg
-            ruby-version: "2.6"
-            gemfile: gemfiles/rails_5_2.gemfile
+          executor-name: ruby-pg
+          ruby-version: "2.6"
+          gemfile: gemfiles/rails_5_2.gemfile
           database-steps: &pg_wait
             - run: dockerize -wait tcp://localhost:5432 -timeout 1m
       - test:
           name: 'ruby 2.6 rails 6.0 pg'
-          ex:
-            name: ruby-pg
-            ruby-version: "2.6"
-            gemfile: gemfiles/rails_6_0_beta.gemfile
+          executor-name: ruby-pg
+          ruby-version: "2.6"
+          gemfile: gemfiles/rails_6_0_beta.gemfile
           database-steps: *pg_wait
       - test:
           name: 'ruby 2.6 rails 5.2 mysql'
-          ex:
-            name: ruby-mysql
-            ruby-version: "2.6"
-            gemfile: gemfiles/rails_5_2.gemfile
+          executor-name: ruby-mysql
+          ruby-version: "2.6"
+          gemfile: gemfiles/rails_5_2.gemfile
           database-steps: &mysql_wait
             - run: dockerize -wait tcp://localhost:3306 -timeout 1m
       - test:
           name: 'ruby 2.6 rails 6.0 mysql'
-          ex:
-            name: ruby-mysql
-            ruby-version: "2.6"
-            gemfile: gemfiles/rails_6_0_beta.gemfile
+          executor-name: ruby-mysql
+          ruby-version: "2.6"
+          gemfile: gemfiles/rails_6_0_beta.gemfile
           database-steps: *mysql_wait
       - publish:
           filters:

data/lib/persistent_enum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PersistentEnum
-  VERSION = '1.2.4'
+  VERSION = '1.2.5'
 end

data/lib/persistent_enum.rb

@@ -265,10 +265,12 @@ module PersistentEnum
         when 'PostgreSQL'
           model.import!(rows, on_duplicate_key_update: { conflict_target: [name_attr], columns: upsert_columns })
         when 'Mysql2'
+          # Even for identical rows in the same order, a INSERT .. ON DUPLICATE
+          # KEY UPDATE or INSERT IGNORE can deadlock with itself. Obtain write
+          # locks in advance.
+          model.lock('FOR UPDATE').order(:id).pluck(:id)
+
           if upsert_columns.present?
-            # Even for identical rows in the same order, a INSERT .. ON DUPLICATE
-            # KEY UPDATE can deadlock with itself. Obtain write locks in advance.
-            model.lock('FOR UPDATE').order(:id).pluck(:id)
             model.import!(rows, on_duplicate_key_update: upsert_columns)
           else
             model.import!(rows, on_duplicate_key_ignore: true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: persistent_enum
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - iKnow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Database-backed enums for Rails