postgres_upsert 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 363018cec57166d2976cbeedc60fad9dc17e5ac7
-  data.tar.gz: 280a43ba9f6dea9a72111031c5c7e82089185f72
+  metadata.gz: 8b0a956bd60011cf247a58c3031d5157be3c6f7f
+  data.tar.gz: 918a0d163efa3915f8b3d76421ab69e67e2469d8
 SHA512:
-  metadata.gz: 195008d31407158e4cecf27fbd1aec45b6b3c17a078efe5dcd567e4ec8d023f187d597cf0b1a5a1e46e53c901e957a7c70b6ceccdd1aa27231f1cd2f727b194d
-  data.tar.gz: fbf6e4e15fc23ab1c344a1a8bdd9ba80733cc77c776b6eed98c05936a0dd6cd4889f387e43f028c8c380a2e7d4beb9f3ecc58ef5374183ff3891821077e0fb37
+  metadata.gz: d1dda03e61a25fb875bbaf8eab001d0f8b780dbcb329f8be1c0aabbb03c4be4bb66c6adf2dbfbf21d3edb55135be2fc01826dcc79259b928b64c7bb1748c0369
+  data.tar.gz: ca59859938a0671ffed159495d10a08328a498500f8c18610c4d50f9d452901b55c5e81e63e62eb35dc8c74b532a713e4f2285db690721be5f4de9b3aed3f8ad

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    postgres_upsert (1.1.0)
+    postgres_upsert (3.0.0)
       activerecord (>= 3.0.0)
       pg (~> 0.17.0)
       rails (>= 3.0.0)
@@ -9,26 +9,26 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.3)
-      actionpack (= 4.0.3)
-      mail (~> 2.5.4)
-    actionpack (4.0.3)
-      activesupport (= 4.0.3)
+    actionmailer (4.0.11)
+      actionpack (= 4.0.11)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.0.11)
+      activesupport (= 4.0.11)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.3)
-      activesupport (= 4.0.3)
+    activemodel (4.0.11)
+      activesupport (= 4.0.11)
       builder (~> 3.1.0)
-    activerecord (4.0.3)
-      activemodel (= 4.0.3)
+    activerecord (4.0.11)
+      activemodel (= 4.0.11)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.3)
+      activesupport (= 4.0.11)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
+    activesupport (4.0.11)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
@@ -41,15 +41,13 @@ GEM
     hike (1.2.3)
     i18n (0.6.11)
     json (1.7.6)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (1.25.1)
+    mime-types (2.4.3)
     minitest (4.7.5)
     multi_json (1.10.1)
     pg (0.17.1)
-    polyglot (0.3.5)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -59,17 +57,17 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.3)
-      actionmailer (= 4.0.3)
-      actionpack (= 4.0.3)
-      activerecord (= 4.0.3)
-      activesupport (= 4.0.3)
+    rails (4.0.11)
+      actionmailer (= 4.0.11)
+      actionpack (= 4.0.11)
+      activerecord (= 4.0.11)
+      activesupport (= 4.0.11)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.3)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.3)
-      actionpack (= 4.0.3)
-      activesupport (= 4.0.3)
+      railties (= 4.0.11)
+      sprockets-rails (~> 2.0)
+    railties (4.0.11)
+      actionpack (= 4.0.11)
+      activesupport (= 4.0.11)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
@@ -84,22 +82,19 @@ GEM
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.2)
     slop (3.6.0)
-    sprockets (2.11.0)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.2.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
+      sprockets (>= 2.8, < 4.0)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.40)
+    tzinfo (0.3.42)
 
 PLATFORMS
   ruby

data/lib/postgres_upsert/active_record.rb

@@ -7,7 +7,7 @@ module ActiveRecord
     # * You can map fields from the file to different fields in the table using a map in the options hash
     # * For further details on usage take a look at the README.md
     def self.pg_upsert path_or_io, options = {}
-      PostgresUpsert::Writer.new(self, path_or_io, options).write
+      PostgresUpsert::Writer.new(table_name, path_or_io, options).write
     end
   end
 end

data/lib/postgres_upsert/writer.rb

@@ -2,13 +2,13 @@ module PostgresUpsert
 
   class Writer
 
-    def initialize(klass, source, options = {})
-      @klass = klass
+    def initialize(table_name, source, options = {})
+      @table_name = table_name
       @options = options.reverse_merge({
         :delimiter => ",", 
         :format => :csv, 
         :header => true, 
-        :key_column => @klass.primary_key,
+        :key_column => primary_key,
         :update_only => false})
       @source = source.instance_of?(String) ? File.open(source, 'r') : source
       @columns_list = get_columns
@@ -23,7 +23,6 @@ module PostgresUpsert
       csv_options = @options[:format] == :binary ? "BINARY" : "DELIMITER '#{@options[:delimiter]}' CSV"
 
       copy_table = @temp_table_name
-      destination_table = get_table_name
 
       columns_string = columns_string_for_copy
       create_temp_table
@@ -36,14 +35,40 @@ module PostgresUpsert
         end
       end
 
-      if destination_table
-        upsert_from_temp_table
-        drop_temp_table
-      end
+      upsert_from_temp_table
+      drop_temp_table
     end
 
   private
 
