8000 Potential fix for race condition · activeadmin/activeadmin@92b44d0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 92b44d0

Browse files
deivid-rodriguezdeivid-rodriguez
committed
Potential fix for race condition
1 parent a655a01 commit 92b44d0

10 files changed

+65
-37
lines changed

‎Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ group :docs do
2323
end
2424

2525
gem "rails", "~> 6.0.0"
26-
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0.rc1", platform: :jruby
26+
gem "activerecord-jdbcsqlite3-adapter", git: "https://github.com/deivid-rodriguez/activerecord-jdbc-adapter", platform: :jruby
2727
gem "sqlite3", "~> 1.4", platform: :mri
2828

2929
gemspec path: "."

‎Gemfile.lock

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@ GIT
77
docile (~> 1.1)
88
simplecov-html (~> 0.10.0)
99

10+
GIT
11+
remote: https://github.com/deivid-rodriguez/activerecord-jdbc-adapter
12+
revision: 4a2728638c265e4694abc5adcc2922faec11c016
13+
specs:
14+
activerecord-jdbc-adapter (60.0.rc2-java)
15+
activerecord (~> 6.0.0)
16+
activerecord-jdbcsqlite3-adapter (60.0.rc2-java)
17+
activerecord-jdbc-adapter (= 60.0.rc2)
18+
jdbc-sqlite3 (~> 3.8, < 3.30)
19+
jdbc-sqlite3 (3.28.0)
20+
1021
PATH
1122
remote: .
1223
specs:
@@ -74,11 +85,6 @@ GEM
7485
activerecord (6.0.0)
7586
activemodel (= 6.0.0)
7687
activesupport (= 6.0.0)
77-
activerecord-jdbc-adapter (60.0.rc1-java)
78-
activerecord (~> 6.0.0.rc1)
79-
activerecord-jdbcsqlite3-adapter (60.0.rc1-java)
80-
activerecord-jdbc-adapter (= 60.0.rc1)
81-
jdbc-sqlite3 (~> 3.8, < 3.30)
8288
activestorage (6.0.0)
8389
actionpack (= 6.0.0)
8490
activejob (= 6.0.0)
@@ -204,7 +210,6 @@ GEM
204210
rack (>= 1.2.1)
205211
rake
206212
jasmine-core (2.9.1)
207-
jdbc-sqlite3 (3.28.0)
208213
jquery-rails (4.3.5)
209214
rails-dom-testing (>= 1, < 3)
210215
railties (>= 4.2.0)
@@ -412,7 +417,7 @@ PLATFORMS
412417

413418
DEPENDENCIES
414419
activeadmin!
415-
activerecord-jdbcsqlite3-adapter (~> 60.0.rc1)
420+
activerecord-jdbcsqlite3-adapter!
416421
apparition
417422
cancancan
418423
capybara (~> 3.14)

‎gemfiles/rails_50.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source "https://rubygems.org"
33
eval_gemfile(File.expand_path(File.join("..", "Gemfile.common"), __dir__))
44

55
gem "rails", "~> 5.0.7"
6-
gem "activerecord-jdbcsqlite3-adapter", "~> 50.0", platform: :jruby
6+
gem "activerecord-jdbcsqlite3-adapter", git: "https://github.com/deivid-rodriguez/activerecord-jdbc-adapter", branch: "50-stable", platform: :jruby
77
gem "sqlite3", "~> 1.3.6", platform: :mri
88

99
gemspec path: "../"

‎gemfiles/rails_50.gemfile.lock

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@ GIT
77
docile (~> 1.1)
88
simplecov-html (~> 0.10.0)
99

