Skip to content

Commit d82ef3b

Browse files
authored
Merge pull request #2155 from rammpeter/rammpeter_ojdbc11.jar
Support use of ojdbc11.jar
2 parents 0716281 + 75f54a0 commit d82ef3b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
# Oracle 11g client ojdbc6.jar is also compatible with Java 1.7
1717
# Oracle 12c Release 1 client provides ojdbc7.jar
1818
# Oracle 12c Release 2 client provides ojdbc8.jar
19-
ojdbc_jars = %w(ojdbc8.jar ojdbc7.jar ojdbc6.jar)
19+
# Oracle 21c provides ojdbc11.jar for Java 11 and above
20+
ojdbc_jars = %w(ojdbc11.jar ojdbc8.jar ojdbc7.jar ojdbc6.jar)
2021

2122
if !ENV_JAVA["java.class.path"]&.match?(Regexp.new(ojdbc_jars.join("|")))
2223
# On Unix environment variable should be PATH, on Windows it is sometimes Path

0 commit comments

Comments
 (0)