postgres_upsert 3.1.0-java → 3.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 670c45802ef4d5b50510800787f75426181d0722
-  data.tar.gz: a249301be5d55ceaabc1d0d2606f834c65a51361
+  metadata.gz: 2a166fc5c6a14c11742339c30f2a5adac836d894
+  data.tar.gz: 88a1acf92267cd88e13f155af23d1d52ceadd2a8
 SHA512:
-  metadata.gz: 0341063e94b7cf9a64e3c35f5052d988eae2f93ac5aa8aa0255813312836176529d918c16d59cd1fe032391ac8482fe878c3162ea20a61073b0654faebb4b0c0
-  data.tar.gz: e1eada0840b8f2bf2999783cd1db72c153c8d2a11823789c2505f4da2902a08c10a976cc0a77b906f43e124d0cc5462f485096d3d4d1643e967b8184e31499c6
+  metadata.gz: 8f95b444a3d883d52e32272ee8af8f1763f1f13c8328f8c98f0bf196ba8eac79443a5ba1b0af53410111c827f86428cdb8cd1900397c07d318daf6c1b7a4f852
+  data.tar.gz: 18406dd2ba138d0e6acbe858af96e179f40b063d5ff463f2b22831cfae7495ff99dce22bf8d1031ddaabfc4a68dc2b3b3f9065dbf8e23c59a3af7e7c462098fd

data/.gitignore

@@ -8,6 +8,7 @@
 /test/tmp/
 /test/version_tmp/
 /tmp/
+/log
 
 ## Specific to RubyMotion:
 .dat*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    postgres_upsert (3.0.0-java)
+    postgres_upsert (3.1.0-java)
       activerecord (>= 3.0.0)
       activerecord-jdbcpostgresql-adapter
       rails (>= 3.0.0)
@@ -106,16 +106,25 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rdoc (4.2.0)
-      json (~> 1.4)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
       rspec-mocks (~> 2.99.0)
+    rspec-collection_matchers (1.1.2)
+      rspec-expectations (>= 2.99.0.beta1)
     rspec-core (2.99.2)
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.3)
+    rspec-rails (2.99.0)
+      actionpack (>= 3.0)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-collection_matchers
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
     sequel (4.19.0)
     slop (3.6.0)
     spoon (0.0.4)
@@ -142,5 +151,5 @@ DEPENDENCIES
   bundler
   postgres_upsert!
   pry-rails
-  rdoc
   rspec (~> 2.12)
+  rspec-rails (~> 2.0)

data/Rakefile

@@ -1,18 +1,6 @@
-# -*- encoding: utf-8 -*-
-$:.unshift File.expand_path("../lib", __FILE__)
-require 'bundler/gem_tasks'
-require 'rubygems'
-require 'rspec/core/rake_task'
-require 'rdoc/task'
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-task :default => :spec
+require File.expand_path('../config/application', __FILE__)
 
-RSpec::Core::RakeTask.new(:spec)
-
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "postgres_upsert #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+Rails.application.load_tasks

data/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

data/config/application.rb

@@ -0,0 +1,26 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
+module PostgresUpsert
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
+  end
+end

data/config/boot.rb

@@ -0,0 +1,3 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/config/database.yml

@@ -0,0 +1,22 @@
+# SQLite version 3.x
+#   gem 'activerecord-jdbcsqlite3-adapter'
+#
+# Configure Using Gemfile
+# gem 'activerecord-jdbcsqlite3-adapter'
+#
+default: &default
+  adapter: postgresql
+  host: localhost
+  port: 5432
+  pool: 5
+
+development:
+  <<: *default
+  database: ar_pg_copy_dev
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *default
+  database: ar_pg_copy_test

data/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the Rails application.
+require File.expand_path('../application', __FILE__)
+
+# Initialize the Rails application.
+Rails.application.initialize!

data/config/environments/development.rb

@@ -0,0 +1,41 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
+
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
+
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+end

data/config/environments/production.rb

@@ -0,0 +1,79 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # Code is not reloaded between requests.
+  config.cache_classes = true
+
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
+
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
+
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
+
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :debug
+
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [ :subdomain, :uuid ]
+
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
+
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation cannot be found).
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners.
+  config.active_support.deprecation = :notify
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
+end

data/config/environments/test.rb

