gunwale 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52461a6f1dea23bbcf0b8fa37d85ea21832a5bd9e4a24e133e04c1e2c4d8246a
-  data.tar.gz: bd4a920b50c3333e0590413808e67e9dc5a5f214014f26f44b74c905b1244ffb
+  metadata.gz: fb303554816e9e55837eaf89cca61e0667f6033a96e10c4c6678f7cbba8c357c
+  data.tar.gz: 6739334794d4526a46969b0503b3165687c329fdfee49a5d251aeba57577cfdf
 SHA512:
-  metadata.gz: 758d23294d5c60560bbf9e48e1d20d1bf304ddac4134d473099b257db34538368f6b421a954aa36ed3969475a36c7220fec97d44391e7c56d15ae40b1ba2dc58
-  data.tar.gz: 8b3d23b63453c8c7e6371310d84706d428f82777b1daac7ef36d5165ddcaeecc9e62c8d4ce4f8ce54fd5b9438c3818392a7bb2b2cc2cc2f72bab33619bf46005
+  metadata.gz: cbbb6c14dfcfd6804aae05b903de648e5057f87fafe52125ab47628f721bc4c441b9b7a7f56b799c39dfbe33b3155e1d9f03a4639bc1ae54c4270ca4a9369e51
+  data.tar.gz: 19eb9ac64cfda705fda573be5335162cc17f4e2b41b07e0bbe766bfa9816b318043e6e7f9c0f26637a43c3a518ce12cc6007f74f1fbbe7ebb9d5d22cd0d7ebb1

data/db/schema.rb

@@ -10,9 +10,9 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2017_05_11_160154) do
+ActiveRecord::Schema[8.0].define(version: 2017_05_11_160154) do
   # These are extensions that must be enabled in order to support this database
-  enable_extension "plpgsql"
+  enable_extension "pg_catalog.plpgsql"
 
   create_table "products", force: :cascade do |t|
     t.string "name", null: false
@@ -22,5 +22,4 @@ ActiveRecord::Schema[7.1].define(version: 2017_05_11_160154) do
     t.datetime "updated_at", precision: nil, null: false
     t.index ["rank"], name: "index_products_on_rank", unique: true
   end
-
 end

data/lib/row_boat/base.rb

@@ -8,6 +8,9 @@ module RowBoat
   class Base
     InvalidColumnMapping = Class.new(StandardError)
 
+    SENTINEL = :__ROWBOAT_ABSENT__
+    private_constant :SENTINEL
+
     attr_reader :csv_source
 
     class << self
@@ -110,6 +113,11 @@ module RowBoat
     def import_rows(rows)
       import_options = ::RowBoat::Helpers.extract_import_options(merged_options)
       preprocessed_rows = preprocess_rows(rows)
+
+      # Prevent "ON CONFLICT ... cannot affect row a second time" by
+      # deduplicating input rows on the declared conflict target.
+      preprocessed_rows = dedupe_on_conflict_target(preprocessed_rows, import_options)
+
       import_into.import(preprocessed_rows, import_options)
     end
 
@@ -300,6 +308,27 @@ module RowBoat
       end
     end
 
+    # Deduplicate rows on the activerecord-import conflict target (if any).
+    # Keeps the *last* occurrence for deterministic "last write wins" behavior.
+    def dedupe_on_conflict_target(rows, import_options)
+      return rows if rows.empty?
+
+      conflict_target = Array(import_options.dig(:on_duplicate_key_update, :conflict_target))
+                        .map { |k| k.is_a?(Symbol) ? k : k.to_s.to_sym }
+      return rows if conflict_target.empty?
+
+      # If any row is not a Hash-like payload, we can’t safely dedupe.
+      return rows unless rows.all? { |r| r.is_a?(Hash) }
+
+      # Last row wins
+      seen = {}
+      rows.each do |r|
+        key = conflict_target.map { |k| r.key?(k) ? r[k] : SENTINEL }
+        seen[key] = r
+      end
+      seen.values
+    end
+
     # @api private
     # @private
     def process_import_results(import_results)

data/lib/row_boat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RowBoat
-  VERSION = "0.6.0"
+  VERSION = "0.8.0"
 end

data/row_boat.gemspec

@@ -22,14 +22,14 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", "~> 7.1", ">= 7.1.3.2"
+  spec.add_dependency "activerecord", "~> 8.0", "< 8.1"
   spec.add_dependency "activerecord-import", "~> 1.6"
   spec.add_dependency "smarter_csv", "~> 1.13", ">= 1.13.0"
 
   spec.add_development_dependency "appraisal", "~> 2.5"
   spec.add_development_dependency "awesome_print"
   spec.add_development_dependency "bundler", "~> 2.5.9"
-  spec.add_development_dependency "database_cleaner", "~> 2.0", ">= 2.0.2"
+  spec.add_development_dependency "database_cleaner", "~> 2.1", ">= 2.1.0"
   spec.add_development_dependency "pg"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-doc"
@@ -37,6 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.2", ">= 13.2.1"
   spec.add_development_dependency "rspec", "~> 3.13"
   spec.add_development_dependency "rubocop", "~> 1.63", ">= 1.63.5"
-  spec.add_development_dependency "standalone_migrations", "~> 7.1", ">= 7.1.3"
+  spec.add_development_dependency "standalone_migrations", "~> 8.0"
   spec.add_development_dependency "yard", "~> 0.9.36"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gunwale
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Charlton Trezevant
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-06 00:00:00.000000000 Z
+date: 2025-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
-    - - ">="
+        version: '8.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.3.2
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
-    - - ">="
+        version: '8.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.3.2
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
@@ -112,20 +112,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -242,20 +242,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.1.3
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.1.3
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -322,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Turn the rows of your CSV into rows in your database