active_record_upsert 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62f7a83d49c0788c2ccbf5e26ef312255cb91a2c695f01e0db7df57952e91632
-  data.tar.gz: 9a11684213b0db63b4b10f14f23d96de3a38cbe58f8bc9269884263602f921d1
+  metadata.gz: e867ac92d0f9da516a6845e3ebd2fc03da038ae5451e6ff0ce217cbf3e999423
+  data.tar.gz: 0b559e347df791f257144798d12e03d882584af0035606ceba2777b1aa13c6da
 SHA512:
-  metadata.gz: ff184a7ae09b78ee8fa09f0e5afc1d553b3f9e57c78c00ed5351a9f19c6b84d83eef2bcdb2d0dc053ddd8d135741d7cb67e622527618eeda66a846225dd6eccb
-  data.tar.gz: bd42335ce0426eef3a728539da8afcbf03555f4d23d5bdd2a9ebdae6a0a774b9dfc15aa4c06d41af2a53f567cbbedb44112a336dd180ba18cf1b02b464968b9a
+  metadata.gz: 72680038d1f62c296972e56cd788fd01ddc17aec56590eda76b32d3d541543c3acd74e12b1a1ee716df7cbc4d7e148ef5afb34943824e68e55fc1115247621a7
+  data.tar.gz: 0f4270bb398c42726fdec1494e6da82e08ccd73e51e384267cf109ba597ed9e36981922ac013cce7aad90b704222c11576cb07214f401161d4f5432fbdeee5a6

data/Rakefile

@@ -13,6 +13,10 @@ task :setup_and_run_spec do |rake_task|
 
   require File.expand_path('../spec/dummy/config/environment.rb', __FILE__)
 
+  if Rails.version >= '5.2.0.rc1'
+    ActiveRecord::Base.connection.migrations_paths << 'spec/dummy/db/migrate'
+  end
+
   include ActiveRecord::Tasks
   DatabaseTasks.db_dir = 'spec/dummy/db'
   DatabaseTasks.drop_current

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

@@ -3,18 +3,13 @@ module ActiveRecordUpsert
     module ConnectionAdapters
       module Postgresql
         module DatabaseStatementsExtensions
-          def upsert(arel, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [])
-            sql, binds, pk, _sequence_name = sql_for_upsert(to_sql(arel, binds), pk, id_value, sequence_name, binds)
-            exec_upsert(sql, name, binds, pk)
+          def upsert(arel, name = nil, binds = [])
+            sql, binds = to_sql_and_binds(arel, binds)
+            exec_upsert(sql, name, binds)
           end
 
-          def sql_for_upsert(sql, pk, id_value, sequence_name, binds)
-            sql = "#{sql} RETURNING *"
-            [sql, binds, pk, sequence_name]
-          end
-
-          def exec_upsert(sql, name, binds, pk)
-            exec_query(sql, name, binds)
+          def exec_upsert(sql, name, binds)
+            exec_query("#{sql} RETURNING *", name, binds)
           end
         end
       end

data/lib/active_record_upsert/active_record/persistence.rb

@@ -1,7 +1,6 @@
 module ActiveRecordUpsert
   module ActiveRecord
     module PersistenceExtensions
-
       def upsert!(attributes: nil, arel_condition: nil, validate: true)
         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?
@@ -31,10 +30,9 @@ module ActiveRecordUpsert
         false
       end
 
-
       def _upsert_record(upsert_attribute_names = changed, arel_condition = nil)
         existing_attributes = arel_attributes_with_values_for_create(self.attributes.keys)
-        values = self.class.unscoped.upsert(existing_attributes, upsert_attribute_names, [arel_condition].compact)
+        values = self.class._upsert_record(existing_attributes, upsert_attribute_names, [arel_condition].compact)
         @new_record = false
         values
       end
@@ -56,6 +54,21 @@ module ActiveRecordUpsert
           false
         end
 
+        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']
+          values_for_upsert = existing_attributes.select { |a| upsert_attributes_names.include?(a.name) }
+
+          insert_manager = arel_table.compile_upsert(
+            upsert_keys,
+            _substitute_values(values_for_upsert),
+            _substitute_values(existing_attributes),
+            wheres
+          )
+
+          connection.upsert(insert_manager, "#{self} Upsert")
+        end
+
         def upsert_keys(*keys)
           return @_upsert_keys if keys.empty?
           keys = keys.first if keys.size == 1 # support single string/symbol, multiple string/symbols, and array

data/lib/active_record_upsert/active_record.rb

@@ -14,8 +14,5 @@ end
 ::ActiveRecord::Base.prepend(ActiveRecordUpsert::ActiveRecord::TimestampExtensions)
 ::ActiveRecord::Base.prepend(ActiveRecordUpsert::ActiveRecord::TransactionsExtensions)
 
-#::ActiveRecord::ConnectionAdapters::DatabaseStatements.include(ActiveRecordUpsert::ActiveRecord::ConnectionAdapters::Abstract::DatabaseStatementsExtensions)
 ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include(ActiveRecordUpsert::ActiveRecord::ConnectionAdapters::Abstract::DatabaseStatementsExtensions)
 ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include(ActiveRecordUpsert::ActiveRecord::ConnectionAdapters::Postgresql::DatabaseStatementsExtensions)
