bulk_insert 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74b626a311a11e7f61ebe3fa74b0a974d2be0450
-  data.tar.gz: ec3319157ee2067572762405ee7c402bd5195f47
+  metadata.gz: da3b8a0be5e2ad8c7dcf5bbf878cc31383d1e63e
+  data.tar.gz: 0c8f3ce86746632b0cdf34fec6c9c8021574aa8b
 SHA512:
-  metadata.gz: c743e409a275b4c5ee2f9d5921cf0d5c670968b806ac73978286775886437e97049c8db99204af09b1c6ebc1210f5c9da7de97eda8e2fe7bacb4699a9ca76c9c
-  data.tar.gz: dc6aa25046f0fd2fc907ae7614b1efd3552d85bf9fe019e144af487175734914f9b875ecfea263366f58590d113824923251a4b348677b8305c2a7b75b08768a
+  metadata.gz: b6c9b2dce1635af1c59f34dffd49c1d276d68478222ab0ca8f1941ac2333e7196f2bc7e1ce9425b9c5ed4f1b43828ea8d3c3f51cda45498a7b744d15cfbfc26e
+  data.tar.gz: ef556ebbf06358c534f3f0292ff5a4d2f53102a2c5faf1f22362964c8361f224ed932d54a27d24df397766de7f68c66eec6bbfa1014de505623b9199111e554f

data/lib/bulk_insert/version.rb

@@ -1,7 +1,7 @@
 module BulkInsert
   MAJOR = 1
-  MINOR = 2
-  TINY  = 1
+  MINOR = 3
+  TINY  = 0
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/lib/bulk_insert/worker.rb

@@ -2,6 +2,7 @@ module BulkInsert
   class Worker
     attr_reader :connection
     attr_accessor :set_size
+    attr_accessor :after_save_callback
 
     def initialize(connection, table_name, column_names, set_size=500)
       @connection = connection
@@ -14,6 +15,8 @@ module BulkInsert
       @table_name = connection.quote_table_name(table_name)
       @column_names = column_names.map { |name| connection.quote_column_name(name) }.join(",")
 
+      @after_save_callback = nil
+
       @set = []
     end
 
@@ -53,6 +56,10 @@ module BulkInsert
       self
     end
 
+    def after_save(&block)
+      @after_save_callback = block
+    end
+
     def save!
       if pending?
         sql = "INSERT INTO #{@table_name} (#{@column_names}) VALUES "
@@ -77,6 +84,8 @@ module BulkInsert
         sql << rows.join(",")
         @connection.execute(sql)
 
+        @after_save_callback.() if @after_save_callback
+
         @set.clear
       end
 

data/test/bulk_insert/worker_test.rb

@@ -120,5 +120,35 @@ class BulkInsertWorkerTest < ActiveSupport::TestCase
     assert_equal 25, hello.age
     assert_equal true, hello.happy?
   end
+
+  test "save! calls the after_save handler" do
+    x = 41
+
+    @insert.after_save do
+      x += 1
+    end
+
+    @insert.add ["Yo", 15, false, @now, @now]
+    @insert.add ["Hello", 25, true, @now, @now]
+    @insert.save!
+
+    assert_equal 42, x
+  end
+
+  test "after_save stores a block as a proc" do
+    @insert.after_save do
+      "hello"
+    end
+
+    assert_equal "hello", @insert.after_save_callback.()
+  end
+
+  test "after_save_callback can be set as a proc" do
+    @insert.after_save_callback = -> do
+      "hello"
+    end
+
+    assert_equal "hello", @insert.after_save_callback.()
+  end
 end
 

data/test/dummy/log/test.log

@@ -2965,3 +2965,146 @@ BulkInsertWorkerTest: test_add_should_allow_values_given_as_Hash
    (0.2ms)  INSERT INTO "testings" ("greeting","age","happy","created_at","updated_at","color") VALUES ('Yo',20,'f','2016-08-11 04:58:10.687048','2016-08-11 04:58:10.687048','chartreuse')
   Testing Load (0.1ms)  SELECT  "testings".* FROM "testings"  ORDER BY "testings"."id" ASC LIMIT 1
    (0.2ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+---------------------------------------------------------------------
+BulkInsertTest: test_bulk_insert_with_block_should_save_automatically
+---------------------------------------------------------------------
+   (0.3ms)  SELECT COUNT(*) FROM "testings"
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.6ms)  INSERT INTO "testings" ("greeting","age","happy","created_at","updated_at","color") VALUES ('Hello',NULL,NULL,'2016-11-01 17:59:20.883249','2016-11-01 17:59:20.883249','chartreuse')
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SELECT COUNT(*) FROM "testings"
+   (0.3ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------------------------------
+BulkInsertTest: test_bulk_insert_with_block_should_yield_worker
+---------------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------------------------------
+BulkInsertTest: test_default_bulk_columns_should_return_all_columns_without_id
+------------------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------------------------
+BulkInsertTest: test_bulk_insert_without_block_should_return_worker
+-------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------------
+BulkInsertTest: test_bulk_insert_with_array_should_save_the_array_immediately
+-----------------------------------------------------------------------------
+   (0.0ms)  SELECT COUNT(*) FROM "testings"
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.2ms)  INSERT INTO "testings" ("greeting","age","happy","created_at","updated_at","color") VALUES ('Hello',15,'t','green','2016-11-01 17:59:20.890598','chartreuse'),('Hey',20,'f','2016-11-01 17:59:20.890598','2016-11-01 17:59:20.890598','chartreuse')
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SELECT COUNT(*) FROM "testings"
+   (0.3ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------
+BulkInsertWorkerTest: test_explicit_nil_should_override_defaults
+----------------------------------------------------------------
+   (0.2ms)  INSERT INTO "testings" ("greeting","age","happy","created_at","updated_at","color") VALUES ('Hello',20,'f','2016-11-01 17:59:20.892761','2016-11-01 17:59:20.892761',NULL)
+  Testing Load (0.1ms)  SELECT  "testings".* FROM "testings"  ORDER BY "testings"."id" ASC LIMIT 1
+   (0.3ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------------------------------------
+BulkInsertWorkerTest: test_add_should_default_timestamp_columns_to_current_time
+-------------------------------------------------------------------------------
+   (0.2ms)  INSERT INTO "testings" ("greeting","age","happy","created_at","updated_at","color") VALUES ('Hello',15,'t','2016-11-01 17:59:20.898576','2016-11-01 17:59:20.898576','chartreuse')
+  Testing Load (0.1ms)  SELECT  "testings".* FROM "testings"  ORDER BY "testings"."id" ASC LIMIT 1
+   (0.3ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------------------------
+BulkInsertWorkerTest: test_add_should_save_automatically_when_overflowing_set_size
+----------------------------------------------------------------------------------
+   (0.2ms)  INSERT INTO "testings" ("greeting","age","happy","created_at","updated_at","color") VALUES ('Hello',15,'t','2016-11-01 17:59:20.900257','2016-11-01 17:59:20.900257','chartreuse')
+   (0.1ms)  SELECT COUNT(*) FROM "testings"
+  Testing Load (0.1ms)  SELECT  "testings".* FROM "testings"  ORDER BY "testings"."id" ASC LIMIT 1
+   (0.3ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------------------------------
+BulkInsertWorkerTest: test_save!_inserts_pending_records
+--------------------------------------------------------
+   (0.2ms)  INSERT INTO "testings" ("greeting","age","happy","created_at","updated_at","color") VALUES ('Yo',15,'f','2016-11-01 17:59:20.902554','2016-11-01 17:59:20.902554','chartreuse'),('Hello',25,'t','2016-11-01 17:59:20.902554','2016-11-01 17:59:20.902554','chartreuse')
+  Testing Load (0.1ms)  SELECT  "testings".* FROM "testings" WHERE "testings"."greeting" = ? LIMIT 1  [["greeting", "Yo"]]
+  Testing Load (0.0ms)  SELECT  "testings".* FROM "testings" WHERE "testings"."greeting" = ? LIMIT 1  [["greeting", "Hello"]]
+   (0.3ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------------------------------------
+BulkInsertWorkerTest: test_after_save_stores_a_block_as_a_proc
+--------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------------------------------------
+BulkInsertWorkerTest: test_after_save_callback_can_be_set_as_a_proc
+-------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------
+BulkInsertWorkerTest: test_save!_makes_insert_not_pending
+---------------------------------------------------------
+   (0.2ms)  INSERT INTO "testings" ("greeting","age","happy","created_at","updated_at","color") VALUES ('Hello',15,'t','2016-11-01 17:59:20.909065','2016-11-01 17:59:20.909065','chartreuse')
+   (0.3ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------------------------------------------
+BulkInsertWorkerTest: test_adding_row_to_insert_makes_insert_pending
+--------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------------------
+BulkInsertWorkerTest: test_add_should_allow_values_given_as_Hash
+----------------------------------------------------------------
+   (0.2ms)  INSERT INTO "testings" ("greeting","age","happy","created_at","updated_at","color") VALUES ('Yo',20,'f','2016-11-01 17:59:20.910787','2016-11-01 17:59:20.910787','chartreuse')
+  Testing Load (0.1ms)  SELECT  "testings".* FROM "testings"  ORDER BY "testings"."id" ASC LIMIT 1
+   (0.3ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------
+BulkInsertWorkerTest: test_empty_insert_is_not_pending
+------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------------------------------------
+BulkInsertWorkerTest: test_default_timestamp_columns_should_be_equivalent_for_the_entire_batch
+----------------------------------------------------------------------------------------------
+   (0.2ms)  INSERT INTO "testings" ("greeting","age","happy","created_at","updated_at","color") VALUES ('Hello',15,'t','2016-11-01 17:59:20.912730','2016-11-01 17:59:20.912730','chartreuse'),('Howdy',20,'f','2016-11-01 17:59:20.912730','2016-11-01 17:59:20.912730','chartreuse')
+  Testing Load (0.1ms)  SELECT "testings".* FROM "testings"
+   (0.3ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------------------
+BulkInsertWorkerTest: test_add_all_should_append_all_items_to_the_set
+---------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------
+BulkInsertWorkerTest: test_default_set_size
+-------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------------------
+BulkInsertWorkerTest: test_pending_count_should_describe_size_of_pending_set
+----------------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------------------
+BulkInsertWorkerTest: test_save!_calls_the_after_save_handler
+-------------------------------------------------------------
+   (0.2ms)  INSERT INTO "testings" ("greeting","age","happy","created_at","updated_at","color") VALUES ('Yo',15,'f','2016-11-01 17:59:20.915894','2016-11-01 17:59:20.915894','chartreuse'),('Hello',25,'t','2016-11-01 17:59:20.915894','2016-11-01 17:59:20.915894','chartreuse')
+   (0.2ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------------------------
+BulkInsertWorkerTest: test_save!_when_not_pending_should_do_nothing
+-------------------------------------------------------------------
+   (0.0ms)  SELECT COUNT(*) FROM "testings"
+   (0.0ms)  SELECT COUNT(*) FROM "testings"
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------------------------------
+BulkInsertWorkerTest: test_add_should_use_database_default_values_when_present
+------------------------------------------------------------------------------
+   (0.1ms)  INSERT INTO "testings" ("greeting","age","happy","created_at","updated_at","color") VALUES ('Hello',20,'f','2016-11-01 17:59:20.918117','2016-11-01 17:59:20.918117','chartreuse')
+  Testing Load (0.1ms)  SELECT  "testings".* FROM "testings"  ORDER BY "testings"."id" ASC LIMIT 1
+   (0.2ms)  rollback transaction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulk_insert
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Jamis Buck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord