activerecord-oracle_enhanced-adapter 1.6.6 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4eeebb449df33ca90a32d115eb7560f63620e7f
-  data.tar.gz: b44d067ce520271d27dff3e695cc0e2a8a0304f1
+  metadata.gz: 09cf6c7e3e814929e2d9b16c8a917832db065b51
+  data.tar.gz: 327245153b57e09f6eb11d43edfc32c9a6cc31f4
 SHA512:
-  metadata.gz: b17c6f686b146973b005f5818c7325aed083703c459dcc78e28249a8fae881251ab426c3bf145d2f82f8f6050d8abba935f9fb589b00ad714d68cd33840a3cad
-  data.tar.gz: 292f74cb32c919c502953774f36e934e4b24ff51c26beecf4585cb571412bf58893947d2e7d7edc42ec9fac17885768d011c1d7294c1d4185a6ec64a2eacee6c
+  metadata.gz: ca8b383f94e657873ef9d6d2dbb54fbe8897fb4d10b7a1efc5d9f2f1cef588a705d5ae18aaa5062704ad548e09bb4d646139a76ebb38628808e06676fa58b4c9
+  data.tar.gz: 22a8535d6a83bc61da0cdc7a0e441a7cdb486ab2012305fd849dbddeed407fa409e2dc1db25e5a3441bc558f2ee49ed8f748ff39b98899444ce5b8d1b45760e6

data/History.md

