statesman 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5063951e126e3898569d97511ea5c89149122c3e
-  data.tar.gz: 888fcdc8b6bfbde03dbc4471fa3d84f58fd0871e
+SHA256:
+  metadata.gz: 4fb61c0976e4be7109c74119ce4a04bec415b463295a2a72adddedde288012bc
+  data.tar.gz: 895b55c0827be27cccde416b3c71cc375f2e2f0c7fa847ef858f40e58ddfbf4b
 SHA512:
-  metadata.gz: c4f1b64670d9b94c53f65ef3ed7182be77388c732536906d7066db8e0970016ad1e0cec26148d62b5cd32719e446a253033da3b1e8dd5c0c5e813834715e032f
-  data.tar.gz: 8c5ab391235a0f4b073fee60eeea93c4752e9f5a2d71a6b05ba955cebfd5bae61921bf87ac9769a967db05439cd907e5de6be1fe5f8d5a45a80fc4588b722d9a
+  metadata.gz: 3a12259539822ebb79e79a76f47275636da60d799b28b8c436cd9ddfdcc1e8d459897867816832fe524263b1f5c536db78e3617609e77054d43d872c6286a652
+  data.tar.gz: a1963915c8231d6c8ed037733a652e581f1efcf6d8ce76e535b8f50fa81e8a288a3723bb2974a2178cd11b2b0c6502fe6b49b216b2c9f82e1846cbdfb1cc6ada

data/.circleci/config.yml

@@ -138,6 +138,78 @@ jobs:
           - POSTGRES_USER=postgres
           - POSTGRES_DB=statesman_test
     steps: *steps
+  build-ruby262-rails-600-mongo:
+    docker:
+      - image: circleci/ruby:2.6.2-node
+        environment:
+          - RAILS_VERSION=6.0.0.beta3
+          - DATABASE_DEPENDENCY_PORT=27017
+      - image: circleci/mongo:3
+    steps: *steps
+  build-ruby262-rails-600-mysql:
+    docker:
+      - image: circleci/ruby:2.6.2-node
+        environment:
+          - RAILS_VERSION=6.0.0.beta3
+          - DATABASE_URL=mysql2://root@127.0.0.1/statesman_test
+          - EXCLUDE_MONGOID=true
+          - DATABASE_DEPENDENCY_PORT=3306
+      - image: circleci/mysql:5.7.18
+        environment:
+          - MYSQL_ALLOW_EMPTY_PASSWORD=true
+          - MYSQL_USER=root
+          - MYSQL_PASSWORD=
+          - MYSQL_DATABASE=statesman_test
+    steps: *steps
+  build-ruby262-rails-600-postgres:
+    docker:
+      - image: circleci/ruby:2.6.2-node
+        environment:
+          - RAILS_VERSION=6.0.0.beta3
+          - DATABASE_URL=postgres://postgres@localhost/statesman_test
+          - EXCLUDE_MONGOID=true
+          - DATABASE_DEPENDENCY_PORT=5432
+      - image: circleci/postgres:9.6
+        environment:
+          - POSTGRES_USER=postgres
+          - POSTGRES_DB=statesman_test
+    steps: *steps
+  build-ruby241-rails-523-mongo:
+    docker:
+      - image: circleci/ruby:2.4.1-node
+        environment:
+          - RAILS_VERSION=5.2.3
+          - DATABASE_DEPENDENCY_PORT=27017
+      - image: circleci/mongo:3
+    steps: *steps
+  build-ruby241-rails-523-mysql:
+    docker:
+      - image: circleci/ruby:2.4.1-node
+        environment:
+          - RAILS_VERSION=5.2.3
+          - DATABASE_URL=mysql2://root@127.0.0.1/statesman_test
+          - EXCLUDE_MONGOID=true
+          - DATABASE_DEPENDENCY_PORT=3306
+      - image: circleci/mysql:5.7.18
+        environment:
+          - MYSQL_ALLOW_EMPTY_PASSWORD=true
+          - MYSQL_USER=root
+          - MYSQL_PASSWORD=
+          - MYSQL_DATABASE=statesman_test
+    steps: *steps
+  build-ruby241-rails-523-postgres:
+    docker:
+      - image: circleci/ruby:2.4.1-node
+        environment:
+          - RAILS_VERSION=5.2.3
+          - DATABASE_URL=postgres://postgres@localhost/statesman_test
+          - EXCLUDE_MONGOID=true
+          - DATABASE_DEPENDENCY_PORT=5432
+      - image: circleci/postgres:9.6
+        environment:
+          - POSTGRES_USER=postgres
+          - POSTGRES_DB=statesman_test
+    steps: *steps
   build-ruby233-rails-429-mongo:
     docker:
       - image: circleci/ruby:2.3.3-node
@@ -368,6 +440,12 @@ workflows:
       - build-ruby241-rails-513-mongo
       - build-ruby241-rails-513-mysql
       - build-ruby241-rails-513-postgres
