Skip to content

Commit 240e14a

Browse files
committed
Merge remote-tracking branch 'upstream/52-stable' into merging_branch
2 parents 337b2d2 + 77f4056 commit 240e14a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+387
-442
lines changed

.travis.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,27 +54,27 @@ env:
5454
- DB=postgresql PREPARED_STATEMENTS=true INSERT_RETURNING=true
5555
- DB=sqlite3 PREPARED_STATEMENTS=false
5656
- DB=sqlite3 PREPARED_STATEMENTS=true
57-
#- DB=jndi PREPARED_STATEMENTS=false
58-
#- DB=jndi PREPARED_STATEMENTS=true
57+
- DB=jndi PREPARED_STATEMENTS=false
58+
- DB=jndi PREPARED_STATEMENTS=true
5959
matrix:
6060
allow_failures:
6161
- rvm: jruby-head
6262
include:
6363
# jruby-9.2
64-
- rvm: jruby-9.2.5.0
64+
- rvm: jruby-9.2.6.0
6565
env: DB=mysql2
66-
- rvm: jruby-9.2.5.0
66+
- rvm: jruby-9.2.6.0
6767
env: DB=postgresql
68-
- rvm: jruby-9.2.5.0
68+
- rvm: jruby-9.2.6.0
6969
env: DB=sqlite3
7070
# jruby-9.2 + Java 11
71-
- rvm: jruby-9.2.5.0
71+
- rvm: jruby-9.2.6.0
7272
env: DB=mysql2
7373
jdk: openjdk11
74-
- rvm: jruby-9.2.5.0
74+
- rvm: jruby-9.2.6.0
7575
env: DB=postgresql
7676
jdk: openjdk11
77-
- rvm: jruby-9.2.5.0
77+
- rvm: jruby-9.2.6.0
7878
env: DB=sqlite3
7979
jdk: openjdk11
8080
# jruby-head
@@ -92,9 +92,9 @@ matrix:
9292
mariadb: '10.1'
9393
env: DB=mariadb PREPARED_STATEMENTS=true
9494
# Rails test-suite :
95-
- env: DB=mysql2 TEST_PREFIX="rails:" AR_VERSION="v5.2.2" # PS off by default
96-
- env: DB=mysql2 TEST_PREFIX="rails:" AR_VERSION="v5.2.2" PREPARED_STATEMENTS=true
97-
- env: DB=mysql2 TEST_PREFIX="rails:" AR_VERSION="v5.2.2" DRIVER=MariaDB
98-
- env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.2.2" # PS on by default
99-
- env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.2.2" PREPARED_STATEMENTS=false
100-
- env: DB=sqlite3 TEST_PREFIX="rails:" AR_VERSION="v5.2.2"
95+
- env: DB=mysql2 TEST_PREFIX="rails:" AR_VERSION="v5.2.3" # PS off by default
96+
- env: DB=mysql2 TEST_PREFIX="rails:" AR_VERSION="v5.2.3" PREPARED_STATEMENTS=true
97+
- env: DB=mysql2 TEST_PREFIX="rails:" AR_VERSION="v5.2.3" DRIVER=MariaDB
98+
- env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.2.3" # PS on by default
99+
- env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.2.3" PREPARED_STATEMENTS=false
100+
- env: DB=sqlite3 TEST_PREFIX="rails:" AR_VERSION="v5.2.3"

Gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ end
5252

5353
group :rails do
5454
group :test do
55-
# FIX: Our test suite isn't ready to run in random order yet.
56-
gem 'minitest', '< 5.3.4', require: nil
55+
gem 'minitest', '~> 5.11.3', require: nil
5756
gem 'minitest-excludes', '~> 2.0.1', require: nil
5857
gem 'minitest-rg', require: nil
5958

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module Jdbc
22
module Postgres
3-
DRIVER_VERSION = '42.1.4'
3+
DRIVER_VERSION = '42.2.5'
44
VERSION = DRIVER_VERSION
55
end
66
end
-696 KB
Binary file not shown.
-692 KB
Binary file not shown.
-692 KB
Binary file not shown.
807 KB
Binary file not shown.
736 KB
Binary file not shown.
736 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module Jdbc
22
module SQLite3
3-
DRIVER_VERSION = '3.20.1'
3+
DRIVER_VERSION = '3.27.2.1'
44
VERSION = DRIVER_VERSION
55
end
66
end

0 commit comments

Comments
 (0)