Trace import: remove activerecord-import gem

Fixes #4994
openstreetmap · Aug 1, 2024 · 5733e21 · 5733e21
1 parent 6f1ffc4
commit 5733e21
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -71,6 +71,7 @@ Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/*.rb'
     - 'app/controllers/users_controller.rb'
+    - 'app/models/trace.rb'
 
 Style/Documentation:
   Enabled: false

diff --git a/Gemfile b/Gemfile
@@ -48,7 +48,6 @@ gem "file_exists"
 
 # Load rails plugins
 gem "actionpack-page_caching", ">= 1.2.0"
-gem "activerecord-import"
 gem "active_record_union"
 gem "bootstrap", "~> 5.3.2"
 gem "bootstrap_form", "~> 5.0"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -65,8 +65,6 @@ GEM
       activemodel (= 7.1.3.4)
       activesupport (= 7.1.3.4)
       timeout (>= 0.4.0)
-    activerecord-import (1.7.0)
-      activerecord (>= 4.2)
     activestorage (7.1.3.4)
       actionpack (= 7.1.3.4)
       activejob (= 7.1.3.4)
@@ -606,7 +604,6 @@ DEPENDENCIES
   aasm
   actionpack-page_caching (>= 1.2.0)
   active_record_union
-  activerecord-import
   addressable (~> 2.8)
   annotate
   argon2

diff --git a/app/models/trace.rb b/app/models/trace.rb
@@ -233,13 +233,13 @@ def import
           tracepoints << tp
         end
 
-        # Run the before_save and before_create callbacks, and then import them in bulk with activerecord-import
+        # Run the before_save and before_create callbacks, and then do a bulk insert
         tracepoints.each do |tp|
           tp.run_callbacks(:save) { false }
           tp.run_callbacks(:create) { false }
         end
 
-        Tracepoint.import!(tracepoints)
+        Tracepoint.insert_all!(tracepoints.map(&:attributes))
       end
 
       if gpx.actual_points.positive?