better_batch-active_record 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c23e108b7e7d100bd763e2ccbd562877f702209940f8cb84e51922a763005bf1
-  data.tar.gz: b50d42912bbbfb48481065286d39b4f3a4814905cafc1e256c44a5b98e25dfb3
+  metadata.gz: 69ce62068d2d8b3b158d5c6a617c978eafa4bb9dad851c8890c1a55f305ba9e8
+  data.tar.gz: 13b0a05be8df3ed3d0686761c215b5b92159c4bf91a21338a35e651ae0d0fe3b
 SHA512:
-  metadata.gz: 075c1fbf58e1309cb0dca9c76d19ea372071f141e83f2f9b8bde265595b9fae7a142cff561aba4ca98fd94e20b791062c639078af6157aefba17057d41fa1f83
-  data.tar.gz: 5a024d61cab1028350bf786eff66eab80b4c0d24add61170fdbdd05497c07f09d44fbdb86483b2ad923da0ebfbeb9c1eab65cbd3273ef3a16f91efb79fb5e74c
+  metadata.gz: 8d1c46decaeb5d17180ffc6ce2ef0c011d446d23e922aec43730bd1944d0b198f29a01638568301a16a1b527577a7d532b4f21f70be364446e77ae2974bbff22
+  data.tar.gz: 8c4aa172c4fea27ee0cfe4a5ab24770dbaa254fb4efbf3d7f99e7aa85ccf1cf7142929ade8db3228149431f057e1d06a406e63f63c6e948623dd78e2db6292a5

data/lib/better_batch/active_record/error.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module BetterBatch
+  module ActiveRecord
+    class Error < StandardError; end
+  end
+end

data/lib/better_batch/active_record/query.rb

@@ -9,22 +9,16 @@ module BetterBatch
         @model = model
       end
 
-      def upsert(data, unique_by:, returning:)
-        query = build_query(data, unique_by:, returning:)
-        result = exec_query(:upsert, query, data)
-        case returning
-        when Symbol
-          result.rows.map(&:first)
-        when nil
-          nil
-        else
-          hash_rows(query.returning, result.rows)
-        end
+      def upsert(data, unique_by:, except: nil, returning: nil)
+        upsert_data = slice_upsert(data, except:)
+        query = build_query(upsert_data, unique_by:, returning:)
+        result = exec_query(:upsert, query, upsert_data)
+        build_return(returning, result.rows, query)
       end
 
-      def with_upserted_pk(data, unique_by:)
-        query = build_query(data, unique_by:, returning: primary_key)
-        data.zip(exec_query(:upsert, query, data).rows.map(&:first))
+      def with_upserted_pk(data, unique_by:, except: nil)
+        upserted = upsert(data, unique_by:, except:, returning: primary_key)
+        data.zip(upserted)
       end
 
       def set_upserted_pk(data, unique_by:)
@@ -35,21 +29,26 @@ module BetterBatch
       end
 
       def select(data, unique_by:, returning:)
-        query = build_query(data, unique_by:, returning:)
-        result = exec_query(:select, query, data)
+        assert_inputs_ok!(data, unique_by:)
+        select_data = data.map { |datum| datum.slice(*unique_by) }
+        query = build_query(select_data, unique_by:, returning:)
+        result = exec_query(:select, query, select_data)
+        build_return(returning, result.rows, query)
+      end
+
+      def build_return(returning, rows, query)
         case returning
         when Symbol
-          result.rows.map(&:first)
-        when nil
+          rows.map(&:first)
+        when nil, []
           nil
         else
-          hash_rows(query.returning, result.rows)
+          hash_rows(query.returning, rows)
         end
       end
 
       def with_selected_pk(data, unique_by:)
-        query = build_query(data, unique_by:, returning: primary_key)
-        data.zip(exec_query(:select, query, data).rows.map(&:first))
+        data.zip(select(data, unique_by:, returning: primary_key))
       end
 
       def set_selected_pk(data, unique_by:)
@@ -63,31 +62,36 @@ module BetterBatch
 
       attr_reader :model
 
-      def build_query(data, unique_by:, returning:)
-        array_data = data.to_a
-        unique_columns = Array(unique_by)
-        input_columns = array_data.first.keys
-        returning = Array(returning)
-        BetterBatch::Query.new(table_name:, primary_key:, input_columns:, column_types:, unique_columns:,
-                               now_on_insert:, now_on_update:, returning:)
+      def slice_upsert(data, except:)
+        case except
+        when nil, []
+          data
+        else
+          data.map { |datum| datum.except(*except) }
+        end
       end
 
-      def exec_query(type, query, data)
-        sql = build_sql(type, query)
-        json_data = JSON.generate(data)
-        db_exec(sql, query, json_data)
+      def assert_inputs_ok!(data, unique_by:)
+        data_keys = data.first.keys
+        missing = Array(unique_by) - data_keys
+        return if missing.empty?
+
+        msg = "All unique_by columns must be in the given data, but #{missing.inspect} was missing from #{data_keys}."
+        raise Error, msg
       end
 
-      def build_sql(type, query)
-        query.public_send(type)
-      rescue StandardError
-        raise query.inspect
+      def build_query(data, unique_by:, returning:)
+        BetterBatch::Query.new(table_name:, primary_key:, input_columns: data.first.keys,
+                               column_types:, unique_columns: unique_by, now_on_insert:,
+                               now_on_update:, returning:)
+      end
+
+      def exec_query(type, query, data)
+        db_exec(query.public_send(type), JSON.generate(data))
       end
 
-      def db_exec(sql, query, json_data)
+      def db_exec(sql, json_data)
         model.connection.exec_query(sql, nil, [json_data])
-      rescue StandardError
-        raise [query.inspect, query.upsert_formatted].join("\n")
       end
 
       def table_name

data/lib/better_batch/active_record/version.rb

@@ -7,6 +7,6 @@ module BetterBatch
     # and trying to prevent it from autoloading was a struggle
     # so, as usual, the right thing to do is bend to Rails' will
     module Version; end
-    VERSION = '1.0.0'
+    VERSION = '1.0.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_batch-active_record
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Tyler Hartland
@@ -52,6 +52,7 @@ files:
 - lib/.DS_Store
 - lib/better_batch/.DS_Store
 - lib/better_batch/active_record.rb
+- lib/better_batch/active_record/error.rb
 - lib/better_batch/active_record/model.rb
 - lib/better_batch/active_record/query.rb
 - lib/better_batch/active_record/version.rb