@@ -0,0 +1,42 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # The test environment is used exclusively to run your application's
+  # test suite. You never need to work with it otherwise. Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs. Don't rely on the data there!
+  config.cache_classes = true
+
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
+  config.static_cache_control = 'public, max-age=3600'
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
+
+  # Print deprecation notices to the stderr.
+  config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+end

data/config/locales/en.yml

@@ -0,0 +1,23 @@
+# Files in the config/locales directory are used for internationalization
+# and are automatically loaded by Rails. If you want to use locales other
+# than English, add the necessary files in this directory.
+#
+# To use the locales, use `I18n.t`:
+#
+#     I18n.t 'hello'
+#
+# In views, this is aliased to just `t`:
+#
+#     <%= t('hello') %>
+#
+# To use a different locale, set it with `I18n.locale`:
+#
+#     I18n.locale = :es
+#
+# This would use the information in config/locales/es.yml.
+#
+# To learn more, please read the Rails Internationalization guide
+# available at http://guides.rubyonrails.org/i18n.html.
+
+en:
+  hello: "Hello world"

data/config/routes.rb

@@ -0,0 +1,56 @@
+Rails.application.routes.draw do
+  # The priority is based upon order of creation: first created -> highest priority.
+  # See how all your routes lay out with "rake routes".
+
+  # You can have the root of your site routed with "root"
+  # root 'welcome#index'
+
+  # Example of regular route:
+  #   get 'products/:id' => 'catalog#view'
+
+  # Example of named route that can be invoked with purchase_url(id: product.id)
+  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
+
+  # Example resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
+
+  # Example resource route with options:
+  #   resources :products do
+  #     member do
+  #       get 'short'
+  #       post 'toggle'
+  #     end
+  #
+  #     collection do
+  #       get 'sold'
+  #     end
+  #   end
+
+  # Example resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
+  # Example resource route with more complex sub-resources:
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get 'recent', on: :collection
+  #     end
+  #   end
+
+  # Example resource route with concerns:
+  #   concern :toggleable do
+  #     post 'toggle'
+  #   end
+  #   resources :posts, concerns: :toggleable
+  #   resources :photos, concerns: :toggleable
+
+  # Example resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
+end

data/config/secrets.yml

@@ -0,0 +1,22 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+development:
+  secret_key_base: 8264e1ad58136b3cc4d88529894ff4372de655b520b09ecb244ccf9a4777eb8cfe29dae848a56a04b3cdc0e4dae9152efd630943c3447ab048b04cc4149e8427
+
+test:
+  secret_key_base: 5ee4bb64e4cd7b273a957d7ab0049c7f120103728f8702ba03007a828e95ce0816c2b8f13e7b4b3381950ed6e8981a464f268c1f43d96b0b365b591254368737
+
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

data/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment', __FILE__)
+run Rails.application

data/db/migrate/20150214192135_create_test_tables.rb

@@ -0,0 +1,19 @@
+class CreateTestTables < ActiveRecord::Migration
+  def change
+    create_table :test_models do |t|
+      t.string :data
+      t.timestamps
+    end
+
+    create_table :three_columns do |t|
+      t.string :data
+      t.string :extra
+      t.timestamps
+    end
+
+    create_table :reserved_word_models do |t|
+      t.string :select
+      t.string :group
+    end
+  end
+end

data/db/schema.rb

@@ -0,0 +1,28 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20150214192135) do
+
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+# Could not dump table "reserved_word_models" because of following NoMethodError
+#   undefined method `[]' for nil:NilClass
+
+# Could not dump table "test_models" because of following NoMethodError
+#   undefined method `[]' for nil:NilClass
+
+# Could not dump table "three_columns" because of following NoMethodError
+#   undefined method `[]' for nil:NilClass
+
+end

data/db/seeds.rb

@@ -0,0 +1,7 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#
+#   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
+#   Mayor.create(name: 'Emanuel', city: cities.first)

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(table_name, path_or_io, options).write
+      PostgresUpsert::Writer.new(self, path_or_io, options).write
     end
   end
 end

data/lib/postgres_upsert/writer.rb

@@ -1,17 +1,15 @@
-require 'sequel'
-
 
 module PostgresUpsert
 
   class Writer
 
