postgres_upsert 2.0.0 → 5.1.0

data/spec/pg_upsert_csv_spec.rb

@@ -1,16 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "pg_upsert from file with CSV format" do
-  before(:each) do
-    ActiveRecord::Base.connection.execute %{
-      TRUNCATE TABLE test_models;
-      TRUNCATE TABLE three_columns;
-      SELECT setval('test_models_id_seq', 1, false);
-    }
-  end
 
   before do
-    DateTime.stub_chain(:now, :utc).and_return (DateTime.parse("2012-01-01").utc)
+    DateTime.stub_chain(:now, :utc).and_return (DateTime.parse("2012-01-01").utc.round(4))
+    @time_now = Time.now.round(4)
+    allow(Time).to receive(:now).and_return(@time_now)
   end
 
   def timestamp
@@ -18,14 +13,14 @@ describe "pg_upsert from file with CSV format" do
   end
 
   it "should import from file if path is passed without field_map" do
-    TestModel.pg_upsert File.expand_path('spec/fixtures/comma_with_header.csv')
+    PostgresUpsert.write TestModel, File.expand_path('spec/fixtures/comma_with_header.csv')
     expect(
       TestModel.first.attributes
     ).to include('data' => 'test data 1', 'created_at' => timestamp, 'updated_at' => timestamp)
   end
 
   it "correctly handles delimiters in content" do
-    TestModel.pg_upsert File.expand_path('spec/fixtures/comma_with_header_and_comma_values.csv')
+    PostgresUpsert.write TestModel, File.expand_path('spec/fixtures/comma_with_header_and_comma_values.csv')
     expect(
       TestModel.first.attributes
     ).to include('data' => 'test, the data 1', 'created_at' => timestamp, 'updated_at' => timestamp)
@@ -33,39 +28,39 @@ describe "pg_upsert from file with CSV format" do
 
   it "throws error if csv is malformed" do
     expect{
-      TestModel.pg_upsert File.expand_path('spec/fixtures/comma_with_header_and_unquoted_comma.csv')
+      PostgresUpsert.write TestModel, File.expand_path('spec/fixtures/comma_with_header_and_unquoted_comma.csv')
     }.to raise_error
   end
 
-  it "throws error if the csv has mixed delimiters" do
+  it "throws error if source data contains duplicate pk" do
     expect{
-      TestModel.pg_upsert File.expand_path('spec/fixtures/tab_with_error.csv'), :delimiter => "\t"
-    }.to raise_error
+      PostgresUpsert.write TestModel, File.expand_path('spec/fixtures/comma_with_header_duplicate.csv')
+    }.to raise_error(/duplicate key/)
   end
 
   it "should import from IO without field_map" do
-    TestModel.pg_upsert File.open(File.expand_path('spec/fixtures/comma_with_header.csv'), 'r')
+    PostgresUpsert.write TestModel, File.open(File.expand_path('spec/fixtures/comma_with_header.csv'), 'r')
     expect(
       TestModel.first.attributes
     ).to include('data' => 'test data 1', 'created_at' => timestamp, 'updated_at' => timestamp)
   end
 
   it "should import with custom delimiter from path" do
-    TestModel.pg_upsert File.expand_path('spec/fixtures/semicolon_with_header.csv'), :delimiter => ';'
+    PostgresUpsert.write TestModel, File.expand_path('spec/fixtures/semicolon_with_header.csv'), :delimiter => ';'
     expect(
       TestModel.first.attributes
     ).to include('data' => 'test data 1', 'created_at' => timestamp, 'updated_at' => timestamp)
   end
 
   it "should import with custom delimiter from IO" do
-    TestModel.pg_upsert File.open(File.expand_path('spec/fixtures/semicolon_with_header.csv'), 'r'), :delimiter => ';'
+    PostgresUpsert.write TestModel, File.open(File.expand_path('spec/fixtures/semicolon_with_header.csv'), 'r'), :delimiter => ';'
     expect(
       TestModel.first.attributes
     ).to include('data' => 'test data 1', 'created_at' => timestamp, 'updated_at' => timestamp)
   end
 
   it "should not expect a header when :header is false" do
-    TestModel.pg_upsert(File.open(File.expand_path('spec/fixtures/comma_without_header.csv'), 'r'), :header => false, :columns => [:id,:data])
+    PostgresUpsert.write(TestModel, File.open(File.expand_path('spec/fixtures/comma_without_header.csv'), 'r'), :header => false, :columns => [:id,:data])
 
     expect(
       TestModel.first.attributes
@@ -73,7 +68,7 @@ describe "pg_upsert from file with CSV format" do
   end
 
   it "should be able to map the header in the file to diferent column names" do
-    TestModel.pg_upsert(File.open(File.expand_path('spec/fixtures/tab_with_different_header.csv'), 'r'), :delimiter => "\t", :map => {'cod' => 'id', 'info' => 'data'})
+    PostgresUpsert.write(TestModel, File.open(File.expand_path('spec/fixtures/tab_with_different_header.csv'), 'r'), :delimiter => "\t", :map => {'cod' => 'id', 'info' => 'data'})
 
     expect(
       TestModel.first.attributes
@@ -81,7 +76,7 @@ describe "pg_upsert from file with CSV format" do
   end
 
   it "should be able to map the header in the file to diferent column names with custom delimiter" do
-    TestModel.pg_upsert(File.open(File.expand_path('spec/fixtures/semicolon_with_different_header.csv'), 'r'), :delimiter => ';', :map => {'cod' => 'id', 'info' => 'data'})
+    PostgresUpsert.write(TestModel, File.open(File.expand_path('spec/fixtures/semicolon_with_different_header.csv'), 'r'), :delimiter => ';', :map => {'cod' => 'id', 'info' => 'data'})
 
     expect(
       TestModel.first.attributes
@@ -89,7 +84,7 @@ describe "pg_upsert from file with CSV format" do
   end
 
   it "should ignore empty lines" do
-    TestModel.pg_upsert(File.open(File.expand_path('spec/fixtures/tab_with_extra_line.csv'), 'r'), :delimiter => "\t")
+    PostgresUpsert.write(TestModel, File.open(File.expand_path('spec/fixtures/tab_with_extra_line.csv'), 'r'), :delimiter => "\t")
 
     expect(
       TestModel.first.attributes
@@ -97,7 +92,7 @@ describe "pg_upsert from file with CSV format" do
   end
 
   it "should not create timestamps when the model does not include them" do
-    ReservedWordModel.pg_upsert File.expand_path('spec/fixtures/reserved_words.csv'), :delimiter => "\t"
+    PostgresUpsert.write ReservedWordModel, File.expand_path('spec/fixtures/reserved_words.csv'), :delimiter => "\t"
 
     expect(
       ReservedWordModel.first.attributes
@@ -113,12 +108,12 @@ describe "pg_upsert from file with CSV format" do
 
     it "should not violate primary key constraint" do
       expect{
-        TestModel.pg_upsert File.expand_path('spec/fixtures/comma_with_header.csv')
+        PostgresUpsert.write TestModel, File.expand_path('spec/fixtures/comma_with_header.csv')
       }.to_not raise_error
     end
 
     it "should upsert (update existing records and insert new records)" do
-      TestModel.pg_upsert File.expand_path('spec/fixtures/tab_with_two_lines.csv'), :delimiter => "\t"
+      PostgresUpsert.write TestModel, File.expand_path('spec/fixtures/tab_with_two_lines.csv'), :delimiter => "\t"
 
       expect(
         TestModel.find(1).attributes
@@ -128,21 +123,33 @@ describe "pg_upsert from file with CSV format" do
       ).to eq("id"=>2, "data"=>"test data 2", "created_at" => timestamp, "updated_at" => timestamp)
     end
 
+    it "should return updated and inserted results" do
+      result = PostgresUpsert.write TestModel, File.expand_path('spec/fixtures/tab_with_two_lines.csv'), :delimiter => "\t"
+
+     expect(
+        result.updated
+      ).to eq(1)
+
+      expect(
+        result.inserted
+      ).to eq(1)
+    end
+
     it "should require columns option if no header" do
       expect{
-        TestModel.pg_upsert File.expand_path('spec/fixtures/2_col_binary_data.dat'), :format => :binary
+        PostgresUpsert.write TestModel, File.expand_path('spec/fixtures/comma_without_header.csv'), :header => false
       }.to raise_error("Either the :columns option or :header => true are required")
     end
 
     it "should clean up the temp table after completion" do
-      TestModel.pg_upsert File.expand_path('spec/fixtures/tab_with_two_lines.csv'), :delimiter => "\t"
-      
+      PostgresUpsert.write TestModel, File.expand_path('spec/fixtures/tab_with_two_lines.csv'), :delimiter => "\t"
+
       ActiveRecord::Base.connection.tables.should_not include("test_models_temp")
     end
 
     it "should gracefully drop the temp table if it already exists" do
       ActiveRecord::Base.connection.execute "CREATE TEMP TABLE test_models_temp (LIKE test_models);"
-      TestModel.pg_upsert File.expand_path('spec/fixtures/tab_with_two_lines.csv'), :delimiter => "\t"
+      PostgresUpsert.write TestModel, File.expand_path('spec/fixtures/tab_with_two_lines.csv'), :delimiter => "\t"
 
       expect(
         TestModel.find(1).attributes
@@ -154,7 +161,7 @@ describe "pg_upsert from file with CSV format" do
 
     it "should be able to copy using custom set of columns" do
       ThreeColumn.create(id: 1, data: "old stuff", extra: "neva change!", created_at: original_created_at)
-      ThreeColumn.pg_upsert(File.open(File.expand_path('spec/fixtures/tab_only_data.csv'), 'r'), :delimiter => "\t", :columns => ["id", "data"])
+      PostgresUpsert.write(ThreeColumn, File.open(File.expand_path('spec/fixtures/tab_only_data.csv'), 'r'), :delimiter => "\t", :columns => ["id", "data"])
 
       expect(
         ThreeColumn.first.attributes
@@ -167,8 +174,7 @@ describe "pg_upsert from file with CSV format" do
       three_col = ThreeColumn.create(id: 1, data: "old stuff", extra: "neva change!")
       file = File.open(File.expand_path('spec/fixtures/no_id.csv'), 'r')
 
-
-      ThreeColumn.pg_upsert(file, :key_column => "data")
+      PostgresUpsert.write(ThreeColumn, file, :unique_key => "data")
       expect(
         three_col.reload.extra
       ).to eq("ABC: Always Be Changing.")
@@ -177,11 +183,29 @@ describe "pg_upsert from file with CSV format" do
     it 'inserts records if the passed match column doesnt exist' do
       file = File.open(File.expand_path('spec/fixtures/no_id.csv'), 'r')
 
-      ThreeColumn.pg_upsert(file, :key_column => "data")
+      PostgresUpsert.write(ThreeColumn, file, :unique_key => "data")
+      expect(
+        ThreeColumn.last.attributes
+      ).to include("data" => "old stuff", "extra" => "ABC: Always Be Changing.")
+    end
+
+    it 'allows key column to be a string or symbol' do
+      file = File.open(File.expand_path('spec/fixtures/no_id.csv'), 'r')
+
+      PostgresUpsert.write(ThreeColumn, file, :header => true, :unique_key => :data)
       expect(
         ThreeColumn.last.attributes
-      ).to include("id" => 1, "data" => "old stuff", "extra" => "ABC: Always Be Changing.")
+      ).to include("data" => "old stuff", "extra" => "ABC: Always Be Changing.")
+    end
+
+    it 'raises an error if the expected key column is not in data' do
+      file = File.open(File.expand_path('spec/fixtures/no_id.csv'), 'r')
+
+      expect{
+      PostgresUpsert.write(ThreeColumn, file, :header => true)
+      }.to raise_error (/Expected column 'id'/)
     end
+
   end
 
   context 'update only' do
@@ -189,9 +213,9 @@ describe "pg_upsert from file with CSV format" do
     before(:each) do
       TestModel.create(id: 1, data: "From the before time, in the long long ago", :created_at => original_created_at)
     end
-    it 'will only update and not insert if insert_only flag is passed.' do
-      TestModel.pg_upsert File.expand_path('spec/fixtures/tab_with_two_lines.csv'), :delimiter => "\t", :update_only => true
 
+    it 'will only update and not insert if insert_only flag is passed.' do
+      PostgresUpsert.write TestModel, File.expand_path('spec/fixtures/tab_with_two_lines.csv'), :delimiter => "\t", :update_only => true
       expect(
         TestModel.find(1).attributes
       ).to eq("id"=>1, "data"=>"test data 1", "created_at" => original_created_at  , "updated_at" => timestamp)
@@ -201,6 +225,40 @@ describe "pg_upsert from file with CSV format" do
 
     end
 
+    it 'will return the number of updated rows' do
+      a = PostgresUpsert.write TestModel, File.expand_path('spec/fixtures/tab_with_two_lines.csv'), :delimiter => "\t", :update_only => true
+      expect(
+        a.updated
+      ).to eq(1)
+
+      expect(
+        a.inserted
+      ).to eq(0)
+    end
+
+  end
+
+  context 'using table_name' do
+    it "should import from file if path is passed without field_map" do
+      PostgresUpsert.write TestModel.table_name, File.expand_path('spec/fixtures/comma_with_header.csv')
+      expect(
+        TestModel.first.attributes
+      ).to include('data' => 'test data 1', 'created_at' => timestamp, 'updated_at' => timestamp)
+    end
+
+    it "should still report results" do
+      TestModel.create(data: "test data 1")
+      result = PostgresUpsert.write TestModel.table_name, File.expand_path('spec/fixtures/tab_with_two_lines.csv'), :delimiter => "\t"
+
+      expect(
+        result.updated
+      ).to eq(1)
+
+      expect(
+        result.inserted
+      ).to eq(1)
+    end
+
   end
 end
 

data/spec/rails_helper.rb

@@ -0,0 +1 @@
+require File.expand_path(__dir__ + '/spec_helper')

data/spec/spec_helper.rb

@@ -1,47 +1,19 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+require File.expand_path("../../config/environment", __FILE__)
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'fixtures/test_model'
+require 'fixtures/test_model_copy'
 require 'fixtures/three_column'
 require 'fixtures/reserved_word_model'
-require 'rspec'
+require 'fixtures/composite_key_model'
+require 'rspec/rails'
 require 'rspec/autorun'
+require 'database_cleaner/active_record'
 
 RSpec.configure do |config|
-  config.before(:suite) do
-    # we create a test database if it does not exist
-    # I do not use database users or password for the tests, using ident authentication instead
-    begin
-      ActiveRecord::Base.establish_connection(
-        :adapter  => "postgresql",
-        :host     => "localhost",
-        :username => "postgres",
-        :password => "postgres",
-        :port     => 5432,
-        :database => "ar_pg_copy_test"
-      )
-      ActiveRecord::Base.connection.execute %{
-        SET client_min_messages TO warning;
-        DROP TABLE IF EXISTS test_models;
-        DROP TABLE IF EXISTS three_columns;
-        DROP TABLE IF EXISTS reserved_word_models;
-        CREATE TABLE test_models (id serial PRIMARY KEY, data text, created_at timestamp with time zone, updated_at timestamp with time zone );
-        CREATE TABLE three_columns (id serial PRIMARY KEY, data text, extra text, created_at timestamp with time zone, updated_at timestamp with time zone );
-        CREATE TABLE reserved_word_models (id serial PRIMARY KEY, "select" text, "group" text);
-      }
-    rescue Exception => e
-      puts "Exception: #{e}"
-      ActiveRecord::Base.establish_connection(
-        :adapter  => "postgresql",
-        :host     => "localhost",
-        :username => "postgres",
-        :password => "postgres",
-        :port     => 5432,
-        :database => "postgres"
-      )
-      ActiveRecord::Base.connection.execute "DROP DATABASE IF EXISTS ar_pg_copy_test"
-      ActiveRecord::Base.connection.execute "CREATE DATABASE ar_pg_copy_test;"
-      retry
-    end
+  config.before(:example) do
+    DatabaseCleaner.clean_with(:truncation)
   end
-
+  config.expose_current_running_example_as :example
+  config.infer_spec_type_from_file_location!
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: postgres_upsert
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Steve Mitchell
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2014-09-12 00:00:00.000000000 Z
@@ -14,100 +14,128 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   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'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: pry-rails
   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'
 - !ruby/object:Gem::Dependency
-  name: pry-rails
+  name: pry-nav
+  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'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner-active_record
   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'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '0'
 description: Uses Postgres's powerful COPY command to upsert large sets of data into
   ActiveRecord tables
 email: thestevemitchell@gmail.com
@@ -115,22 +143,57 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rubocop.yml"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
+- app/assets/config/manifest.js
+- bin/bundle
+- bin/rails
+- bin/rake
+- bin/setup
+- config.ru
+- config/application.rb
+- config/boot.rb
+- config/database.yml
+- config/database.yml.travis
+- config/environment.rb
+- config/environments/development.rb
+- config/environments/production.rb
+- config/environments/test.rb
+- config/locales/en.yml
+- config/routes.rb
+- config/secrets.yml
+- db/migrate/20150214192135_create_test_tables.rb
+- db/migrate/20150710162236_create_composite_models_table.rb
+- db/schema.rb
+- db/seeds.rb
 - lib/postgres_upsert.rb
-- lib/postgres_upsert/active_record.rb
+- lib/postgres_upsert/model_to_model_adapter.rb
+- lib/postgres_upsert/read_adapters/active_record_adapter.rb
+- lib/postgres_upsert/read_adapters/file_adapter.rb
+- lib/postgres_upsert/read_adapters/io_adapter.rb
+- lib/postgres_upsert/result.rb
+- lib/postgres_upsert/table_writer.rb
+- lib/postgres_upsert/write_adapters/active_record_adapter.rb
+- lib/postgres_upsert/write_adapters/table_adapter.rb
 - lib/postgres_upsert/writer.rb
 - postgres_upsert.gemspec
-- spec/fixtures/2_col_binary_data.dat
+- spec/composite_key_spec.rb
 - spec/fixtures/comma_with_header.csv
 - spec/fixtures/comma_with_header_and_comma_values.csv
 - spec/fixtures/comma_with_header_and_unquoted_comma.csv
+- spec/fixtures/comma_with_header_duplicate.csv
 - spec/fixtures/comma_without_header.csv
+- spec/fixtures/composite_key_model.rb
+- spec/fixtures/composite_key_with_header.csv
+- spec/fixtures/composite_nonkey_with_header.csv
 - spec/fixtures/no_id.csv
 - spec/fixtures/reserved_word_model.rb
 - spec/fixtures/reserved_words.csv
@@ -143,41 +206,46 @@ files:
 - spec/fixtures/tab_with_header.csv
 - spec/fixtures/tab_with_two_lines.csv
 - spec/fixtures/test_model.rb
+- spec/fixtures/test_model_copy.rb
 - spec/fixtures/three_column.rb
-- spec/pg_upsert_binary_spec.rb
+- spec/from_table_spec.rb
 - spec/pg_upsert_csv_spec.rb
-- spec/spec.opts
+- spec/rails_helper.rb
 - spec/spec_helper.rb
 homepage: https://github.com/theSteveMitchell/postgres_upsert
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A rubygem that integrates with ActiveRecord to insert/update large data sets
   into the database efficiently
 test_files:
-- spec/fixtures/2_col_binary_data.dat
+- spec/composite_key_spec.rb
 - spec/fixtures/comma_with_header.csv
 - spec/fixtures/comma_with_header_and_comma_values.csv
 - spec/fixtures/comma_with_header_and_unquoted_comma.csv
+- spec/fixtures/comma_with_header_duplicate.csv
 - spec/fixtures/comma_without_header.csv
+- spec/fixtures/composite_key_model.rb
+- spec/fixtures/composite_key_with_header.csv
+- spec/fixtures/composite_nonkey_with_header.csv
 - spec/fixtures/no_id.csv
 - spec/fixtures/reserved_word_model.rb
 - spec/fixtures/reserved_words.csv
@@ -190,8 +258,9 @@ test_files:
 - spec/fixtures/tab_with_header.csv
 - spec/fixtures/tab_with_two_lines.csv
 - spec/fixtures/test_model.rb
+- spec/fixtures/test_model_copy.rb
 - spec/fixtures/three_column.rb
-- spec/pg_upsert_binary_spec.rb
+- spec/from_table_spec.rb
 - spec/pg_upsert_csv_spec.rb
-- spec/spec.opts
+- spec/rails_helper.rb
 - spec/spec_helper.rb