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

Commit fe6024b

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

8 files changed

+48
-29
lines changed

‎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-rod 8000 riguez/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: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ GIT
77
docile (~> 1.1)
88
simplecov-html (~> 0.10.0)
99

10+
remote: https://github.com/deivid-rodriguez/activerecord-jdbc-adapter
11+
revision: a04d2a1fa9601067390ab2b09657970dbb40d058
12+
branch: 50-stable
13+
specs:
14+
activerecord-jdbc-adapter (50.4-java)
15+
activerecord (~> 5.0.0, >= 5.0.3)
16+
activerecord-jdbcsqlite3-adapter (50.4-java)
17+
activerecord-jdbc-adapter (= 50.4)
18+
jdbc-sqlite3 (~> 3.8, < 3.30)
19+
1020
PATH
1121
remote: ..
1222
specs:
@@ -62,11 +72,6 @@ GEM
6272
activemodel (= 5.0.7.2)
6373
activesupport (= 5.0.7.2)
6474
arel (~> 7.0)
65-
activerecord-jdbc-adapter (50.4-java)
66-
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)
7075
activesupport (5.0.7.2)
7176
concurrent-ruby (~> 1.0, >= 1.0.2)
7277
i18n (>= 0.7, < 2)
@@ -330,7 +335,7 @@ PLATFORMS
330335

331336
DEPENDENCIES
332337
activeadmin!
333-
activerecord-jdbcsqlite3-adapter (~> 50.0)
338+
activerecord-jdbcsqlite3-adapter!
334339
apparition
335340
cancancan
336341
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: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ GIT
77
docile (~> 1.1)
88
simplecov-html (~> 0.10.0)
99

10+
remote: https://github.com/deivid-rodriguez/activerecord-jdbc-adapter
11+
revision: c26052fc98a0db8fc319a91686cfa585c818f5b0
12+
branch: 51-stable
13+
specs:
14+
activerecord-jdbc-adapter (51.4-java)
15+
activerecord (~> 5.1.0)
16+
activerecord-jdbcsqlite3-adapter (51.4-java)
17+
activerecord-jdbc-adapter (= 51.4)
18+
jdbc-sqlite3 (~> 3.8, < 3.30)
19+
1020
PATH
1121
remote: ..
1222
specs:
@@ -62,11 +72,6 @@ GEM
6272
activemodel (= 5.1.7)
6373
activesupport (= 5.1.7)
6474
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)
7075
activesupport (5.1.7)
7176
concurrent-ruby (~> 1.0, >= 1.0.2)
7277
i18n (>= 0.7, < 2)
@@ -330,7 +335,7 @@ PLATFORMS
330335

331336
DEPENDENCIES
332337
activeadmin!
333-
activerecord-jdbcsqlite3-adapter (~> 51.0)
338+
activerecord-jdbcsqlite3-adapter!
334339
apparition
335340
cancancan
336341
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: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ GIT
77
docile (~> 1.1)
88
simplecov-html (~> 0.10.0)
99

10+
remote: https://github.com/deivid-rodriguez/activerecord-jdbc-adapter
11+
revision: b3bf1e882ee19cd890ff8648d210e3f791008376
12+
branch: 52-stable
13+
specs:
14+
activerecord-jdbc-adapter (52.3-java)
15+
activerecord (~> 5.2.0)
16+
activerecord-jdbcsqlite3-adapter (52.3-java)
17+
activerecord-jdbc-adapter (= 52.3)
18+
jdbc-sqlite3 (~> 3.8, < 3.30)
19+
1020
PATH
1121
remote: ..
1222
specs:
@@ -62,11 +72,6 @@ GEM
6272
activemodel (= 5.2.3)
6373
activesupport (= 5.2.3)
6474
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)
7075
activestorage (5.2.3)
7176
actionpack (= 5.2.3)
7277
activerecord (= 5.2.3)
@@ -338,7 +343,7 @@ PLATFORMS
338343

339344
DEPENDENCIES
340345
activeadmin!
341-
activerecord-jdbcsqlite3-adapter (~> 52.0)
346+
activerecord-jdbcsqlite3-adapter!
342347
apparition
343348
cancancan
344349
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: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ GIT
77
docile (~> 1.1)
88
simplecov-html (~> 0.10.0)
99

10+
remote: https://github.com/deivid-rodriguez/activerecord-jdbc-adapter
11+
revision: 4a2728638c265e4694abc5adcc2922faec11c016
12+
specs:
13+
activerecord-jdbc-adapter (60.0.rc2-java)
14+
activerecord (~> 6.0.0)
15+
activerecord-jdbcsqlite3-adapter (60.0.rc2-java)
16+
activerecord-jdbc-adapter (= 60.0.rc2)
17+
jdbc-sqlite3 (~> 3.8, < 3.30)
18+
jdbc-sqlite3 (3.28.0)
19+
1020
PATH
1121
remote: ..
1222
specs:
@@ -74,11 +84,6 @@ GEM
7484
activerecord (6.0.0)
7585
activemodel (= 6.0.0)
7686
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)
8287
activestorage (6.0.0)
8388
actionpack (= 6.0.0)
8489
activejob (= 6.0.0)
@@ -181,7 +186,6 @@ GEM
181186
rack (>= 1.2.1)
182187
rake
183188
jasmine-core (2.9.1)
184-
jdbc-sqlite3 (3.28.0)
185189
jquery-rails (4.3.5)
186190
rails-dom-testing (>= 1, < 3)
187191
railties (>= 4.2.0)
@@ -357,7 +361,7 @@ PLATFORMS
357361

358362
DEPENDENCIES
359363
activeadmin!
360-
activerecord-jdbcsqlite3-adapter (~> 60.0.rc1)
364+
activerecord-jdbcsqlite3-adapter!
361365
apparition
362366
cancancan
363367
capybara (~> 3.14)

0 commit comments

Comments
 (0)
0