10+
GIT
11+
remote: https://github.com/deivid-rodriguez/activerecord-jdbc-adapter
12+
revision: a04d2a1fa9601067390ab2b09657970dbb40d058
13+
branch: 50-stable
14+
specs:
15+
activerecord-jdbc-adapter (50.4-java)
16+
activerecord (~> 5.0.0, >= 5.0.3)
17+
activerecord-jdbcsqlite3-adapter (50.4-java)
18+
activerecord-jdbc-adapter (= 50.4)
19+
jdbc-sqlite3 (~> 3.8, < 3.30)
20+
1021
PATH
1122
remote: ..
1223
specs:
@@ -62,11 +73,6 @@ GEM
6273
activemodel (= 5.0.7.2)
6374
activesupport (= 5.0.7.2)
6475
arel (~> 7.0)
65-
activerecord-jdbc-adapter (50.4-java)
66< F438 span class="diff-text-marker">-
activerecord (~> 5.0.0, >= 5.0.3)
67-
activerecord-jdbcsqlite3-adapter (50.4-java)
68-
activerecord-jdbc-adapter (= 50.4)
69-
jdbc-sqlite3 (~> 3.8, < 3.30)
7076
activesupport (5.0.7.2)
7177
concurrent-ruby (~> 1.0, >= 1.0.2)
7278
i18n (>= 0.7, < 2)
@@ -330,7 +336,7 @@ PLATFORMS
330336

331337
DEPENDENCIES
332338
activeadmin!
333-
activerecord-jdbcsqlite3-adapter (~> 50.0)
339+
activerecord-jdbcsqlite3-adapter!
334340
apparition
335341
cancancan
336342
capybara (~> 3.14)

‎gemfiles/rails_51.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source "https://rubygems.org"
33
eval_gemfile(File.expand_path(File.join("..", "Gemfile.common"), __dir__))
44

55
gem "rails", "~> 5.1.7"
6-
gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platform: :jruby
6+
gem "activerecord-jdbcsqlite3-adapter", git: "https://github.com/deivid-rodriguez/activerecord-jdbc-adapter", branch: "51-stable", platform: :jruby
77
gem "sqlite3", "~> 1.4", platform: :mri
88

99
gemspec path: "../"

‎gemfiles/rails_51.gemfile.lock

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@ GIT
77
docile (~> 1.1)
88
simplecov-html (~> 0.10.0)
99

10+
GIT
11+
remote: https://github.com/deivid-rodriguez/activerecord-jdbc-adapter
12+
revision: c26052fc98a0db8fc319a91686cfa585c818f5b0
13+
branch: 51-stable
14+
specs:
15+
activerecord-jdbc-adapter (51.4-java)
16+
activerecord (~> 5.1.0)
17+
activerecord-jdbcsqlite3-adapter (51.4-java)
18+
activerecord-jdbc-adapter (= 51.4)
19+
jdbc-sqlite3 (~> 3.8, < 3.30)
20+
1021
PATH
1122
remote: ..
1223
specs:
@@ -62,11 +73,6 @@ GEM
6273
activemodel (= 5.1.7)
6374
activesupport (= 5.1.7)
6475
arel (~> 8.0)
65-
activerecord-jdbc-adapter (51.4-java)
66-
activerecord (~> 5.1.0)
67-
activerecord-jdbcsqlite3-adapter (51.4-java)
68-
activerecord-jdbc-adapter (= 51.4)
69-
jdbc-sqlite3 (~> 3.8, < 3.30)
7076
activesupport (5.1.7)
7177
concurrent-ruby (~> 1.0, >= 1.0.2)
7278
i18n (>= 0.7, < 2)
@@ -330,7 +336,7 @@ PLATFORMS
330336

331337
DEPENDENCIES
332338
activeadmin!
333-
activerecord-jdbcsqlite3-adapter (~> 51.0)
339+
activerecord-jdbcsqlite3-adapter!
334340
apparition
335341
cancancan
336342
capybara (~> 3.14)

‎gemfiles/rails_52.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source "https://rubygems.org"
33
eval_gemfile(File.expand_path(File.join("..", "Gemfile.common"), __dir__))
44

55
gem "rails", "~> 5.2.3"
6-
gem "activerecord-jdbcsqlite3-adapter", "~> 52.0", platform: :jruby
6+
gem "activerecord-jdbcsqlite3-adapter", git: "https://github.com/deivid-rodriguez/activerecord-jdbc-adapter", branch: "52-stable", platform: :jruby
77
gem "sqlite3", "~> 1.4", platform: :mri
88

99
gemspec path: "../"

‎gemfiles/rails_52.gemfile.lock

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@ GIT
77
docile (~> 1.1)
88
simplecov-html (~> 0.10.0)
99