@@ -1,3 +1,11 @@
+## 1.6.7 / 2016-03-08
+
+* Changes and bug fixes since 1.6.6
+ * Support Rails 4.2.6
+ * Support t.foreign_key use the same `to_table` twice [#783]
+ * Remove "warning: (...) interpreted as grouped expression" [#765]
+ * Add documentation on setting read, write and connect timeouts [#761]
+
 ## 1.6.6 / 2016-01-21
 
 * Changes and bug fixes since 1.6.5

data/README.md

@@ -173,7 +173,10 @@ or you can even use Oracle specific TNS connection description:
 ```yml
 development:
   adapter: oracle_enhanced
-  database: "(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=xe)))"
+  database: "(DESCRIPTION=
+    (ADDRESS_LIST=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521)))
+    (CONNECT_DATA=(SERVICE_NAME=xe))
+  )"
   username: user
   password: secret
 ```
@@ -506,6 +509,65 @@ development:
   schema: tableowner
 ```
 
+### Timeouts
+
+By default, OCI libraries set a connect timeout of 60 seconds (as of v12.0), and do not set a data receive timeout.
+
+While this may desirable if you process queries that take several minutes to complete, it may also lead to resource exhaustion if
+connections are teared down improperly during a query, e.g. by misbehaving networking equipment that does not inform both peers of
+connection reset. In this scenario, the OCI libraries will wait indefinitely for data to arrive, thus blocking indefinitely the application
+that initiated the query.
+
+You can set a connect timeout, in seconds, using the following TNSNAMES parameters:
+
+  * `CONNECT_TIMEOUT`
+  * `TCP_CONNECT_TIMEOUT`
+
+Example setting a 5 seconds connect timeout:
+
+```yml
+development:
+  database: "(DESCRIPTION=
+    (ADDRESS_LIST=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521)))
+    (CONNECT_TIMEOUT=5)(TCP_CONNECT_TIMEOUT=5)
+    (CONNECT_DATA=(SERVICE_NAME=xe))
+  )"
+```
+You should set a timeout value dependant on your network topology, and the time needed to establish a TCP connection with your ORACLE
+server. In real-world scenarios, a value larger than 5 should be avoided.
+
+You can set receive and send timeouts, in seconds, using the following TNSNAMES parameters:
+
+  * `RECV_TIMEOUT` - the maximum time the OCI libraries should wait for data to arrive on the TCP socket. Internally, it is implemented
+    through a `setsockopt(s, SOL_SOCKET, SO_RCVTIMEO)`. You should set this value to an integer larger than the server-side execution time
+    of your longest-running query.
+  * `SEND_TIMEOUT` the maximum time the OCI libraries should wait for write operations to complete on the TCP socket. Internally, it is
+    implemented through a `setsockopt(s, SOL_SOCKET, SO_SNDTIMEO)`. Values larger than 5 are a sign of poorly performing network, and as
+    such it should be avoided.
+
+Example setting a 60 seconds receive timeout and 5 seconds send timeout:
+
+```yml
+development:
+  database: "(DESCRIPTION=
+    (ADDRESS_LIST=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521)))
+    (RECV_TIMEOUT=60)(SEND_TIMEOUT=5)
+    (CONNECT_DATA=(SERVICE_NAME=xe))
+  )"
+```
+
+Example setting the above send/recv timeout plus a 5 seconds connect timeout:
+
+```yml
+development:
+  database: "(DESCRIPTION=
+    (ADDRESS_LIST=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521)))
+    (CONNECT_TIMEOUT=5)(TCP_CONNECT_TIMEOUT=5)
+    (RECV_TIMEOUT=60)(SEND_TIMEOUT=5)
+    (CONNECT_DATA=(SERVICE_NAME=xe))
+  )"
+```
+
 TROUBLESHOOTING
 ---------------
 
@@ -552,6 +614,14 @@ When Apache with Phusion Passenger (mod_passenger or previously mod_rails) is us
   * Create wrapper script as described in [Phusion blog](http://blog.phusion.nl/2008/12/16/passing-environment-variables-to-ruby-from-phusion-passenger) or [RayApps::Blog](http://blog.rayapps.com/2008/05/21/using-mod_rails-with-rails-applications-on-oracle)
   * Set environment variables in the file which is used by Apache before launching Apache worker processes - on Linux it typically is envvars file (look in apachectl or apache2ctl script where it is looking for envvars file) or /System/Library/LaunchDaemons/org.apache.httpd.plist on Mac OS X. See the following [discussion thread](http://groups.google.com/group/oracle-enhanced/browse_thread/thread/c5f64106569fadd0) for more hints.
 
+### What to do if my application is stuck?
+
+If you see established TCP connections that do not exchange data, and you are unable to terminate your application using a TERM or an INT
+signal, and you are forced to use the KILL signal, then the OCI libraries may be waiting indefinitely for a network read operation to
+complete.
+
+See the **Timeouts** section above.
+
 RUNNING TESTS
 -------------
 

data/VERSION

@@ -1 +1 @@
-1.6.6
+1.6.7

data/activerecord-oracle_enhanced-adapter.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-oracle_enhanced-adapter}
-  s.version = "1.6.6"
+  s.version = "1.6.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.license = 'MIT'
   s.authors = [%q{Raimonds Simanovskis}]
-  s.date = %q{2015-01-21}
+  s.date = %q{2016-03-08}
   s.description = %q{Oracle "enhanced" ActiveRecord adapter contains useful additional methods for working with new and legacy Oracle databases.
 This adapter is superset of original ActiveRecord Oracle adapter.
 }

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

@@ -123,7 +123,7 @@ module ActiveRecord
             if without_prepared_statement?(binds)
               cursor = @connection.prepare(sql)
             else
-              unless @statements.key? (sql)
+              unless @statements.key?(sql)
                 @statements[sql] = @connection.prepare(sql)
               end
 
@@ -229,7 +229,7 @@ module ActiveRecord
         # Returns default sequence name for table.
         # Will take all or first 26 characters of table name and append _seq suffix
         def default_sequence_name(table_name, primary_key = nil)
-          table_name.to_s.gsub (/(^|\.)([\w$-]{1,#{sequence_name_length-4}})([\w$-]*)$/), '\1\2_seq'
+          table_name.to_s.gsub((/(^|\.)([\w$-]{1,#{sequence_name_length-4}})([\w$-]*)$/), '\1\2_seq')
         end
 
         # Inserts the given fixture into the table. Overridden to properly handle lobs.

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

@@ -89,7 +89,7 @@ module ActiveRecord
           end
           td.indexes.each_pair { |c,o| add_index table_name, c, o }
 
-          td.foreign_keys.each_pair do |other_table_name, foreign_key_options|
+          td.foreign_keys.each do |other_table_name, foreign_key_options|
             add_foreign_key(table_name, other_table_name, foreign_key_options)
           end
         end

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -808,8 +808,8 @@ module ActiveRecord
             select NVL(max(#{quote_column_name(primary_key)}),0) + 1 from #{quote_table_name(table_name)}
           ", new_start_value)
 
-          execute ("DROP SEQUENCE #{quote_table_name(sequence_name)}")
-          execute ("CREATE SEQUENCE #{quote_table_name(sequence_name)} START WITH #{new_start_value}")
+          execute "DROP SEQUENCE #{quote_table_name(sequence_name)}"
+          execute "CREATE SEQUENCE #{quote_table_name(sequence_name)} START WITH #{new_start_value}"
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.7
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler