Skip to content

Commit 412d59e

Browse files
authored
Merge pull request #261 from yahonda/remove-obsolete-oci8-patches
Remove obsolete ruby-oci8 2.0.3 TIMESTAMP patch
2 parents 5f3c0a9 + b40874b commit 412d59e

3 files changed

Lines changed: 3 additions & 32 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ or include gem in Gemfile if using bundler.
151151

152152
In addition install either ruby-oci8 (for MRI/YARV) or copy Oracle JDBC driver to $JRUBY_HOME/lib (for JRuby).
153153

154-
If you are using MRI Ruby implementation then you need to install ruby-oci8 gem (version 2.0.x or 2.1.x)
154+
If you are using MRI Ruby implementation then you need to install ruby-oci8 gem (version 2.1 or higher)
155155
as well as Oracle client, e.g. [Oracle Instant Client](http://www.oracle.com/technetwork/database/features/instant-client/index-097480.html).
156156

157157
If you are using JRuby then you need to download latest [Oracle JDBC driver](http://www.oracle.com/technetwork/database/enterprise-edition/jdbc-112010-090769.html) - either ojdbc7.jar for Java 8 and 7, ojdbc6.jar for Java 6, 7, 8 or ojdbc5.jar for Java 5. You can refer [the support matrix](http://www.oracle.com/technetwork/database/enterprise-edition/jdbc-faq-090281.html#01_03) for details.

lib/plsql/oci8_patches.rb

Lines changed: 0 additions & 25 deletions
This file was deleted.

lib/plsql/oci_connection.rb

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,9 @@
1414
raise LoadError, "ERROR: ruby-plsql could not load ruby-oci8 library. #{msg}"
1515
end
1616

17-
require "plsql/oci8_patches"
18-
1917
# check ruby-oci8 version
20-
required_oci8_version = [2, 0, 3]
21-
oci8_version_ints = OCI8::VERSION.scan(/\d+/).map { |s| s.to_i }
22-
if (oci8_version_ints <=> required_oci8_version) < 0
23-
raise LoadError, "ERROR: ruby-oci8 version #{OCI8::VERSION} is too old. Please install ruby-oci8 version #{required_oci8_version.join('.')} or later."
18+
if Gem::Version.new(OCI8::VERSION) < Gem::Version.new("2.1.0")
19+
raise LoadError, "ERROR: ruby-oci8 version #{OCI8::VERSION} is too old. Please install ruby-oci8 version 2.1.0 or later."
2420
end
2521

2622
module PLSQL

0 commit comments

Comments
 (0)