+      - build-ruby241-rails-523-mongo
+      - build-ruby241-rails-523-mysql
+      - build-ruby241-rails-523-postgres
+      - build-ruby262-rails-600-mongo
+      - build-ruby262-rails-600-mysql
+      - build-ruby262-rails-600-postgres
       - build-ruby233-rails-429-mongo
       - build-ruby233-rails-429-mysql
       - build-ruby233-rails-429-postgres

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v4.1.0, 10 April 2019
+
+- Add better support for mysql (and others) in `transition_conflict_error?` [@greysteil](https://github.com/greysteil) (https://github.com/gocardless/statesman/pull/342)
+
 ## v4.0.0, 22 February 2019
 
 - Forces Statesman to use a new transactions with `requires_new: true` (https://github.com/gocardless/statesman/pull/249)

data/lib/statesman/adapters/active_record.rb

@@ -93,7 +93,7 @@ module Statesman
       end
 
       def transitions_for_parent
-        @parent_model.send(@association_name)
+        parent_model.send(@association_name)
       end
 
       def unset_old_most_recent
@@ -128,10 +128,44 @@ module Statesman
       end
 
       def transition_conflict_error?(err)
-        err.message.include?(@transition_class.table_name) &&
+        return true if unique_indexes.any? { |i| err.message.include?(i.name) }
+
+        err.message.include?(transition_class.table_name) &&
           (err.message.include?("sort_key") || err.message.include?("most_recent"))
       end
 
+      def unique_indexes
+        ::ActiveRecord::Base.connection.
+          indexes(transition_class.table_name).
+          select do |index|
+            next unless index.unique
+
+            index.columns.sort == [parent_join_foreign_key, "sort_key"] ||
+              index.columns.sort == [parent_join_foreign_key, "most_recent"]
+          end
+      end
+
+      def parent_join_foreign_key
+        association =
+          parent_model.class.
+            reflect_on_all_associations(:has_many).
+            find { |r| r.name.to_s == @association_name.to_s }
+
+        association_join_primary_key(association)
+      end
+
+      def association_join_primary_key(association)
+        if association.respond_to?(:join_primary_key)
+          association.join_primary_key
+        elsif association.method(:join_keys).arity.zero?
+          # Support for Rails 5.1
+          association.join_keys.key
+        else
+          # Support for Rails < 5.1
+          association.join_keys(transition_class).key
+        end
+      end
+
       def with_updated_timestamp(params)
         # TODO: Once we've set expectations that transition classes should conform to
         # the interface of Adapters::ActiveRecordTransition as a breaking change in the
@@ -140,8 +174,8 @@ module Statesman
         #
         # At the moment, most transition classes will include the module, but not all,
         # not least because it doesn't work with PostgreSQL JSON columns for metadata.
-        column = if @transition_class.respond_to?(:updated_timestamp_column)
-                   @transition_class.updated_timestamp_column
+        column = if transition_class.respond_to?(:updated_timestamp_column)
+                   transition_class.updated_timestamp_column
                  else
                    ActiveRecordTransition::DEFAULT_UPDATED_TIMESTAMP_COLUMN
                  end

data/lib/statesman/version.rb

@@ -1,3 +1,3 @@
 module Statesman
-  VERSION = "4.0.0".freeze
+  VERSION = "4.1.0".freeze
 end

data/spec/support/active_record.rb

@@ -94,14 +94,12 @@ class CreateMyActiveRecordModelTransitionMigration < MIGRATION_CLASS
                 %i[my_active_record_model_id most_recent],
                 unique: true,
                 where: "most_recent",
-                name: "index_my_active_record_model_transitions_"\
-                      "parent_most_recent"
+                name: "index_my_active_record_model_transitions_parent_latest"
     else
       add_index :my_active_record_model_transitions,
                 %i[my_active_record_model_id most_recent],
                 unique: true,
-                name: "index_my_active_record_model_transitions_"\
-                      "parent_most_recent"
+                name: "index_my_active_record_model_transitions_parent_latest"
     end
   end
 end
@@ -173,13 +171,13 @@ class CreateOtherActiveRecordModelTransitionMigration < MIGRATION_CLASS
                 unique: true,
                 where: "most_recent",
                 name: "index_other_active_record_model_transitions_"\
-                      "parent_most_recent"
+                      "parent_latest"
     else
       add_index :other_active_record_model_transitions,
                 %i[other_active_record_model_id most_recent],
                 unique: true,
                 name: "index_other_active_record_model_transitions_"\
-                      "parent_most_recent"
+                      "parent_latest"
     end
   end
 end
@@ -188,8 +186,7 @@ end
 class DropMostRecentColumn < MIGRATION_CLASS
   def change
     remove_index :my_active_record_model_transitions,
-                 name: "index_my_active_record_model_transitions_"\
-                       "parent_most_recent"
+                 name: "index_my_active_record_model_transitions_parent_latest"
     remove_column :my_active_record_model_transitions, :most_recent
   end
 end
@@ -270,14 +267,12 @@ class CreateNamespacedARModelTransitionMigration < MIGRATION_CLASS
                 %i[my_active_record_model_id most_recent],
                 unique: true,
                 where: "most_recent",
-                name: "index_namespace_model_transitions_"\
-                      "parent_most_recent"
+                name: "index_namespace_model_transitions_parent_latest"
     else
       add_index :my_namespace_my_active_record_model_transitions,
                 %i[my_active_record_model_id most_recent],
                 unique: true,
-                name: "index_namespace_model_transitions_"\
-                      "parent_most_recent"
+                name: "index_namespace_model_transitions_parent_latest"
     end
   end
   # rubocop:enable MethodLength

data/statesman.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "ammeter", "~> 1.1"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "gc_ruboconfig", "~> 2.3.9"
-  spec.add_development_dependency "mysql2", "~> 0.4.0"
+  spec.add_development_dependency "mysql2", ">= 0.4", "< 0.6"
   spec.add_development_dependency "pg", "~> 0.18"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rails", ">= 3.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statesman
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - GoCardless
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
@@ -56,16 +56,22 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -292,8 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A statesman-like state machine library