Skip to content

Commit aa7d020

Browse files
committed
update Gemfile.lock and dummy application
1 parent 4313c04 commit aa7d020

File tree

4 files changed

+107
-95
lines changed

4 files changed

+107
-95
lines changed

Diff for: Gemfile.lock

+96-82
Original file line numberDiff line numberDiff line change
@@ -2,112 +2,126 @@ PATH
22
remote: .
33
specs:
44
bulk_insert (1.6.0)
5-
activerecord (>= 4.1.0)
5+
activerecord (>= 3.2.0)
66

77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
actionmailer (4.2.5)
11-
actionpack (= 4.2.5)
12-
actionview (= 4.2.5)
13-
activejob (= 4.2.5)
10+
actioncable (5.2.0)
11+
actionpack (= 5.2.0)
12+
nio4r (~> 2.0)
13+
websocket-driver (>= 0.6.1)
14+
actionmailer (5.2.0)
15+
actionpack (= 5.2.0)
16+
actionview (= 5.2.0)
17+
activejob (= 5.2.0)
1418
mail (~> 2.5, >= 2.5.4)
15-
rails-dom-testing (~> 1.0, >= 1.0.5)
16-
actionpack (4.2.5)
17-
actionview (= 4.2.5)
18-
activesupport (= 4.2.5)
19-
rack (~> 1.6)
20-
rack-test (~> 0.6.2)
21-
rails-dom-testing (~> 1.0, >= 1.0.5)
19+
rails-dom-testing (~> 2.0)
20+
actionpack (5.2.0)
21+
actionview (= 5.2.0)
22+
activesupport (= 5.2.0)
23+
rack (~> 2.0)
24+
rack-test (>= 0.6.3)
25+
rails-dom-testing (~> 2.0)
2226
rails-html-sanitizer (~> 1.0, >= 1.0.2)
23-
actionview (4.2.5)
24-
activesupport (= 4.2.5)
27+
actionview (5.2.0)
28+
activesupport (= 5.2.0)
2529
builder (~> 3.1)
26-
erubis (~> 2.7.0)
27-
rails-dom-testing (~> 1.0, >= 1.0.5)
28-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
29-
activejob (4.2.5)
30-
activesupport (= 4.2.5)
31-
globalid (>= 0.3.0)
32-
activemodel (4.2.5)
33-
activesupport (= 4.2.5)
34-
builder (~> 3.1)
35-
activerecord (4.2.5)
36-
activemodel (= 4.2.5)
37-
activesupport (= 4.2.5)
38-
arel (~> 6.0)
39-
activesupport (4.2.5)
40-
i18n (~> 0.7)
41-
json (~> 1.7, >= 1.7.7)
30+
erubi (~> 1.4)
31+
rails-dom-testing (~> 2.0)
32+
rails-html-sanitizer (~> 1.0, >= 1.0.3)
33+
activejob (5.2.0)
34+
activesupport (= 5.2.0)
35+
globalid (>= 0.3.6)
36+
activemodel (5.2.0)
37+
activesupport (= 5.2.0)
38+
activerecord (5.2.0)
39+
activemodel (= 5.2.0)
40+
activesupport (= 5.2.0)
41+
arel (>= 9.0)
42+
activestorage (5.2.0)
43+
actionpack (= 5.2.0)
44+
activerecord (= 5.2.0)
45+
marcel (~> 0.3.1)
46+
activesupport (5.2.0)
47+
concurrent-ruby (~> 1.0, >= 1.0.2)
48+
i18n (>= 0.7, < 2)
4249
minitest (~> 5.1)
43-
thread_safe (~> 0.3, >= 0.3.4)
4450
tzinfo (~> 1.1)
45-
arel (6.0.3)
46-
builder (3.2.2)
47-
concurrent-ruby (1.0.2)
48-
erubis (2.7.0)
49-
globalid (0.3.6)
50-
activesupport (>= 4.1.0)
51-
i18n (0.7.0)
52-
json (1.8.3)
53-
loofah (2.0.3)
51+
arel (9.0.0)
52+
builder (3.2.3)
53+
concurrent-ruby (1.0.5)
54+
crass (1.0.4)
55+
erubi (1.7.1)
56+
globalid (0.4.1)
57+
activesupport (>= 4.2.0)
58+
i18n (1.0.1)
59+
concurrent-ruby (~> 1.0)
60+
loofah (2.2.2)
61+
crass (~> 1.0.2)
5462
nokogiri (>= 1.5.9)
55-
mail (2.6.4)
56-
mime-types (>= 1.16, < 4)
57-
mime-types (3.0)
58-
mime-types-data (~> 3.2015)
59-
mime-types-data (3.2016.0221)
60-
mini_portile2 (2.0.0)
61-
minitest (5.8.4)
62-
nokogiri (1.6.7.2)
63-
mini_portile2 (~> 2.0.0.rc2)
64-
rack (1.6.4)
65-
rack-test (0.6.3)
66-
rack (>= 1.0)
67-
rails (4.2.5)
68-
actionmailer (= 4.2.5)
69-
actionpack (= 4.2.5)
70-
actionview (= 4.2.5)
71-
activejob (= 4.2.5)
72-
activemodel (= 4.2.5)
73-
activerecord (= 4.2.5)
74-
activesupport (= 4.2.5)
75-
bundler (>= 1.3.0, < 2.0)
76-
railties (= 4.2.5)
77-
sprockets-rails
78-
rails-deprecated_sanitizer (1.0.3)
79-
activesupport (>= 4.2.0.alpha)
80-
rails-dom-testing (1.0.7)
81-
activesupport (>= 4.2.0.beta, < 5.0)
82-
nokogiri (~> 1.6.0)
83-
rails-deprecated_sanitizer (>= 1.0.1)
84-
rails-html-sanitizer (1.0.3)
85-
loofah (~> 2.0)
86-
railties (4.2.5)
87-
actionpack (= 4.2.5)
88-
activesupport (= 4.2.5)
63+
mail (2.7.0)
64+
mini_mime (>= 0.1.1)
65+
marcel (0.3.2)
66+
mimemagic (~> 0.3.2)
67+
method_source (0.9.0)
68+
mimemagic (0.3.2)
69+
mini_mime (1.0.0)
70+
mini_portile2 (2.3.0)
71+
minitest (5.11.3)
72+
nio4r (2.3.1)
73+
nokogiri (1.8.3)
74+
mini_portile2 (~> 2.3.0)
75+
rack (2.0.5)
76+
rack-test (1.0.0)
77+
rack (>= 1.0, < 3)
78+
rails (5.2.0)
79+
actioncable (= 5.2.0)
80+
actionmailer (= 5.2.0)
81+
actionpack (= 5.2.0)
82+
actionview (= 5.2.0)
83+
activejob (= 5.2.0)
84+
activemodel (= 5.2.0)
85+
activerecord (= 5.2.0)
86+
activestorage (= 5.2.0)
87+
activesupport (= 5.2.0)
88+
bundler (>= 1.3.0)
89+
railties (= 5.2.0)
90+
sprockets-rails (>= 2.0.0)
91+
rails-dom-testing (2.0.3)
92+
activesupport (>= 4.2.0)
93+
nokogiri (>= 1.6)
94+
rails-html-sanitizer (1.0.4)
95+
loofah (~> 2.2, >= 2.2.2)
96+
railties (5.2.0)
97+
actionpack (= 5.2.0)
98+
activesupport (= 5.2.0)
99+
method_source
89100
rake (>= 0.8.7)
90101
thor (>= 0.18.1, < 2.0)
91-
rake (11.1.2)
92-
sprockets (3.6.0)
102+
rake (12.3.1)
103+
sprockets (3.7.2)
93104
concurrent-ruby (~> 1.0)
94105
rack (> 1, < 3)
95-
sprockets-rails (3.0.4)
106+
sprockets-rails (3.2.1)
96107
actionpack (>= 4.0)
97108
activesupport (>= 4.0)
98109
sprockets (>= 3.0.0)
99-
sqlite3 (1.3.10)
100-
thor (0.19.1)
101-
thread_safe (0.3.5)
102-
tzinfo (1.2.2)
110+
sqlite3 (1.3.13)
111+
thor (0.20.0)
112+
thread_safe (0.3.6)
113+
tzinfo (1.2.5)
103114
thread_safe (~> 0.1)
115+
websocket-driver (0.7.0)
116+
websocket-extensions (>= 0.1.0)
117+
websocket-extensions (0.1.3)
104118

105119
PLATFORMS
106120
ruby
107121

108122
DEPENDENCIES
109123
bulk_insert!
110-
rails (>= 4.2.0)
124+
rails (>= 3.2.0)
111125
sqlite3
112126

113127
BUNDLED WITH

Diff for: test/bulk_insert/worker_test.rb

+9-9
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ class BulkInsertWorkerTest < ActiveSupport::TestCase
266266
assert_equal @insert.insert_sql_statement, "INSERT INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES "
267267

268268
@insert.add ["Yo", 15, false, nil, nil]
269-
assert_equal @insert.compose_insert_query, "INSERT INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,'f',NULL,NULL,'chartreuse')"
269+
assert_equal @insert.compose_insert_query, "INSERT INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,0,NULL,NULL,'chartreuse')"
270270
end
271271

272272
test "adapter dependent mysql methods" do
@@ -286,7 +286,7 @@ class BulkInsertWorkerTest < ActiveSupport::TestCase
286286

287287
mysql_worker.add ["Yo", 15, false, nil, nil]
288288

289-
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')"
289+
assert_equal mysql_worker.compose_insert_query, "INSERT IGNORE INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,0,NULL,NULL,'chartreuse')"
290290
end
291291

292292
test "adapter dependent mysql methods work for mysql2" do
@@ -305,7 +305,7 @@ class BulkInsertWorkerTest < ActiveSupport::TestCase
305305

306306
mysql_worker.add ["Yo", 15, false, nil, nil]
307307

308-
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') 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`)"
308+
assert_equal mysql_worker.compose_insert_query, "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`)"
309309
end
310310

311311
test "adapter dependent Mysql2Spatial methods" do
@@ -322,7 +322,7 @@ class BulkInsertWorkerTest < ActiveSupport::TestCase
322322

323323
mysql_worker.add ["Yo", 15, false, nil, nil]
324324

325-
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')"
325+
assert_equal mysql_worker.compose_insert_query, "INSERT IGNORE INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,0,NULL,NULL,'chartreuse')"
326326
end
327327

328328
test "adapter dependent postgresql methods" do
@@ -339,7 +339,7 @@ class BulkInsertWorkerTest < ActiveSupport::TestCase
339339
pgsql_worker.adapter_name = 'PostgreSQL'
340340
pgsql_worker.add ["Yo", 15, false, nil, nil]
341341

342-
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 RETURNING id"
342+
assert_equal pgsql_worker.compose_insert_query, "INSERT INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,0,NULL,NULL,'chartreuse') ON CONFLICT DO NOTHING RETURNING id"
343343
end
344344

345345
test "adapter dependent PostGIS methods" do
@@ -356,7 +356,7 @@ class BulkInsertWorkerTest < ActiveSupport::TestCase
356356
pgsql_worker.adapter_name = 'PostGIS'
357357
pgsql_worker.add ["Yo", 15, false, nil, nil]
358358

359-
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 RETURNING id"
359+
assert_equal pgsql_worker.compose_insert_query, "INSERT INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,0,NULL,NULL,'chartreuse') ON CONFLICT DO NOTHING RETURNING id"
360360
end
361361

362362
test "adapter dependent sqlite3 methods (with lowercase adapter name)" do
@@ -370,7 +370,7 @@ class BulkInsertWorkerTest < ActiveSupport::TestCase
370370
sqlite_worker.adapter_name = 'sqlite3'
371371
sqlite_worker.add ["Yo", 15, false, nil, nil]
372372

373-
assert_equal sqlite_worker.compose_insert_query, "INSERT OR IGNORE INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,'f',NULL,NULL,'chartreuse')"
373+
assert_equal sqlite_worker.compose_insert_query, "INSERT OR IGNORE INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,0,NULL,NULL,'chartreuse')"
374374
end
375375

376376
test "adapter dependent sqlite3 methods (with stylecase adapter name)" do
@@ -384,7 +384,7 @@ class BulkInsertWorkerTest < ActiveSupport::TestCase
384384
sqlite_worker.adapter_name = 'SQLite'
385385
sqlite_worker.add ["Yo", 15, false, nil, nil]
386386

387-
assert_equal sqlite_worker.compose_insert_query, "INSERT OR IGNORE INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,'f',NULL,NULL,'chartreuse')"
387+
assert_equal sqlite_worker.compose_insert_query, "INSERT OR IGNORE INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,0,NULL,NULL,'chartreuse')"
388388
end
389389

390390
test "mysql adapter can update duplicates" do
@@ -399,6 +399,6 @@ class BulkInsertWorkerTest < ActiveSupport::TestCase
399399
mysql_worker.adapter_name = 'MySQL'
400400
mysql_worker.add ["Yo", 15, false, nil, nil]
401401

402-
assert_equal mysql_worker.compose_insert_query, "INSERT INTO \"testings\" (\"greeting\",\"age\",\"happy\",\"created_at\",\"updated_at\",\"color\") VALUES ('Yo',15,'f',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`)"
402+
assert_equal mysql_worker.compose_insert_query, "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`)"
403403
end
404404
end

Diff for: test/bulk_insert_test.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class BulkInsertTest < ActiveSupport::TestCase
3737
test "bulk_insert with array should save the array immediately" do
3838
assert_difference "Testing.count", 2 do
3939
Testing.bulk_insert values: [
40-
[ "Hello", 15, true, "green" ],
40+
[ "Hello", 15, true ],
4141
{ greeting: "Hey", age: 20, happy: false }
4242
]
4343
end

Diff for: test/dummy/config/application.rb

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ class Application < Rails::Application
1919
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
2020
# config.i18n.default_locale = :de
2121

22-
# Do not swallow errors in after_commit/after_rollback callbacks.
23-
config.active_record.raise_in_transactional_callbacks = true
22+
config.active_record.sqlite3.represent_boolean_as_integer = true
2423
end
2524
end
26-

0 commit comments

Comments
 (0)