-
-::ActiveRecord::Relation.include(ActiveRecordUpsert::ActiveRecord::RelationExtensions)

data/lib/active_record_upsert/arel/crud.rb

@@ -10,9 +10,19 @@
 #   end
 # end
 module Arel
-  class Table
-    def create_on_conflict_do_update
-      OnConflictDoUpdateManager.new
+  module Crud
+    def compile_upsert(upsert_keys, upsert_values, insert_values, wheres)
+      on_conflict_do_update = OnConflictDoUpdateManager.new
+
+      on_conflict_do_update.target = self[upsert_keys.join(',')]
+      on_conflict_do_update.wheres = wheres
+      on_conflict_do_update.set(upsert_values)
+
+      insert_manager = create_insert
+      insert_manager.on_conflict = on_conflict_do_update.to_node
+      insert_manager.into insert_values.first.first.relation
+      insert_manager.insert(insert_values)
+      insert_manager
     end
   end
 end

data/lib/active_record_upsert/compatibility/rails50.rb

@@ -0,0 +1 @@
+require_relative 'rails51'

data/lib/active_record_upsert/{active_record/relation.rb → compatibility/rails51.rb}

@@ -1,5 +1,14 @@
 module ActiveRecordUpsert
   module ActiveRecord
+    module PersistenceExtensions
+      def _upsert_record(upsert_attribute_names = changed, arel_condition = nil)
+        existing_attributes = arel_attributes_with_values_for_create(self.attributes.keys)
+        values = self.class.unscoped.upsert(existing_attributes, upsert_attribute_names, [arel_condition].compact)
+        @new_record = false
+        values
+      end
+    end
+
     module RelationExtensions
       def upsert(existing_attributes, upsert_attributes, wheres) # :nodoc:
         substitutes, binds = substitute_values(existing_attributes)
@@ -11,7 +20,7 @@ module ActiveRecordUpsert
         on_conflict_binds = binds.select(&upsert_keys_filter)
         vals_for_upsert = substitutes.select { |s| upsert_keys_filter.call(s.first) }
 
-        on_conflict_do_update = arel_table.create_on_conflict_do_update
+        on_conflict_do_update = ::Arel::OnConflictDoUpdateManager.new
         on_conflict_do_update.target = arel_table[upsert_keys.join(',')]
         on_conflict_do_update.wheres = wheres
         on_conflict_do_update.set(vals_for_upsert)
@@ -21,13 +30,20 @@ module ActiveRecordUpsert
         insert_manager.on_conflict = on_conflict_do_update.to_node
         insert_manager.insert substitutes
 
-        @klass.connection.upsert(
-          insert_manager,
-          'SQL',
-          nil, # primary key (not used)
-          nil, # primary key value (not used)
-          nil,
-          binds + on_conflict_binds)
+        @klass.connection.upsert(insert_manager, "#{self} Upsert", binds + on_conflict_binds)
+      end
+
+      ::ActiveRecord::Relation.include(self)
+    end
+
+    module ConnectionAdapters
+      module Postgresql
+        module DatabaseStatementsExtensions
+          def upsert(arel, name = nil, binds = [])
+            sql = to_sql(arel, binds)
+            exec_upsert(sql, name, binds)
+          end
+        end
       end
     end
   end

data/lib/active_record_upsert/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordUpsert
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

data/lib/active_record_upsert.rb

@@ -11,6 +11,9 @@ end
 require 'active_record_upsert/arel'
 require 'active_record_upsert/active_record'
 
+require 'active_record_upsert/compatibility/rails51.rb' if Rails.version >= '5.1.0' && Rails.version < '5.2.0.rc1'
+require 'active_record_upsert/compatibility/rails50.rb' if Rails.version >= '5.0.0' && Rails.version < '5.1.0'
+
 module ActiveRecordUpsert
   # Your code goes here...
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_upsert
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Jesper Josefsson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -88,7 +88,6 @@ files:
 - lib/active_record_upsert/active_record/connection_adapters/abstract/database_statements.rb
 - lib/active_record_upsert/active_record/connection_adapters/postgresql/database_statements.rb
 - lib/active_record_upsert/active_record/persistence.rb
-- lib/active_record_upsert/active_record/relation.rb
 - lib/active_record_upsert/active_record/timestamp.rb
 - lib/active_record_upsert/active_record/transactions.rb
 - lib/active_record_upsert/arel.rb
@@ -103,6 +102,8 @@ files:
 - lib/active_record_upsert/arel/nodes/on_conflict_action.rb
 - lib/active_record_upsert/arel/on_conflict_do_update_manager.rb
 - lib/active_record_upsert/arel/visitors/to_sql.rb
+- lib/active_record_upsert/compatibility/rails50.rb
+- lib/active_record_upsert/compatibility/rails51.rb
 - lib/active_record_upsert/version.rb
 homepage: https://github.com/jesjos/active_record_upsert/
 licenses:
@@ -124,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Real PostgreSQL 9.5+ upserts using ON CONFLICT for ActiveRecord