activerecord-oracle_enhanced-adapter 5.2.5 → 5.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96c7fa4de066e2d4d2492b064971617ba8e620ca29ed9e96a7f047dd83891f70
-  data.tar.gz: bfc5981760050745f599322e94818052973a51e8348a3419b8ed588862472545
+  metadata.gz: 7d5b394e21a47693fd91ae861de7fbe948c2ccf8adff47aa75e66f04a712e19a
+  data.tar.gz: 94709d26f51820edf61471555b745a5a0b0ca17e6be87279bfc163a87c8ec911
 SHA512:
-  metadata.gz: 4a25dbb40fd9e61d160013dce15a4854401aa5ef2d93afe3175fe9b448e2ed1710c26566693fd0a14c5ad9603fa61077501bc873348cd6e32b990c60aa3877aa
-  data.tar.gz: 2b423eac2b473ea34a32e641936baa308be3e3daa81f8fe5f6a3e21ea7a83bdb8c79306c72a531d5d197e5e244a81b75f5b2831ba6c72be1c3de6f563a798233
+  metadata.gz: 423800f0ebcc07628eea06e1af00544aac8302c6ca0709ef93b4a52827a0ee5c67a50208f5d16a2eb1b763a5a7d690f4ba1df7902f1c9e2eb276d06387dc6e42
+  data.tar.gz: fd6986f2103ce6559a3ff7e212b312030b8740c5e01569988631f489f196d7e3f1e6341e9e07eea56040d4a17b9f6036bf78a2744cdc1126f7a1a7ae4c3ce863

data/History.md

@@ -1,3 +1,10 @@
+## 5.2.5 / 2019-05-17
+
+* Changes and bug fixes
+  * Add TCP keepalive and TCP keepalive time configurations [#1874 #1878]
+  * CI against Ruby 2.6.2 and 2.5.5 #1849
+  * CI against Ruby 2.4.6 #1858
+
 ## 5.2.5 / 2019-03-05
 
 * Changes and bug fixes

data/VERSION

@@ -1 +1 @@
-5.2.5
+5.2.6

data/lib/active_record/connection_adapters/oracle_enhanced/oci_connection.rb

@@ -285,6 +285,8 @@ module ActiveRecord
       # The OracleEnhancedOCIFactory factors out the code necessary to connect and
       # configure an Oracle/OCI connection.
       class OracleEnhancedOCIFactory #:nodoc:
+        DEFAULT_TCP_KEEPALIVE_TIME = 600
+
         def self.new_connection(config)
           # to_s needed if username, password or database is specified as number in database.yml file
           username = config[:username] && config[:username].to_s
@@ -314,11 +316,13 @@ module ActiveRecord
           else
             database
           end
-          OCI8.properties[:tcp_keepalive] = true
+
+          OCI8.properties[:tcp_keepalive] = config[:tcp_keepalive] == false ? false : true
           begin
-            OCI8.properties[:tcp_keepalive_time] = 600
+            OCI8.properties[:tcp_keepalive_time] = config[:tcp_keepalive_time] || DEFAULT_TCP_KEEPALIVE_TIME
           rescue NotImplementedError
           end
+
           conn = OCI8.new username, password, connection_string, privilege
           conn.autocommit = true
           conn.non_blocking = true if async

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -115,6 +115,8 @@ module ActiveRecord
     # * <tt>:time_zone</tt> - database session time zone
     #   (it is recommended to set it using ENV['TZ'] which will be then also used for database session time zone)
     # * <tt>:schema</tt> - database schema which holds schema objects.
+    # * <tt>:tcp_keepalive</tt> - TCP keepalive is enabled for OCI client, defaults to true
+    # * <tt>:tcp_keepalive_time</tt> - TCP keepalive time for OCI client, defaults to 600
     #
     # Optionals NLS parameters:
     #

data/spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb

@@ -122,6 +122,34 @@ describe "OracleEnhancedConnection" do
     end
   end
 
+  if defined?(OCI8)
+    describe "with TCP keepalive parameters" do
+      it "should use database default `tcp_keepalive` value true by default" do
+        ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(CONNECTION_PARAMS)
+
+        expect(OCI8.properties[:tcp_keepalive]).to be true
+      end
+
+      it "should use modified `tcp_keepalive` value false" do
+        ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(CONNECTION_PARAMS.dup.merge(tcp_keepalive: false))
+
+        expect(OCI8.properties[:tcp_keepalive]).to be false
+      end
+
+      it "should use database default `tcp_keepalive_time` value 600 by default" do
+        ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(CONNECTION_PARAMS)
+
+        expect(OCI8.properties[:tcp_keepalive_time]).to eq(600)
+      end
+
+      it "should use modified `tcp_keepalive_time` value 3000" do
+        ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(CONNECTION_PARAMS.dup.merge(tcp_keepalive_time: 3000))
+
+        expect(OCI8.properties[:tcp_keepalive_time]).to eq(3000)
+      end
+    end
+  end
+
   describe "with non-string parameters" do
     before(:all) do
       params = CONNECTION_PARAMS.dup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 5.2.5
+  version: 5.2.6
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord