activerecord-oracle_enhanced-adapter 6.0.0.rc1 → 6.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20b3aea35f3c42e8485b1b11ec0c5a549e0571b81522e5608abea0a6916d38f8
-  data.tar.gz: 53379822a99628e864639ed410712386bbf025de3c75ac5f9aa99e33fa0cf170
+  metadata.gz: bdc31c880510cdf6b84f68c710f76cbc32d8819c2509daa0932abb7b5bc61953
+  data.tar.gz: 7b9a581e8f9aad1e49e1d27c1295d36a721d0fef816a6eb30a6a02e60c9c89f8
 SHA512:
-  metadata.gz: 9c928e3b86ca4f34e45ad25ca37737f605fddfae4ae5b9205812f05079655a46fa748aa6f70d926b41269574bcc811bb297396ae60325a10211ffb3854b6b08e
-  data.tar.gz: 1e8e54cab8bb27dc6754f559a19ee5ed60dfcad8835b6352ffd60304cd122294f326bf02bf93bd458410f8d319d2e707457d09292a9bfde56dcddc041e53e0fd
+  metadata.gz: e346ff86f05d843165df5c5b505568a78a6e2fe0b8291cde8cb8608913bc7a8c1a68ca5304d129da9ba51a0781a0d26fc075183283697566023aa0eabb3ee7c5
+  data.tar.gz: a63ee6a2411af0f9743beee488f553318609a8ab19549a8ed54fdc494fda931c01e2bf4a74a293ad2fbda40a7551f7a9c693f504f95e7f9aec77a5a93fbe0b1d

data/VERSION

@@ -1 +1 @@
-6.0.0.rc1
+6.0.0.rc2

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

@@ -297,6 +297,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
@@ -326,11 +328,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

@@ -135,6 +135,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: 6.0.0.rc1
+  version: 6.0.0.rc2
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: ruby-plsql
   requirement: !ruby/object:Gem::Requirement
@@ -140,33 +140,33 @@ signing_key:
 specification_version: 4
 summary: Oracle enhanced adapter for ActiveRecord
 test_files:
-- spec/active_record/oracle_enhanced/type/character_string_spec.rb
-- spec/active_record/oracle_enhanced/type/text_spec.rb
-- spec/active_record/oracle_enhanced/type/dirty_spec.rb
-- spec/active_record/oracle_enhanced/type/integer_spec.rb
-- spec/active_record/oracle_enhanced/type/national_character_string_spec.rb
-- spec/active_record/oracle_enhanced/type/raw_spec.rb
-- spec/active_record/oracle_enhanced/type/json_spec.rb
-- spec/active_record/oracle_enhanced/type/float_spec.rb
-- spec/active_record/oracle_enhanced/type/timestamp_spec.rb
-- spec/active_record/oracle_enhanced/type/boolean_spec.rb
-- spec/active_record/oracle_enhanced/type/binary_spec.rb
-- spec/active_record/oracle_enhanced/type/decimal_spec.rb
-- spec/active_record/oracle_enhanced/type/national_character_text_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb
+- spec/active_record/connection_adapters/emulation/oracle_adapter_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/schema_dumper_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/database_tasks_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/quoting_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/schema_statements_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/dbms_output_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/database_tasks_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/context_index_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/structure_dump_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/procedures_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/quoting_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/schema_dumper_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/context_index_spec.rb
-- spec/active_record/connection_adapters/emulation/oracle_adapter_spec.rb
-- spec/support/alter_system_user_password.sql
+- spec/active_record/oracle_enhanced/type/national_character_string_spec.rb
+- spec/active_record/oracle_enhanced/type/dirty_spec.rb
+- spec/active_record/oracle_enhanced/type/text_spec.rb
+- spec/active_record/oracle_enhanced/type/timestamp_spec.rb
+- spec/active_record/oracle_enhanced/type/binary_spec.rb
+- spec/active_record/oracle_enhanced/type/float_spec.rb
+- spec/active_record/oracle_enhanced/type/raw_spec.rb
+- spec/active_record/oracle_enhanced/type/character_string_spec.rb
+- spec/active_record/oracle_enhanced/type/json_spec.rb
+- spec/active_record/oracle_enhanced/type/decimal_spec.rb
+- spec/active_record/oracle_enhanced/type/national_character_text_spec.rb
+- spec/active_record/oracle_enhanced/type/boolean_spec.rb
+- spec/active_record/oracle_enhanced/type/integer_spec.rb
+- spec/spec_config.yaml.template
 - spec/support/alter_system_set_open_cursors.sql
+- spec/support/alter_system_user_password.sql
 - spec/support/create_oracle_enhanced_users.sql
 - spec/spec_helper.rb
-- spec/spec_config.yaml.template