Skip to content

Support use of ojdbc11.jar #2155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 1, 2021
Merged

Support use of ojdbc11.jar #2155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
# Oracle 11g client ojdbc6.jar is also compatible with Java 1.7
# Oracle 12c Release 1 client provides ojdbc7.jar
# Oracle 12c Release 2 client provides ojdbc8.jar
ojdbc_jars = %w(ojdbc8.jar ojdbc7.jar ojdbc6.jar)
# Oracle 21c provides ojdbc11.jar for Java 11 and above
ojdbc_jars = %w(ojdbc11.jar ojdbc8.jar ojdbc7.jar ojdbc6.jar)

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