postgres-copy 0.5.8 → 0.6.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    postgres-copy (0.5.8)
+    postgres-copy (0.6.0)
       activerecord (>= 3.0.0)
       pg
       rails (>= 3.0.0)
@@ -41,17 +41,16 @@ GEM
     builder (3.0.4)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    hike (1.2.1)
+    hike (1.2.2)
     i18n (0.6.1)
     journey (1.0.4)
     json (1.7.6)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.22)
-    multi_json (1.7.2)
-    pg (0.15.0)
+    mime-types (1.23)
+    multi_json (1.7.3)
+    pg (0.15.1)
     polyglot (0.3.3)
     rack (1.4.5)
     rack-cache (1.2)
@@ -94,7 +93,7 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     thor (0.18.1)
-    tilt (1.3.6)
+    tilt (1.4.1)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)

data/lib/postgres-copy/active_record.rb

@@ -36,24 +36,32 @@ 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_copy_from path_or_io, options = {}
-      options = {:delimiter => ",", :format => :csv}.merge(options)
+      options = {:delimiter => ",", :format => :csv, :header => true}.merge(options)
       options_string = if options[:format] == :binary
                         "BINARY"
                        else
                         "DELIMITER '#{options[:delimiter]}' CSV"
                        end
       io = path_or_io.instance_of?(String) ? File.open(path_or_io, 'r') : path_or_io
-      # The first line should be always the HEADER.
+
       if options[:format] == :binary
         columns_list = options[:columns] || []
-      else
+      elsif options[:header]
         line = io.gets
         columns_list = options[:columns] || line.strip.split(options[:delimiter])
+      else
+        columns_list = options[:columns]
+      end
+
+      table = if options[:table]
+        connection.quote_table_name(options[:table])
+      else
+        quoted_table_name
       end
 
       columns_list = columns_list.map{|c| options[:map][c.to_s] } if options[:map]
       columns_string = columns_list.size > 0 ? "(\"#{columns_list.join('","')}\")" : ""
-      connection.execute %{COPY #{quoted_table_name} #{columns_string} FROM STDIN WITH #{options_string}}
+      connection.execute %{COPY #{table} #{columns_string} FROM STDIN #{options_string}}
       if options[:format] == :binary
         bytes = 0
         begin

data/postgres-copy.gemspec

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

data/spec/fixtures/comma_without_header.csv

@@ -0,0 +1 @@
+1,test data 1

data/spec/pg_copy_from_spec.rb

@@ -5,7 +5,7 @@ describe "COPY FROM" do
     ActiveRecord::Base.connection.execute %{
       TRUNCATE TABLE test_models;
       SELECT setval('test_models_id_seq', 1, false);
-}
+    }
   end
 
   it "should import from file if path is passed without field_map" do
@@ -53,6 +53,16 @@ describe "COPY FROM" do
     ExtraField.order(:id).all.map{|r| r.attributes}.should == [{'id' => 1, 'data' => 'test data 1', 'created_at' => nil, 'updated_at' => nil}]
   end
 
+  it "should not expect a header when :header is false" do
+    TestModel.pg_copy_from(File.open(File.expand_path('spec/fixtures/comma_without_header.csv'), 'r'), :header => false, :columns => [:id,:data])
+    TestModel.order(:id).all.map{|r| r.attributes}.should == [{'id' => 1, 'data' => 'test data 1'}]
+  end
+
+  it "should use the table name given by :table" do
+    ActiveRecord::Base.pg_copy_from(File.open(File.expand_path('spec/fixtures/comma_without_header.csv'), 'r'), :header => false, :columns => [:id,:data], :table => "test_models")
+    TestModel.order(:id).all.map{|r| r.attributes}.should == [{'id' => 1, 'data' => 'test data 1'}]
+  end
+
   it "should be able to map the header in the file to diferent column names" do
     TestModel.pg_copy_from(File.open(File.expand_path('spec/fixtures/tab_with_different_header.csv'), 'r'), :delimiter => "\t", :map => {'cod' => 'id', 'info' => 'data'})
     TestModel.order(:id).all.map{|r| r.attributes}.should == [{'id' => 1, 'data' => 'test data 1'}]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postgres-copy
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -146,6 +146,7 @@ files:
 - postgres-copy.gemspec
 - spec/fixtures/2_col_binary_data.dat
 - spec/fixtures/comma_with_header.csv
+- spec/fixtures/comma_without_header.csv
 - spec/fixtures/extra_field.rb
 - spec/fixtures/reserved_word_model.rb
 - spec/fixtures/reserved_words.csv
@@ -184,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 489106335970440028
+      hash: -1552817411289584753
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25