Merge pull request #295 from etalab/revert-293-fix/deadlocks

Revert "Fix/deadlocks"

Gemfile

@@ -89,7 +89,6 @@ group :development, :test do
 end
 
 group :test do
-  gem 'database_cleaner-active_record'
   gem 'fuubar'
   gem 'simplecov'
   gem 'simplecov-console'

Gemfile.lock

@@ -72,10 +72,6 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
-    database_cleaner-active_record (2.0.0)
-      activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
-    database_cleaner-core (2.0.1)
     declarative (0.0.10)
     declarative-builder (0.1.0)
       declarative-option (< 0.2.0)
@@ -411,7 +407,6 @@ DEPENDENCIES
   byebug
   colorize
   connection_pool (~> 2.2)
-  database_cleaner-active_record
   factory_bot_rails
   fuubar
   growl
@@ -467,4 +462,4 @@ DEPENDENCIES
   whirly
 
 BUNDLED WITH
-   2.2.4
+   2.1.4

app/concepts/stock/task/create_associations.rb

@@ -24,40 +24,21 @@ def log_transaction_failed(_, error:, logger:, **)
 
       private
 
-      # rubocop:disable Metrics/MethodLength
       def execute_transaction(ctx)
-        ctx[:loop_count] = 0
-
-        loop do
-          pg_result = ActiveRecord::Base.connection.execute(sql)
-          updated_rows_count = pg_result.cmd_tuples
-          break if updated_rows_count.zero?
-
-          ctx[:loop_count] += 1
-        end
-
-        ctx[:loop_count].positive?
-      rescue ActiveRecord::ActiveRecordError, StandardError
+        ActiveRecord::Base.connection.execute(sql)
+      rescue ActiveRecord::ActiveRecordError
         ctx[:error] = $ERROR_INFO
         false
       end
-      # rubocop:enable Metrics/MethodLength
 
       def sql
         <<-END_SQL
         UPDATE etablissements_tmp
         SET unite_legale_id = unites_legales_tmp.id
         FROM unites_legales_tmp
-        WHERE etablissements_tmp.id IN (
-            SELECT id from etablissements_tmp where unite_legale_id IS NULL LIMIT #{request_limit}
-          )
-          AND etablissements_tmp.siren = unites_legales_tmp.siren
+        WHERE etablissements_tmp.siren = unites_legales_tmp.siren
         END_SQL
       end
-
-      def request_limit
-        5_000
-      end
     end
   end
 end

spec/concepts/stock/operation/post_import_spec.rb

@@ -61,18 +61,8 @@
     it_behaves_like 'not doing anything'
   end
 
-  context 'when both imports are COMPLETED', use_transactional_fixtures: false do
-    let(:siren_1) { '005880034' }
-
+  context 'when both imports are COMPLETED' do
     before do
-      wrap_with_table_renamed(UniteLegale) do
-        create :unite_legale, siren: siren_1
-      end
-
-      wrap_with_table_renamed(Etablissement) do
-        create :etablissement, siren: siren_1
-      end
-
       create :stock_etablissement, :completed
       create :stock_unite_legale, :completed
     end

spec/concepts/stock/task/create_associations_spec.rb

@@ -1,26 +1,20 @@
 require 'rails_helper'
 
-describe Stock::Task::CreateAssociations, use_transactional_fixtures: false do
+describe Stock::Task::CreateAssociations do
   subject { described_class.call logger: logger }
 
   let(:logger) { instance_spy Logger }
-  let(:siren_1) { '005880034' }
-  let(:siren_2) { '005880035' }
-  let(:siren_3) { '005880036' }
+  let(:siren) { '005880034' }
 
   let!(:unite_legale) do
     wrap_with_table_renamed(UniteLegale) do
-      create :unite_legale, siren: siren_1
-      create :unite_legale, siren: siren_2
-      create :unite_legale, siren: siren_3
+      create :unite_legale, siren: siren
     end
   end
 
   let!(:etablissement) do
     wrap_with_table_renamed(Etablissement) do
-      create :etablissement, siren: siren_1
-      create :etablissement, siren: siren_2
-      create :etablissement, siren: siren_3
+      create :etablissement, siren: siren
     end
   end
 
@@ -39,18 +33,9 @@
   it 'created the association for etablissement' do
     subject
     etab = Etablissement.new(
-      get_raw_data('etablissements_tmp').find { |e| e['siren'] == siren_1 }
+      get_raw_data('etablissements_tmp').first
     )
-    entreprise = UniteLegale.new(
-      get_raw_data('unites_legales_tmp').find { |u| u['siren'] == siren_1 }
-    )
-    expect(etab.unite_legale_id).to eq entreprise.id
-  end
-
-  it 'should have done 2 loop for the associations' do
-    allow_any_instance_of(described_class).to receive(:request_limit).and_return 2
-    subject
-    expect(subject[:loop_count]).to eq 2
+    expect(etab.unite_legale_id).to eq unite_legale.id
   end
 
   context 'when association failed' do

spec/rails_helper.rb

@@ -41,14 +41,6 @@
   # instead of true.
   config.use_transactional_fixtures = true
 
-  config.around(:each, use_transactional_fixtures: false) do |example|
-    self.use_transactional_fixtures = false
-    example.run
-    self.use_transactional_fixtures = true
-
-    DatabaseCleaner.clean_with(:deletion)
-  end
-
   # RSpec Rails can automatically mix in different behaviours to your tests
   # based on their file location, for example enabling you to call `get` and
   # `post` in specs under `spec/controllers`.