sequel-pg_bulk_upsert 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dae595e4106d5d417ee04cc133ec517bb262a258
-  data.tar.gz: 8487d7990c2ddc1b532d9ccf73f6b5a6d49d9635
+  metadata.gz: c8669bd7a4dc68db8dc9402ac22f8080d4b328dd
+  data.tar.gz: 7ee872d7d03780bffb221afa1e1783b5d1cf9592
 SHA512:
-  metadata.gz: 0b5a2f42be945d76e6dc3a0ba36c0674203c9b4415e6b1860d8d9f6c075ec311bd7afbbce1bd5ba7787d4c2fb45f7c68c674483b29e0f88489ad43e2aa676bf8
-  data.tar.gz: 489f39454ff4bfe11acad6816454d0e693821b9454d912a2a9930e6b61597bed98850d12256bab88deec651991fe9410c1a1d56daa2f7c585480f6179e9026ee
+  metadata.gz: 077194f7adffa708c79ab0888746aa8d46c839c01fabf300cabd1afb10030da1518f473b13075cecbd4b11893bea769cca69fb983ec707cf052dcf729ab535e9
+  data.tar.gz: 09ea9c5440940f413b9731e60adf9b2db56b27c4be750ab8f2c6083bfa983a31547fe076892b9040282844da726364646836212ddd784620f975662fe32d4825

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.1.2

data/lib/sequel-pg_bulk_upsert/version.rb

@@ -1,5 +1,5 @@
 module Sequel
   module PgBulkUpsert
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/sequel/extensions/pg_bulk_upsert.rb

@@ -12,12 +12,23 @@ module Sequel
       if duplicate_keys = @opts[:on_duplicate_key_update]
         from_table_name = @opts[:from].first # XXX How: can we ensure theres only one?
         temp_table_name = "#{from_table_name}_tmp_#{Time.now.strftime("%s%L")}"
-        upsert_on = @db.primary_key(from_table_name) or raise "missing primary_key for #{from_table_name}"
+        upsert_on = @db.fetch(<<-SQL).map { |row| row[:attname] }
+          SELECT
+            pg_attribute.attname
+          FROM pg_index, pg_class, pg_attribute
+          WHERE
+            pg_class.oid = '#{from_table_name}'::regclass AND
+            indrelid = pg_class.oid AND
+            pg_attribute.attrelid = pg_class.oid AND
+            pg_attribute.attnum = any(pg_index.indkey)
+            AND indisprimary;
+        SQL
+        raise "missing primary_key for #{from_table_name}" unless upsert_on.any?
 
         [
           create_temp_table_from_existing_sql(from_table_name, temp_table_name),
           multi_insert_without_duplicates_sqls(temp_table_name, columns, values),
-          upsert_from_to_sql(temp_table_name, from_table_name, upsert_on.to_sym, duplicate_keys, columns)
+          upsert_from_to_sql(temp_table_name, from_table_name, upsert_on.map(&:to_sym), duplicate_keys, columns)
         ].flatten
       else
         super
@@ -35,20 +46,27 @@ module Sequel
     def upsert_from_to_sql(source_name, target_name, join_on, update_columns, insert_columns)
       target = @db.from(target_name)
       source = @db.from(source_name)
+
+      nil_join_on = join_on.each_with_object({}) do |join_col, hash|
+        hash[Sequel.qualify(:update_cte, join_col)] = nil
+      end
       source_ds = source.
         select(*insert_columns).
-        left_join(:update_cte, [join_on]).
-        where(Sequel.qualify(:update_cte, join_on) => nil)
+        left_join(:update_cte, join_on).
+        where(nil_join_on)
 
       update_hash = update_columns.each_with_object({}) do |column, hash|
         hash[column] = Sequel.qualify(source_name, column)
       end
 
+      qualified_target_join = join_on.map { |join_col| Sequel.qualify(target_name, join_col) }
+      qualified_source_join = join_on.map { |join_col| Sequel.qualify(source_name, join_col) }
+
       target.with(:update_cte,
         target.from(target_name, source_name).
-          where(Sequel.qualify(target_name, join_on) => Sequel.qualify(source_name, join_on)).
-          returning(Sequel.qualify(target_name, join_on)).with_sql(:update_sql, update_hash)).
-        returning(Sequel.qualify(target_name, join_on)).insert_sql(insert_columns, source_ds)
+          where(Hash[qualified_target_join.zip(qualified_source_join)]).
+          returning(*qualified_target_join).with_sql(:update_sql, update_hash)).
+        returning(*qualified_target_join).insert_sql(insert_columns, source_ds)
     end
 
     def create_temp_table_from_existing_sql(base_table, temp_table_name)

data/sequel-pg_bulk_upsert.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "pg"
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "pry"
+  gem.add_development_dependency "rake"
   gem.require_paths = ["lib"]
 end

data/test/lib/dataset_extension_test.rb

@@ -4,7 +4,7 @@ class DatasetExtensionTest < MiniTest::Test
 
   def setup
     @db = Sequel.
-      connect('mock://postgres').
+      connect('mock://postgres', fetch: [{attname: :id}]).
       extension(:pg_bulk_upsert)
 
     def @db.schema(table)
@@ -80,7 +80,8 @@ class DatasetExtensionTest < MiniTest::Test
   def do_upsert(columns = @upsert_columns, data = @upsert_data)
     @ds.on_duplicate_key_update(:updatable_column).import(columns, data)
 
-    @db.sqls
+    # Returns sqls ignoring primary_key query
+    @db.sqls[1..-1]
   end
 
   def extract_temp_table_name(create_sql)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-pg_bulk_upsert
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Juan Manuel Barreneche
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Implementation `on_duplicate_key_update(*...).multi_insert(*...)` for
   postgresql
 email:
@@ -75,6 +89,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md