-    def initialize(table_name, source, options = {})
-      @table_name = table_name
+    def initialize(klass, source, options = {})
+      @klass = klass
       @options = options.reverse_merge({
         :delimiter => ",", 
         :format => :csv, 
         :header => true, 
-        :key_column => primary_key,
+        :key_column => @klass.primary_key,
         :update_only => false})
       @source = source.instance_of?(String) ? File.open(source, 'r') : source
       @columns_list = get_columns
@@ -19,6 +17,8 @@ module PostgresUpsert
     end
 
     def write
+      import org.postgresql.copy.CopyManager
+
       if @columns_list.empty? 
         raise "Either the :columns option or :header => true are required"
       end
@@ -28,55 +28,27 @@ module PostgresUpsert
       copy_table = @temp_table_name
 
       columns_string = columns_string_for_copy
+      
+      ActiveRecord::Base.connection_pool.with_connection do |conn|
 
-      base_connection = Sequel.connect(ActiveRecord::Base.connection.config[:url])
-
-      base_connection.synchronize do |connection|
-        create_temp_table(connection)
-        copy_manager = org.postgresql.copy.CopyManager.new(connection)
+        create_temp_table(conn)
+        copy_manager = CopyManager.new(conn.raw_connection.connection)
         stream = copy_manager.copy_in("COPY #{copy_table} #{columns_string} FROM STDIN WITH #{csv_options}")
+        
         while line = read_input_line do
           next if line.strip.size == 0
           line = line.to_java_bytes
           stream.write_to_copy(line, 0, line.length)
         end
         stream.end_copy
-        upsert_from_temp_table(connection)
-        drop_temp_table(connection)
+        upsert_from_temp_table(conn)
+        drop_temp_table(conn)
       end
 
     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]
@@ -97,23 +69,23 @@ module PostgresUpsert
 
     def columns_string_for_select
       columns = @columns_list.clone
-      columns << "created_at" if column_names.include?("created_at")
-      columns << "updated_at" if column_names.include?("updated_at")
+      columns << "created_at" if @klass.column_names.include?("created_at")
+      columns << "updated_at" if @klass.column_names.include?("updated_at")
       str = get_columns_string(columns)
     end
 
     def columns_string_for_insert
       columns = @columns_list.clone
-      columns << "created_at" if column_names.include?("created_at")
-      columns << "updated_at" if column_names.include?("updated_at")
+      columns << "created_at" if @klass.column_names.include?("created_at")
+      columns << "updated_at" if @klass.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 column_names.include?("created_at")
-      str << ",'#{DateTime.now.utc}'" if column_names.include?("updated_at")
+      str << ",'#{DateTime.now.utc}'" if @klass.column_names.include?("created_at")
+      str << ",'#{DateTime.now.utc}'" if @klass.column_names.include?("updated_at")
       str
     end
 
@@ -128,12 +100,16 @@ module PostgresUpsert
       columns.size > 0 ? "\"#{columns.join('","')}\"" : ""
     end
 
-    def quoted_table_name
-      @quoted_table_name ||= ActiveRecord::Base.connection.quote_table_name(@table_name)
+    def get_table_name
+      if @options[:table]
+        connection.quote_table_name(@options[:table])
+      else
+        @klass.quoted_table_name
+      end
     end
 
     def generate_temp_table_name
-      @temp_table_name = "#{@table_name}_temp_#{rand(1000)}"
+      @temp_table_name = "#{@klass.table_name}_temp_#{rand(1000)}"
     end
 
     def read_input_line
@@ -148,14 +124,14 @@ module PostgresUpsert
       end
     end
 
-    def upsert_from_temp_table(connection)
-      update_from_temp_table(connection)
-      insert_from_temp_table(connection) unless @options[:update_only]
+    def upsert_from_temp_table(conn)
+      update_from_temp_table(conn)
+      insert_from_temp_table(conn) unless @options[:update_only]
     end
 
-    def update_from_temp_table(connection)
-      connection.execSQLUpdate <<-SQL
-        UPDATE #{quoted_table_name} AS d
+    def update_from_temp_table(conn)
+      conn.execute <<-SQL
+        UPDATE #{get_table_name} AS d
           #{update_set_clause}
           FROM #{@temp_table_name} as t
           WHERE t.#{@options[:key_column]} = d.#{@options[:key_column]}
@@ -167,38 +143,38 @@ module PostgresUpsert
       command = @columns_list.map do |col|
         "\"#{col}\" = t.\"#{col}\""
       end
-      command << "\"updated_at\" = '#{DateTime.now.utc}'" if column_names.include?("updated_at")
+      command << "\"updated_at\" = '#{DateTime.now.utc}'" if @klass.column_names.include?("updated_at")
       "SET #{command.join(',')}"
     end
 
-    def insert_from_temp_table(connection)
+    def insert_from_temp_table(conn)
       columns_string = columns_string_for_insert
       select_string = select_string_for_insert
-      connection.execSQLUpdate <<-SQL
-        INSERT INTO #{quoted_table_name} (#{columns_string})
+      conn.execute <<-SQL
+        INSERT INTO #{get_table_name} (#{columns_string})
           SELECT #{select_string}
           FROM #{@temp_table_name} as t
           WHERE NOT EXISTS 
             (SELECT 1 
-                  FROM #{quoted_table_name} as d 
+                  FROM #{get_table_name} as d 
                   WHERE d.#{@options[:key_column]} = t.#{@options[:key_column]})
           AND t.#{@options[:key_column]} IS NOT NULL;
       SQL
     end
 
-    def create_temp_table(connection)
+    def create_temp_table(conn)
       columns_string = select_string_for_create
-      connection.execSQLUpdate <<-SQL
+      conn.execute <<-SQL
         SET client_min_messages=WARNING;
         DROP TABLE IF EXISTS #{@temp_table_name};
 
         CREATE TEMP TABLE #{@temp_table_name} 
-          AS SELECT #{columns_string} FROM #{quoted_table_name} WHERE 0 = 1;
+          AS SELECT #{columns_string} FROM #{get_table_name} WHERE 0 = 1;
       SQL
     end
 
-    def drop_temp_table(connection)
-      connection.execSQLUpdate <<-SQL
+    def drop_temp_table(conn)
+      conn.execute <<-SQL
         DROP TABLE #{@temp_table_name} 
       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 = "3.1.0"
+  s.version = "3.2.0"
 
   s.platform    = 'java'
   s.authors = ["Steve Mitchell"]
@@ -27,8 +27,8 @@ Gem::Specification.new do |s|
   s.add_dependency "activerecord", '>= 3.0.0'
   s.add_dependency "rails", '>= 3.0.0'
   s.add_development_dependency "bundler"
-  s.add_development_dependency "rdoc"
   s.add_development_dependency "pry-rails"
   s.add_development_dependency "rspec", "~> 2.12"
+  s.add_development_dependency "rspec-rails", "~> 2.0"
 end
 

data/spec/pg_upsert_binary_spec.rb

@@ -1,12 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "pg_upsert from file with binary data" do
-  before(:each) do
-    ActiveRecord::Base.connection.execute %{
-      TRUNCATE TABLE test_models;
-      SELECT setval('test_models_id_seq', 1, false);
-    }
-  end
 
   before do
     DateTime.stub(:now).and_return (DateTime.parse("2012-01-01").utc)

data/spec/pg_upsert_csv_spec.rb

@@ -180,7 +180,7 @@ describe "pg_upsert from file with CSV format" do
       ThreeColumn.pg_upsert(file, :key_column => "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
   end
 

data/spec/spec_helper.rb

@@ -1,43 +1,15 @@
 $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/three_column'
 require 'fixtures/reserved_word_model'
 require 'rspec'
+require 'rspec/rails'
 require 'rspec/autorun'
 
 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",
-        :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",
-        :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
-  end
-
+  #config.use_transactional_fixtures = false
+  config.expose_current_running_example_as :example
+  config.infer_spec_type_from_file_location!
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postgres_upsert
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: java
 authors:
 - Steve Mitchell
@@ -81,7 +81,7 @@ dependencies:
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: pry-rails
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -95,31 +95,31 @@ dependencies:
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: pry-rails
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-rails
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.0'
   prerelease: false
   type: :development
 description: Uses Postgres's powerful COPY command to upsert large sets of data into ActiveRecord tables
@@ -135,6 +135,24 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- bin/bundle
+- bin/rails
+- bin/rake
+- bin/setup
+- config.ru
+- config/application.rb
+- config/boot.rb
+- config/database.yml
+- 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/schema.rb
+- db/seeds.rb
 - lib/postgres_upsert.rb
 - lib/postgres_upsert/active_record.rb
 - lib/postgres_upsert/writer.rb