Restore rails < 5 mysql support (#78)

* Restore rails < 5 mysql support

* Fix rails 3 tests

Author: mberlanda

.travis.yml

@@ -22,7 +22,6 @@ env:
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - env: DB_ADAPTER=mysql
   include:
     - rvm: 2.2
       gemfile: gemfiles/rails_3.gemfile

FIXME.md

@@ -0,0 +1,92 @@
+bin/rails test /home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:336
+..F
+Failure:
+BulkInsertWorkerTest#test_adapter_dependent_Mysql2Spatial_methods [/home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:332]:
+--- expected
++++ actual
+@@ -1 +1 @@
+-"INSERT IGNORE INTO `testings` (`greeting`,`age`,`happy`,`created_at`,`updated_at`,`color`) VALUES ('Yo',15,FALSE,NULL,NULL,'chartreuse')"
++"INSERT IGNORE INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,0,NULL,NULL,'chartreuse')"
+bin/rails test /home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:317
+F
+Failure:
+BulkInsertWorkerTest#test_adapter_dependent_mysql_methods [/home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:292]:
+--- expected
++++ actual
+@@ -1 +1 @@
+-"INSERT IGNORE INTO `testings` (`greeting`,`age`,`happy`,`created_at`,`updated_at`,`color`) VALUES ('Yo',15,FALSE,NULL,NULL,'chartreuse')"
++"INSERT IGNORE INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,0,NULL,NULL,'chartreuse')"
+bin/rails test /home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:273
+F
+Failure:
+BulkInsertWorkerTest#test_adapter_dependent_mysql_methods_work_for_mysql2 [/home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:313]:
+--- expected
++++ actual
+@@ -1 +1 @@
+-"INSERT IGNORE INTO `testings` (`greeting`,`age`,`happy`,`created_at`,`updated_at`,`color`) VALUES ('Yo',15,FALSE,NULL,NULL,'chartreuse') ON DUPLICATE KEY UPDATE `greeting`=VALUES(`greeting`), `age`=VALUES(`age`), `happy`=VALUES(`happy`), `created_at`=VALUES(`created_at`), `updated_at`=VALUES(`updated_at`), `color`=VALUES(`color`)"
++"INSERT IGNORE INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,0,NULL,NULL,'chartreuse') ON DUPLICATE KEY UPDATE `greeting`=VALUES(`greeting`), `age`=VALUES(`age`), `happy`=VALUES(`happy`), `created_at`=VALUES(`created_at`), `updated_at`=VALUES(`updated_at`), `color`=VALUES(`color`)"
+bin/rails test /home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:296
+..F
+Failure:
+BulkInsertWorkerTest#test_adapter_dependent_sqlite3_methods_(with_lowercase_adapter_name) [/home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:427]:
+--- expected
++++ actual
+@@ -1 +1 @@
+-"INSERT OR IGNORE INTO `testings` (`greeting`,`age`,`happy`,`created_at`,`updated_at`,`color`) VALUES ('Yo',15,FALSE,NULL,NULL,'chartreuse')"
++"INSERT OR IGNORE INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,0,NULL,NULL,'chartreuse')"
+bin/rails test /home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:414
+......F
+Failure:
+BulkInsertWorkerTest#test_adapter_dependent_default_methods [/home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:266]:
+Expected: "Mysql2"
+  Actual: "SQLite"
+bin/rails test /home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:265
+F
+Failure:
+BulkInsertWorkerTest#test_adapter_dependent_postgresql_methods_(with_update_duplicates) [/home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:391]:
+--- expected
++++ actual
+@@ -1 +1 @@
+-"INSERT  INTO `testings` (`greeting`,`age`,`happy`,`created_at`,`updated_at`,`color`) VALUES ('Yo',15,FALSE,NULL,NULL,'chartreuse') ON CONFLICT(greeting, age, happy) DO UPDATE SET greeting=EXCLUDED.greeting, age=EXCLUDED.age, happy=EXCLUDED.happy, created_at=EXCLUDED.created_at, updated_at=EXCLUDED.updated_at, color=EXCLUDED.color RETURNING id"
++"INSERT  INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,0,NULL,NULL,'chartreuse') ON CONFLICT(greeting, age, happy) DO UPDATE SET greeting=EXCLUDED.greeting, age=EXCLUDED.age, happy=EXCLUDED.happy, created_at=EXCLUDED.created_at, updated_at=EXCLUDED.updated_at, color=EXCLUDED.color RETURNING id"
+bin/rails test /home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:376
+F
+Failure:
+BulkInsertWorkerTest#test_adapter_dependent_PostGIS_methods [/home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:410]:
+--- expected
++++ actual
+@@ -1 +1 @@
+-"INSERT  INTO `testings` (`greeting`,`age`,`happy`,`created_at`,`updated_at`,`color`) VALUES ('Yo',15,FALSE,NULL,NULL,'chartreuse') ON CONFLICT DO NOTHING RETURNING id"
++"INSERT  INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,0,NULL,NULL,'chartreuse') ON CONFLICT DO NOTHING RETURNING id"
+bin/rails test /home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:395
+.F
+Failure:
+BulkInsertWorkerTest#test_adapter_dependent_postgresql_methods_(no_ignore,_no_update_duplicates) [/home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:372]:
+--- expected
++++ actual
+@@ -1 +1 @@
+-"INSERT  INTO `testings` (`greeting`,`age`,`happy`,`created_at`,`updated_at`,`color`) VALUES ('Yo',15,FALSE,NULL,NULL,'chartreuse') RETURNING id"
++"INSERT  INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,0,NULL,NULL,'chartreuse') RETURNING id"
+bin/rails test /home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:356
+.F
+Failure:
+BulkInsertWorkerTest#test_add_should_default_timestamp_columns_to_current_time [/home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:40]:
+Expected Sun, 07 Feb 2021 22:06:47 UTC +00:00 to be >= 2021-02-07 22:06:47 +0000.
+bin/rails test /home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:33
+....F
+Failure:
+BulkInsertWorkerTest#test_adapter_dependent_sqlite3_methods_(with_stylecase_adapter_name) [/home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:444]:
+--- expected
++++ actual
+@@ -1 +1 @@
+-"INSERT OR IGNORE INTO `testings` (`greeting`,`age`,`happy`,`created_at`,`updated_at`,`color`) VALUES ('Yo',15,FALSE,NULL,NULL,'chartreuse')"
++"INSERT OR IGNORE INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,0,NULL,NULL,'chartreuse')"
+bin/rails test /home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:431
+....F
+Failure:
+BulkInsertWorkerTest#test_mysql_adapter_can_update_duplicates [/home/travis/build/jamis/bulk_insert/test/bulk_insert/worker_test.rb:462]:
+--- expected
++++ actual
+@@ -1 +1 @@
+-"INSERT  INTO `testings` (`greeting`,`age`,`happy`,`created_at`,`updated_at`,`color`) VALUES ('Yo',15,FALSE,NULL,NULL,'chartreuse') ON DUPLICATE KEY UPDATE `greeting`=VALUES(`greeting`), `age`=VALUES(`age`), `happy`=VALUES(`happy`), `created_at`=VALUES(`created_at`), `updated_at`=VALUES(`updated_at`), `color`=VALUES(`color`)"
++"INSERT  INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,0,NULL,NULL,'chartreuse') ON DUPLICATE KEY UPDATE `greeting`=VALUES(`greeting`), `age`=VALUES(`age`), `happy`=VALUES(`happy`), `created_at`=VALUES(`created_at`), `updated_at`=VALUES(`updated_at`), `color`=VALUES(`color`)"

lib/bulk_insert/worker.rb

@@ -93,8 +93,19 @@ def save!
 
     def execute_query
       if query = compose_insert_query
-        result_set = @connection.exec_query(query)
-        @result_sets.push(result_set) if @return_primary_keys
+
+        # Return primary key support broke mysql compatibility
+        # with rails < 5 mysql adapter. (see issue #41)
+        if ActiveRecord::VERSION::STRING < "5.0.0" && @statement_adapter.is_a?(StatementAdapters::MySQLAdapter)
+          # raise an exception for unsupported return_primary_keys
+          raise ArgumentError.new("BulkInsert does not support @return_primary_keys for mysql and rails < 5") if @return_primary_keys
+
+          # restore v1.6 query execution
+          @connection.execute(query)
+        else
+          result_set = @connection.exec_query(query)
+          @result_sets.push(result_set) if @return_primary_keys
+        end
       end
     end
 

test/bulk_insert/worker_test.rb

@@ -147,6 +147,10 @@ class BulkInsertWorkerTest < ActiveSupport::TestCase
       true
     )
 
+    # return_primary_keys is not supported for mysql and rails < 5
+    # skip is not supported in the minitest version used for testing rails 3
+    return if ActiveRecord::VERSION::STRING < "5.0.0" && worker.adapter_name =~ /^mysql/i
+
     assert_no_difference -> { worker.result_sets.count } do
       worker.save!
     end

test/bulk_insert_test.rb

@@ -30,8 +30,16 @@ class BulkInsertTest < ActiveSupport::TestCase
   test "with option to return primary keys, worker should have result sets" do
     worker = Testing.bulk_insert(return_primary_keys: true)
     worker.add greeting: "yo"
-    worker.save!
-    assert_equal 1, worker.result_sets.count
+
+    # return_primary_keys is not supported for mysql and rails < 5
+    # this test ensures that the case is covered in the CI and handled as expected
+    if ActiveRecord::VERSION::STRING < "5.0.0" && worker.adapter_name =~ /^mysql/i
+      error = assert_raise(ArgumentError) { worker.save! }
+      assert_equal error.message, "BulkInsert does not support @return_primary_keys for mysql and rails < 5"
+    else
+      worker.save!
+      assert_equal 1, worker.result_sets.count
+    end
   end
 
   test "bulk_insert with array should save the array immediately" do