+    def primary_key
+      @primary_key ||= begin
+        query = <<-sql
+          SELECT
+            pg_attribute.attname,
+            format_type(pg_attribute.atttypid, pg_attribute.atttypmod)
+          FROM pg_index, pg_class, pg_attribute
+          WHERE
+            pg_class.oid = '#{@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
+
+        pg_result = ActiveRecord::Base.connection.execute query
+        pg_result.each{ |row| return row['attname'] }
+      end
+    end
+
+    def column_names
+      @column_names ||= begin
+        query = "SELECT * FROM information_schema.columns WHERE TABLE_NAME = '#{@table_name}'"
+        pg_result = ActiveRecord::Base.connection.execute query
+        pg_result.map{ |row| row['column_name'] }
+      end
+    end
+
     def get_columns
       columns_list = @options[:columns] || []
       if @options[:format] != :binary && @options[:header]
@@ -64,23 +89,23 @@ module PostgresUpsert
 
     def columns_string_for_select
       columns = @columns_list.clone
-      columns << "created_at" if @klass.column_names.include?("created_at")
-      columns << "updated_at" if @klass.column_names.include?("updated_at")
+      columns << "created_at" if column_names.include?("created_at")
+      columns << "updated_at" if column_names.include?("updated_at")
       str = get_columns_string(columns)
     end
 
     def columns_string_for_insert
       columns = @columns_list.clone
-      columns << "created_at" if @klass.column_names.include?("created_at")
-      columns << "updated_at" if @klass.column_names.include?("updated_at")
+      columns << "created_at" if column_names.include?("created_at")
+      columns << "updated_at" if column_names.include?("updated_at")
       str = get_columns_string(columns)
     end
 
     def select_string_for_insert
       columns = @columns_list.clone
       str = get_columns_string(columns)
-      str << ",'#{DateTime.now.utc}'" if @klass.column_names.include?("created_at")
-      str << ",'#{DateTime.now.utc}'" if @klass.column_names.include?("updated_at")
+      str << ",'#{DateTime.now.utc}'" if column_names.include?("created_at")
+      str << ",'#{DateTime.now.utc}'" if column_names.include?("updated_at")
       str
     end
 
@@ -95,16 +120,12 @@ module PostgresUpsert
       columns.size > 0 ? "\"#{columns.join('","')}\"" : ""
     end
 
-    def get_table_name
-      if @options[:table]
-        connection.quote_table_name(@options[:table])
-      else
-        @klass.quoted_table_name
-      end
+    def quoted_table_name
+      @quoted_table_name ||= ActiveRecord::Base.connection.quote_table_name(@table_name)
     end
 
     def generate_temp_table_name
-      @temp_table_name = "#{@klass.table_name}_temp_#{rand(1000)}"
+      @temp_table_name = "#{@table_name}_temp_#{rand(1000)}"
     end
 
     def read_input_line
@@ -126,7 +147,7 @@ module PostgresUpsert
 
     def update_from_temp_table
       ActiveRecord::Base.connection.execute <<-SQL
-        UPDATE #{get_table_name} AS d
+        UPDATE #{quoted_table_name} AS d
           #{update_set_clause}
           FROM #{@temp_table_name} as t
           WHERE t.#{@options[:key_column]} = d.#{@options[:key_column]}
@@ -138,7 +159,7 @@ module PostgresUpsert
       command = @columns_list.map do |col|
         "\"#{col}\" = t.\"#{col}\""
       end
-      command << "\"updated_at\" = '#{DateTime.now.utc}'" if @klass.column_names.include?("updated_at") 
+      command << "\"updated_at\" = '#{DateTime.now.utc}'" if column_names.include?("updated_at")
       "SET #{command.join(',')}"
     end
 
@@ -146,12 +167,12 @@ module PostgresUpsert
       columns_string = columns_string_for_insert
       select_string = select_string_for_insert
       ActiveRecord::Base.connection.execute <<-SQL
-        INSERT INTO #{get_table_name} (#{columns_string})
+        INSERT INTO #{quoted_table_name} (#{columns_string})
           SELECT #{select_string}
           FROM #{@temp_table_name} as t
           WHERE NOT EXISTS 
             (SELECT 1 
-                  FROM #{get_table_name} as d 
+                  FROM #{quoted_table_name} as d 
                   WHERE d.#{@options[:key_column]} = t.#{@options[:key_column]})
           AND t.#{@options[:key_column]} IS NOT NULL;
       SQL
@@ -164,7 +185,7 @@ module PostgresUpsert
         DROP TABLE IF EXISTS #{@temp_table_name};
 
         CREATE TEMP TABLE #{@temp_table_name} 
-          AS SELECT #{columns_string} FROM #{get_table_name} WHERE 0 = 1;
+          AS SELECT #{columns_string} FROM #{quoted_table_name} WHERE 0 = 1;
       SQL
     end
 

data/postgres_upsert.gemspec

@@ -5,7 +5,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name = "postgres_upsert"
-  s.version = "2.0.0"
+  s.version = "3.0.0"
 
   s.platform    = Gem::Platform::RUBY
   s.required_ruby_version     = ">= 1.8.7"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postgres_upsert
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Steve Mitchell