Fixed @jamis remarks in pull request #19

Author: mberlanda

Rakefile

@@ -14,11 +14,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
-
-
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'

lib/bulk_insert/worker.rb

@@ -76,8 +76,6 @@ def save!
       self
     end
 
-    private
-
     def compose_insert_query
       sql = insert_sql_statement
       @now = Time.now
@@ -104,14 +102,12 @@ def compose_insert_query
     end
 
     def insert_sql_statement
-      ignore = nil
-      ignore = 'IGNORE' if (adapter_name == 'MySQL') && @ignore
-      "INSERT #{ignore} INTO #{@table_name} (#{@column_names}) VALUES "
+      insert_ignore = 'IGNORE' if (adapter_name == 'MySQL') && ignore
+      "INSERT #{insert_ignore} INTO #{@table_name} (#{@column_names}) VALUES "
     end
 
     def on_conflict_statement
-      return ' ON CONFLICT DO NOTHING' if (adapter_name == 'PostgreSQL') && @ignore
-      ''
+      (adapter_name == 'PostgreSQL') && ignore ? ' ON CONFLICT DO NOTHING' : ''
     end
   end
 end

test/bulk_insert/worker_test.rb

@@ -173,7 +173,7 @@ class BulkInsertWorkerTest < ActiveSupport::TestCase
 
     mysql_worker.add ["Yo", 15, false, nil, nil]
 
-    assert_equal mysql_worker.send(:compose_insert_query), "INSERT IGNORE INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,'f',NULL,NULL,'chartreuse')"
+    assert_equal mysql_worker.compose_insert_query, "INSERT IGNORE INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,'f',NULL,NULL,'chartreuse')"
   end
 
   test "adapter dependent postgresql methods" do
@@ -186,7 +186,7 @@ class BulkInsertWorkerTest < ActiveSupport::TestCase
     pgsql_worker.adapter_name = 'PostgreSQL'
     pgsql_worker.add ["Yo", 15, false, nil, nil]
 
-    assert_equal pgsql_worker.send(:compose_insert_query), "INSERT  INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,'f',NULL,NULL,'chartreuse') ON CONFLICT DO NOTHING"
+    assert_equal pgsql_worker.compose_insert_query, "INSERT  INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,'f',NULL,NULL,'chartreuse') ON CONFLICT DO NOTHING"
 
   end
 end