10+
GIT
11+
remote: https://github.com/deivid-rodriguez/activerecord-jdbc-adapter
12+
revision: b3bf1e882ee19cd890ff8648d210e3f791008376
13+
branch: 52-stable
14+
specs:
15+
activerecord-jdbc-adapter (52.3-java)
16+
activerecord (~> 5.2.0)
17+
activerecord-jdbcsqlite3-adapter (52.3-java)
18+
activerecord-jdbc-adapter (= 52.3)
19+
jdbc-sqlite3 (~> 3.8, < 3.30)
20+
1021
PATH
1122
remote: ..
1223
specs:
@@ -62,11 +73,6 @@ GEM
6273
activemodel (= 5.2.3)
6374
activesupport (= 5.2.3)
6475
arel (>= 9.0)
65-
activerecord-jdbc-adapter (52.3-java)
66-
activerecord (~> 5.2.0)
67-
activerecord-jdbcsqlite3-adapter (52.3-java)
68-
activerecord-jdbc-adapter (= 52.3)
69-
jdbc-sqlite3 (~> 3.8, < 3.30)
7076
activestorage (5.2.3)
7177
actionpack (= 5.2.3)
7278
activerecord (= 5.2.3)
@@ -338,7 +344,7 @@ PLATFORMS
338344

339345
DEPENDENCIES
340346
activeadmin!
341-
activerecord-jdbcsqlite3-adapter (~> 52.0)
347+
activerecord-jdbcsqlite3-adapter!
342348
apparition
343349
cancancan
344350
capybara (~> 3.14)

‎gemfiles/rails_60_turbolinks.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source "https://rubygems.org"
33
eval_gemfile(File.expand_path(File.join("..", "Gemfile.common"), __dir__))
44

55
gem "rails", "~> 6.0.0"
6-
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0.rc1", platform: :jruby
6+
gem "activerecord-jdbcsqlite3-adapter", git: "https://github.com/deivid-rodriguez/activerecord-jdbc-adapter", platform: :jruby
77
gem "sqlite3", "~> 1.4", platform: :mri
88

99
gem "turbolinks", "~> 5.2"

‎gemfiles/rails_60_turbolinks.gemfile.lock

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@ GIT
77
docile (~> 1.1)
88
simplecov-html (~> 0.10.0)
99

10+
GIT
11+
remote: https://github.com/deivid-rodriguez/activerecord-jdbc-adapter
12+
revision: 4a2728638c265e4694abc5adcc2922faec11c016
13+
specs:
14+
activerecord-jdbc-adapter (60.0.rc2-java)
15+
activerecord (~> 6.0.0)
16+
activerecord-jdbcsqlite3-adapter (60.0.rc2-java)
17+
activerecord-jdbc-adapter (= 60.0.rc2)
18+
jdbc-sqlite3 (~> 3.8, < 3.30)
19+
jdbc-sqlite3 (3.28.0)
20+
1021
PATH
1122
remote: ..
1223
specs:
@@ -74,11 +85,6 @@ GEM
7485
activerecord (6.0.0)
7586
activemodel (= 6.0.0)
7687
activesupport (= 6.0.0)
77-
activerecord-jdbc-adapter (60.0.rc1-java)
78-
activerecord (~> 6.0.0.rc1)
79-
activerecord-jdbcsqlite3-adapter (60.0.rc1-java)
80-
activerecord-jdbc-adapter (= 60.0.rc1)
81-
jdbc-sqlite3 (~> 3.8, < 3.30)
8288
activestorage (6.0.0)
8389
actionpack (= 6.0.0)
8490
activejob (= 6.0.0)
@@ -181,7 +187,6 @@ GEM
181187
rack (>= 1.2.1)
182188
rake
183189
jasmine-core (2.9.1)
184-
jdbc-sqlite3 (3.28.0)
185190
jquery-rails (4.3.5)
186191
rails-dom-testing (>= 1, < 3)
187192
railties (>= 4.2.0)
@@ -357,7 +362,7 @@ PLATFORMS
357362

358363
DEPENDENCIES
359364
activeadmin!
360-
activerecord-jdbcsqlite3-adapter (~> 60.0.rc1)
365+
activerecord-jdbcsqlite3-adapter!
361366
apparition
362367
cancancan
363368
capybara (~> 3.14)

0 commit comments

Comments
 (0)
0