flipper-active_record 0.21.0.rc2 → 0.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51228d4e4a2dfac72ef810bb476dcd05aaab0949c813c016729e0bb6ad57abc9
-  data.tar.gz: ea11ea94aff22c09d34dc479fb9f4790e54f15570100782296e3d8a79d585e9a
+  metadata.gz: 912bdcd897f28bba90d89b435bb107e5b120291d1a5640f52281c95b642e7219
+  data.tar.gz: 9a82dad8ea4bf325bf4c81406090653ce1930a1c1cd9901351c67d9c255be60e
 SHA512:
-  metadata.gz: 60969f1cabfe9c9312c68dcb0c27a9f509dede26de5d586f09dfd50d77db5b04e75d7c167c6fdc5d27b6fe3b169440d992f42c564feb32201c7bb6a42d7c0895
-  data.tar.gz: 4d75a07a1e4532da736b3b13e8baee0fd833cddce59f17d45b7e309a1dbfb868d37ef2ff1ec6ff3ceb825be790c03c0c12eb8fc1034e48d0a87681986211b209
+  metadata.gz: 54a974e2666d2afb8bea885b775004ba84ea84d947a6b47b68136171442c4d4daf623979d816eeafb7844008d6c2df71daa16cf42b6b7d3be4979802055a2527
+  data.tar.gz: 3d06634017bd951b9ec1cd9ac5e5f3186d31c85391fca1f4119fbf651a182ad1d61eb2d66f86709ba091c657f18b65399004c20f36edc1361676763881a7837c

data/flipper-active_record.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |gem|
   gem.metadata      = Flipper::METADATA
 
   gem.add_dependency 'flipper', "~> #{Flipper::VERSION}"
-  gem.add_dependency 'activerecord', '>= 5.0', '< 7'
+  gem.add_dependency 'activerecord', '>= 4.2', '< 7'
 end

data/lib/flipper/adapters/active_record.rb

@@ -101,11 +101,12 @@ module Flipper
       end
 
       def get_all
-        rows = ::ActiveRecord::Base.connection.select_all <<-SQL.tr("\n", ' ')
-          SELECT ff.key AS feature_key, fg.key, fg.value
-          FROM #{@feature_class.table_name} ff
-          LEFT JOIN #{@gate_class.table_name} fg ON ff.key = fg.feature_key
-        SQL
+        features = ::Arel::Table.new(@feature_class.table_name.to_sym)
+        gates = ::Arel::Table.new(@gate_class.table_name.to_sym)
+        rows_query = features.join(gates, Arel::Nodes::OuterJoin)
+          .on(features[:key].eq(gates[:feature_key]))
+          .project(features[:key].as('feature_key'), gates[:key], gates[:value])
+        rows = ::ActiveRecord::Base.connection.select_all rows_query
         db_gates = rows.map { |row| Gate.new(row) }
         grouped_db_gates = db_gates.group_by(&:feature_key)
         result = Hash.new { |hash, key| hash[key] = default_config }
@@ -172,10 +173,15 @@ module Flipper
         @gate_class.transaction do
           clear(feature) if clear_feature
           @gate_class.where(feature_key: feature.key, key: gate.key).destroy_all
-          @gate_class.create! do |g|
-            g.feature_key = feature.key
-            g.key = gate.key
-            g.value = thing.value.to_s
+          begin
+            @gate_class.create! do |g|
+              g.feature_key = feature.key
+              g.key = gate.key
+              g.value = thing.value.to_s
+            end
+          rescue ::ActiveRecord::RecordNotUnique
+            # assume this happened concurrently with the same thing and its fine
+            # see https://github.com/jnunemaker/flipper/issues/544
           end
         end
 

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.21.0.rc2'.freeze
+  VERSION = '0.22.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-active_record
 version: !ruby/object:Gem::Version
-  version: 0.21.0.rc2
+  version: 0.22.2
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-08 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flipper
@@ -16,21 +16,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0.rc2
+        version: 0.22.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0.rc2
+        version: 0.22.2
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -80,9 +80,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: