active_record_upsert 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b01678cb29f0661418c62699e1278e500a9704d174f114a63118823798361721
-  data.tar.gz: d850a9160cc1b7fe9c6fa2c57843cd983734747689cb2b956d2a357714c1944d
+  metadata.gz: 98aadc2aa0c0144f2e76c0ccfffa7102a93e3ef1ea1b073df4bc89f1f162f9cb
+  data.tar.gz: 9066f7f3cc3b0eedc43778de03ab2d9599d645992f4466f8aa987dfff3eaeb06
 SHA512:
-  metadata.gz: 66ea79bd414e4d03f0a2ef54d309fb65092a2e40170ee399d28df47fd5fbbe3a0c657a4c16d7615d03dd5d235444c72f8478542249ea66279a36f57076d2b8d4
-  data.tar.gz: c35cc444d6abac21f43e49d0c588b65347b45d6692d0f2528846f02d05a28cd2241486f9496312ccaa2621966afc5a2b4babb84c305463f02d223644a9336fcb
+  metadata.gz: eec007a7ae73f4ccb52fda438a9c73182b2f87f8154a5bdfebd1ba49f7a4ea67289e224eafa9bfa1d571a028f37ddc12d8b795c1ef75772a8bde2c70369e11b7
+  data.tar.gz: e6d6f827e67c2c77c22eba302a9be7d3bf4fc435320e0725aa501c618f5ead4d592640f958bf316a866861549adc2bd293daeee816e448d954cc8a66c28fb9f6

data/lib/active_record_upsert/active_record/connection_adapters/postgresql/database_statements.rb

@@ -9,7 +9,7 @@ module ActiveRecordUpsert
           end
 
           def exec_upsert(sql, name, binds)
-            exec_query("#{sql} RETURNING *", name, binds)
+            exec_query("#{sql} RETURNING *, (xmax::text::int = 0) AS _upsert_created_record", name, binds)
           end
         end
       end

data/lib/active_record_upsert/active_record/persistence.rb

@@ -5,7 +5,7 @@ module ActiveRecordUpsert
         raise ::ActiveRecord::ReadOnlyRecord, "#{self.class} is marked as readonly" if readonly?
         raise ::ActiveRecord::RecordSavedError, "Can't upsert a record that has already been saved" if persisted?
         validate == false || perform_validations || raise_validation_error
-        values = run_callbacks(:save) {
+        run_callbacks(:save) {
           run_callbacks(:create) {
             attributes ||= changed
             attributes = attributes +
@@ -15,12 +15,6 @@ module ActiveRecordUpsert
           }
         }
 
-        # When a migration adds a column to a table, the upsert will start
-        # returning the new attribute, and assign_attributes will fail,
-        # because Rails doesn't know about it yet (until the app is restarted).
-        #
-        # This checks that only known attributes are being assigned.
-        assign_attributes(values.first.to_h.slice(*self.attributes.keys))
         self
       end
 
@@ -33,10 +27,17 @@ module ActiveRecordUpsert
       def _upsert_record(upsert_attribute_names = changed, arel_condition = nil)
         existing_attributes = attributes_with_values_for_create(self.attributes.keys)
         values = self.class._upsert_record(existing_attributes, upsert_attribute_names, [arel_condition].compact)
+        @attributes = self.class.attributes_builder.build_from_database(values.first.to_h)
         @new_record = false
         values
       end
 
+      def upsert_operation
+        created_record = self['_upsert_created_record']
+        return if created_record.nil?
+        created_record ? :create : :update
+      end
+
       module ClassMethods
         def upsert!(attributes, arel_condition: nil, validate: true, &block)
           if attributes.is_a?(Array)
@@ -57,6 +58,15 @@ module ActiveRecordUpsert
         def _upsert_record(existing_attributes, upsert_attributes_names, wheres) # :nodoc:
           upsert_keys = self.upsert_keys || [primary_key]
           upsert_attributes_names = upsert_attributes_names - [*upsert_keys, 'created_at']
+
+          existing_attributes = existing_attributes
+            .transform_keys { |name| _prepare_column(name) }
+            .reject { |key, _| key.nil? }
+
+          upsert_attributes_names = upsert_attributes_names
+            .map { |name| _prepare_column(name) }
+            .compact
+
           values_for_upsert = existing_attributes.select { |(name, _value)| upsert_attributes_names.include?(name) }
 
           insert_manager = arel_table.compile_upsert(
@@ -70,6 +80,16 @@ module ActiveRecordUpsert
           connection.upsert(insert_manager, "#{self} Upsert")
         end
 
+        def _prepare_column(column)
+          column = attribute_alias(column) if attribute_alias?(column)
+
+          if columns_hash.key?(column)
+            column
+          elsif reflections.key?(column)
+            reflections[column].foreign_key
+          end
+        end
+
         def upsert_keys(*keys)
           return @_upsert_keys if keys.empty?
           options = keys.extract_options!

data/lib/active_record_upsert/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordUpsert
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_upsert
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Jesper Josefsson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-24 00:00:00.000000000 Z
+date: 2018-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord