postgres_upsert 5.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
@@ -37,6 +32,12 @@ describe "pg_upsert from file with CSV format" do
     }.to raise_error
   end
 
+  it "throws error if source data contains duplicate pk" do
+    expect{
+      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
     PostgresUpsert.write TestModel, File.open(File.expand_path('spec/fixtures/comma_with_header.csv'), 'r')
     expect(
@@ -142,7 +143,7 @@ describe "pg_upsert from file with CSV format" do
 
     it "should clean up the temp table after completion" do
       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
 
@@ -202,7 +203,7 @@ describe "pg_upsert from file with CSV format" do
 
       expect{
       PostgresUpsert.write(ThreeColumn, file, :header => true)
-      }.to raise_error (/Expected a unique column 'id'/)
+      }.to raise_error (/Expected column 'id'/)
     end
 
   end

data/spec/rails_helper.rb

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

data/spec/spec_helper.rb

@@ -2,15 +2,18 @@ $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 'fixtures/composite_key_model'
-require 'rspec'
 require 'rspec/rails'
 require 'rspec/autorun'
+require 'database_cleaner/active_record'
 
 RSpec.configure do |config|
-  #config.use_transactional_fixtures = false
+  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: 5.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: 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: rspec
+  name: pry-nav
   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'
 - !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: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 description: Uses Postgres's powerful COPY command to upsert large sets of data into
   ActiveRecord tables
 email: thestevemitchell@gmail.com
@@ -115,14 +143,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".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
@@ -131,6 +162,7 @@ files:
 - config/application.rb
 - config/boot.rb
 - config/database.yml
+- config/database.yml.travis
 - config/environment.rb
 - config/environments/development.rb
 - config/environments/production.rb
@@ -143,14 +175,21 @@ files:
 - db/schema.rb
 - db/seeds.rb
 - lib/postgres_upsert.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/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
@@ -167,30 +206,33 @@ 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/from_table_spec.rb
 - spec/pg_upsert_csv_spec.rb
+- 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.4.5
-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
@@ -199,6 +241,7 @@ test_files:
 - 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
@@ -215,6 +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/from_table_spec.rb
 - spec/pg_upsert_csv_spec.rb
+- spec/rails_helper.rb
 - spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.1.0