activerecord-oracle_enhanced-adapter 6.0.0.rc2 → 6.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdc31c880510cdf6b84f68c710f76cbc32d8819c2509daa0932abb7b5bc61953
-  data.tar.gz: 7b9a581e8f9aad1e49e1d27c1295d36a721d0fef816a6eb30a6a02e60c9c89f8
+  metadata.gz: ecb6a81d928e0b751feb92c6eddbf1f11ae67ff269430216611f0d8871a3de7f
+  data.tar.gz: 345cfa5a563fdb93d59404b13177bdf39f837f3d3338956b5b242ba85d95cca0
 SHA512:
-  metadata.gz: e346ff86f05d843165df5c5b505568a78a6e2fe0b8291cde8cb8608913bc7a8c1a68ca5304d129da9ba51a0781a0d26fc075183283697566023aa0eabb3ee7c5
-  data.tar.gz: a63ee6a2411af0f9743beee488f553318609a8ab19549a8ed54fdc494fda931c01e2bf4a74a293ad2fbda40a7551f7a9c693f504f95e7f9aec77a5a93fbe0b1d
+  metadata.gz: 44789c82df86d977714f00ef4a90b08c2d554c9e9b0cd3e2f39854ed89e69c02ade149990d1c16fe0630e91f0b13960e5263340d430e182f05791cabbb82d515
+  data.tar.gz: c1dad68beacf2a519ab0819b41c3249902f64b6ba61c440aa0cc8f566d0e9820e12a4f45d2dd52e733a076c267016cf9fa895f7774f8b36c19c756b375f55a6b

data/History.md

@@ -1,3 +1,60 @@
+## 6.0.4 / 2020-08-18
+
+* Changes and bug fixes
+  * create_table_definition and add_column take keyword arguments [#1942, #2043]
+  * Fix keyword arguments errors for Ruby 2.8.0-dev [#1977,#2043]
+  * Fix a build errors when using Ruby 2.8.0-dev [#1983, #2043]
+
+## 6.0.3 / 2020-06-16
+
+* Changes and bug fixes
+  * Auto retry works for other `exec_*` methods [#1976, #1981]
+  * Allow column name with function (e.g. `length(title)`) as safe SQL string [#2017, #2018]
+
+* CI
+  * CI against latest Ruby versions [#1979]
+
+## 6.0.2 / 2019-12-25
+
+* Changes and bug fixes
+  * Uninstall SimpleCov [#1968]
+
+## 6.0.1 / 2019-12-20
+
+* Changes and bug fixes
+  * Address `undefined local variable or method `sql' [#1932 #1962 #1963]
+
+* CI
+  * CI against Ruby 2.6.4 and Ruby 2.5.6 [#1922]
+
+## 6.0.0 / 2019-08-17
+
+* Major changes, including changes since 6.0.0.beta1
+
+  * Support Rails 6.0.0
+  * Rails 6 requires Ruby 2.5 [#1801]
+  * Support longer identifier for Oracle database 12.2 or higher [#1703 #1705]
+  * Introduce `use_shorter_identifier` [#1707]
+  * Change `default_sequence_start_value` from 10000 to 1 [#1636]
+  * Address `ORA-01795: maximum number of expressions in a list is 1000`
+
+* CI
+  * CI against JRuby 9.2.8.0 #1912
+
+## 6.0.0.rc3 / 2019-07-27
+
+* Changes and bug fixes
+  * Share the column and table name quote cache between connections [#1901 #1903]
+
+## 6.0.0.rc2 / 2019-07-23
+
+* Major changes
+  * Support Rails 6.0.0 rc2
+  * Add TCP keepalive and TCP keepalive time configurations [#1874 #1877]
+
+* Changes and bug fixes
+  * Update bug report templates for Oracle enhanced adapter 6.0 [#1873]
+
 ## 6.0.0.rc1 / 2019-04-25
 
 * Major changes
@@ -82,7 +139,7 @@
   * Restore old Code Climate behavior [#1716]
   * Do not install bundler explicitly [#1725]
 
-* RuboCop 
+* RuboCop
 
   * Add RuboCop to Gemfile [#1841]
   * Bump RuboCop to 0.63.0 [#1816]
@@ -279,7 +336,7 @@
   * Remove `add_runtime_dependency` with arel [#1385]
   * Move methods for synonyms out of `SchemaStatementsExt` [#1387]
   * Remove incorrect prepend to `ActiveRecord::ColumnDumper` [#1394]
-  * Handle `ActiveRecord::SchemaDumper` by `adapter_name` [#1395] 
+  * Handle `ActiveRecord::SchemaDumper` by `adapter_name` [#1395]
   * Rewrite `remove_prefix_and_suffix` to be similar with super #1401
   * `remove_prefix_and_suffix` handles dollar sign by `Regexp#escape` [#1402]
   * `prepare_column_options` is now private [#1429]
@@ -543,7 +600,7 @@
   * Use the latest arel master while developing alpha version [#1115]
   * Bump Arel to 8.0 [#1120, #1121, #1124]
   * Use released Arel 8 [#1205]
-  * Remove duplicate license information [#965] 
+  * Remove duplicate license information [#965]
   * Clean up comments and un-commented specs for table comment feature [#971]
   * Use Rails migration `create_table` to create table and sequence [#991]
   * Removed a invalid spec about TIMESTAMP column [#1020]
@@ -931,7 +988,7 @@
  * Address `add_column_options!': undefined method `quote_value' [#647]
  * Remove dirty tracking methods [#883]
  * Use arel master branch for rails5 development [#645]
- * Bump ruby-oci8 version to 2.2.0 or higher [#775] 
+ * Bump ruby-oci8 version to 2.2.0 or higher [#775]
  * Remove jeweler dependency [#766]
  * Remove required_rubygems_version [#719]
  * Remove journey which is already part of Rails [#701]
@@ -969,13 +1026,13 @@
  * Rails 5 : create table with primary key trigger with default primary key not returning id [#912]
  * Rails 5 : dirty object tracking not working correctly for CLOB [#911]
  * Rails 5 : handling of CLOB columns get failures [#910]
- * Rails 5 : SQL with bind parameters when NLS_NUMERIC_CHARACTERS is set to ', ' 
+ * Rails 5 : SQL with bind parameters when NLS_NUMERIC_CHARACTERS is set to ', '
     show Java::JavaSql::SQLSyntaxErrorException: / ORA-01722: invalid number [#909]
  * Rails 5 : explain should explain query with binds got Java::JavaSql::SQLException: Invalid column index [#908]
  - CRuby and JRuby
  * Rails 5 : create table with primary key trigger not returning id [#907]
  * Rails 5 : custom methods for create, update and destroy not working [#906]
- * Rails 5 : has_and_belongs_to_many test gets ORA-01400 since primary key column "ID" 
+ * Rails 5 : has_and_belongs_to_many test gets ORA-01400 since primary key column "ID"
     not included in insert statement [#856, rails/rails#25388]
  * Rails 5 : undefined method `to_i' for #<Arel::Nodes::BindParam:0x00000002c92910> [#848, rails/arel#438]
 
@@ -1038,11 +1095,11 @@
 
 * Changes and bug fixes since 1.6.0
 
- * Oracle enhanced adapter v1.6 requires ActiveRecord 4.2.1 or higher, 
+ * Oracle enhanced adapter v1.6 requires ActiveRecord 4.2.1 or higher,
    ActiveRecord 4.2.0 is not supported.[#651, #652]
  * Fix serialized value becomes from yaml to string once saved [#655, #657]
  * Update Ruby version in readme [#654]
- * Update unit test matcher to skip sql statements to get `table` metadata [#653] 
+ * Update unit test matcher to skip sql statements to get `table` metadata [#653]
 
 ## 1.6.0 / 2015-06-25
 
@@ -1125,7 +1182,7 @@
  * Change log method signiture to support Rails 4.2 [#539]
  * Enable loading spec configuration from config file instead of env [#550]
  * Rails42: Issue with non-existent columns [#545, #551]
- * Squelch warning "#column_for_attribute` will return a null object 
+ * Squelch warning "#column_for_attribute` will return a null object
    for non-existent columns in Rails 5. Use `#has_attribute?`" [#551]
  * Use arel 6-0-stable [#565]
  * Support 'Y' as true and 'N' as false in Rails 4.2 [#574, #573]
@@ -1136,7 +1193,7 @@
  * Rails 4.2 Address ArgumentError: wrong number of arguments (1 for 2) at `quote_value` [#511]
  * Address ORA-00932: inconsistent datatypes: expected NUMBER got DATE [#538]
  * Remove duplicate alias_method_chain for indexes [#560]
- * Address RangeError: 6000000000 is out of range for ActiveRecord::Type::Integer 
+ * Address RangeError: 6000000000 is out of range for ActiveRecord::Type::Integer
    with limit 4 [#578]
  * Return foreign_keys_without_oracle_enhanced when non Oracle database used [#583]
  * Add missing database_tasks.rb to gemspec [#585]
@@ -1181,7 +1238,7 @@
 * Enhancements
  * Oracle NUMBER datatype can be handled as Rails :float datatype [#418]
    - Default NUMBER datatype handled as :decimal to keep compatibility
-   - Configured by setting `self.number_datatype_coercion = :float` 
+   - Configured by setting `self.number_datatype_coercion = :float`
  * Add link to supported Oracle database version, JDK and Oracle JDBC Driver version [#438]
  * Support `without_prepared_statements?` to handle `unprepared_statement` [#447]
 
@@ -1263,7 +1320,7 @@
  * Create indexes automatically for references and belongs_to [#183]
  * Use the index name explicitly provided in a migration when reverting [#296]
  * Rename indexes when a table or column is renamed [#286]
- * Support refactored remove_column [#172] 
+ * Support refactored remove_column [#172]
  * Support allowed_index_name_length method [#285]
  * Remove schema prefix from sequence name if present before truncating [#155]
  * Bumped jeweler, ruby-plsql and ruby-oci8 version [#176]
@@ -1579,7 +1636,7 @@
   * Added support for NVARCHAR2 column type
 * Bug fixes:
   * Do not call write_lobs callback when custom create or update methods are defined
-    
+
 ### 1.1.5 / 2008-07-27
 
 * Bug fixes:

data/README.md

@@ -6,10 +6,21 @@ Oracle enhanced adapter for ActiveRecord
 DESCRIPTION
 -----------
 
-Oracle enhanced ActiveRecord adapter provides Oracle database access from Ruby on Rails applications. Oracle enhanced adapter can be used from Ruby on Rails versions between 2.3.x and 5.2 and it is working with Oracle database versions from 10g to 12c.
+Oracle enhanced ActiveRecord adapter provides Oracle database access from Ruby on Rails applications. Oracle enhanced adapter can be used from Ruby on Rails versions between 2.3.x and 6.0 and it is working with Oracle database versions 10g and higher
 
 INSTALLATION
 ------------
+### Rails 6.0
+
+Oracle enhanced adapter version 6.0 supports Rails 6.0.
+When using Ruby on Rails version 6.0 then in Gemfile include
+
+```ruby
+# Use oracle as the database for Active Record
+gem 'activerecord-oracle_enhanced-adapter', '~> 6.0.0'
+gem 'ruby-oci8' # only for CRuby users
+```
+
 ### Rails 5.2
 
 Oracle enhanced adapter version 5.2 supports Rails 5.2.

data/VERSION

@@ -1 +1 @@
-6.0.0.rc2
+6.0.4

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

@@ -24,21 +24,23 @@ module ActiveRecord
           log(sql, name, binds, type_casted_binds) do
             cursor = nil
             cached = false
-            if without_prepared_statement?(binds)
-              cursor = @connection.prepare(sql)
-            else
-              unless @statements.key? sql
-                @statements[sql] = @connection.prepare(sql)
-              end
+            with_retry do
+              if without_prepared_statement?(binds)
+                cursor = @connection.prepare(sql)
+              else
+                unless @statements.key? sql
+                  @statements[sql] = @connection.prepare(sql)
+                end
 
-              cursor = @statements[sql]
+                cursor = @statements[sql]
 
-              cursor.bind_params(type_casted_binds)
+                cursor.bind_params(type_casted_binds)
 
-              cached = true
-            end
+                cached = true
+              end
 
-            cursor.exec
+              cursor.exec
+            end
 
             if (name == "EXPLAIN") && sql =~ /^EXPLAIN/
               res = true
@@ -96,29 +98,32 @@ module ActiveRecord
 
           log(sql, name, binds, type_casted_binds) do
             cached = false
+            cursor = nil
             returning_id_col = returning_id_index = nil
-            if without_prepared_statement?(binds)
-              cursor = @connection.prepare(sql)
-            else
-              unless @statements.key?(sql)
-                @statements[sql] = @connection.prepare(sql)
-              end
+            with_retry do
+              if without_prepared_statement?(binds)
+                cursor = @connection.prepare(sql)
+              else
+                unless @statements.key?(sql)
+                  @statements[sql] = @connection.prepare(sql)
+                end
+
+                cursor = @statements[sql]
 
-              cursor = @statements[sql]
+                cursor.bind_params(type_casted_binds)
 
-              cursor.bind_params(type_casted_binds)
+                if /:returning_id/.match?(sql)
+                  # it currently expects that returning_id comes last part of binds
+                  returning_id_index = binds.size
+                  cursor.bind_returning_param(returning_id_index, Integer)
+                end
 
-              if /:returning_id/.match?(sql)
-                # it currently expects that returning_id comes last part of binds
-                returning_id_index = binds.size
-                cursor.bind_returning_param(returning_id_index, Integer)
+                cached = true
               end
 
-              cached = true
+              cursor.exec_update
             end
 
-            cursor.exec_update
-
             rows = []
             if returning_id_index
               returning_id = cursor.get_returning_param(returning_id_index, Integer).to_i
@@ -134,24 +139,26 @@ module ActiveRecord
           type_casted_binds = type_casted_binds(binds)
 
           log(sql, name, binds, type_casted_binds) do
-            cached = false
-            if without_prepared_statement?(binds)
-              cursor = @connection.prepare(sql)
-            else
-              if @statements.key?(sql)
-                cursor = @statements[sql]
+            with_retry do
+              cached = false
+              if without_prepared_statement?(binds)
+                cursor = @connection.prepare(sql)
               else
-                cursor = @statements[sql] = @connection.prepare(sql)
-              end
+                if @statements.key?(sql)
+                  cursor = @statements[sql]
+                else
+                  cursor = @statements[sql] = @connection.prepare(sql)
+                end
 
-              cursor.bind_params(type_casted_binds)
+                cursor.bind_params(type_casted_binds)
 
-              cached = true
-            end
+                cached = true
+              end
 
-            res = cursor.exec_update
-            cursor.close unless cached
-            res
+              res = cursor.exec_update
+              cursor.close unless cached
+              res
+            end
           end
         end
 
@@ -252,7 +259,7 @@ module ActiveRecord
               value = klass.attribute_types[col.name].serialize(value)
             end
             uncached do
-              unless lob_record = select_one(<<~SQL.squish, "Writable Large Object")
+              unless lob_record = select_one(sql = <<~SQL.squish, "Writable Large Object")
                 SELECT #{quote_column_name(col.name)} FROM #{quote_table_name(table_name)}
                 WHERE #{quote_column_name(klass.primary_key)} = #{id} FOR UPDATE
               SQL
@@ -263,6 +270,16 @@ module ActiveRecord
             end
           end
         end
+
+        private
+          def with_retry
+            @connection.with_retry do
+              yield
+            rescue
+              @statements.clear
+              raise
+            end
+          end
       end
     end
   end

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

@@ -97,6 +97,10 @@ module ActiveRecord
           @raw_connection.exec(sql, *bindvars, &block)
         end
 
+        def with_retry(&block)
+          @raw_connection.with_retry(&block)
+        end
+
         def prepare(sql)
           Cursor.new(self, @raw_connection.parse(sql))
         end
@@ -423,13 +427,11 @@ class OCI8EnhancedAutoRecover < DelegateClass(OCI8) #:nodoc:
   LOST_CONNECTION_ERROR_CODES = [ 28, 1012, 3113, 3114, 3135 ] #:nodoc:
 
   # Adds auto-recovery functionality.
-  #
-  # See: http://www.jiubao.org/ruby-oci8/api.en.html#label-11
-  def exec(sql, *bindvars, &block) #:nodoc:
+  def with_retry #:nodoc:
     should_retry = self.class.auto_retry? && autocommit?
 
     begin
-      @connection.exec(sql, *bindvars, &block)
+      yield
     rescue OCIException => e
       raise unless e.is_a?(OCIError) && LOST_CONNECTION_ERROR_CODES.include?(e.code)
       @active = false
@@ -439,5 +441,9 @@ class OCI8EnhancedAutoRecover < DelegateClass(OCI8) #:nodoc:
       retry
     end
   end
+
+  def exec(sql, *bindvars, &block) #:nodoc:
+    with_retry { @connection.exec(sql, *bindvars, &block) }
+  end
 end
 #:startdoc:

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

@@ -10,7 +10,7 @@ module ActiveRecord
 
         def quote_column_name(name) #:nodoc:
           name = name.to_s
-          @quoted_column_names[name] ||= begin
+          self.class.quoted_column_names[name] ||= begin
             # if only valid lowercase column characters in name
             if /\A[a-z][a-z_0-9\$#]*\Z/.match?(name)
               "\"#{name.upcase}\""
@@ -70,7 +70,7 @@ module ActiveRecord
 
         def quote_table_name(name) #:nodoc:
           name, _link = name.to_s.split("@")
-          @quoted_table_names[name] ||= [name.split(".").map { |n| quote_column_name(n) }].join(".")
+          self.class.quoted_table_names[name] ||= [name.split(".").map { |n| quote_column_name(n) }].join(".")
         end
 
         def quote_string(s) #:nodoc:
@@ -132,6 +132,42 @@ module ActiveRecord
           end
         end
 
+        def column_name_matcher
+          COLUMN_NAME
+        end
+
+        def column_name_with_order_matcher
+          COLUMN_NAME_WITH_ORDER
+        end
+
+        COLUMN_NAME = /
+          \A
+          (
+            (?:
+              # "table_name"."column_name" | function(one or no argument)
+              ((?:\w+\.|"\w+"\.)?(?:\w+|"\w+")) | \w+\((?:|\g<2>)\)
+            )
+            (?:(?:\s+AS)?\s+(?:\w+|"\w+"))?
+          )
+          (?:\s*,\s*\g<1>)*
+          \z
+        /ix
+
+        COLUMN_NAME_WITH_ORDER = /
+          \A
+          (
+            (?:
+              # "table_name"."column_name" | function(one or no argument)
+              ((?:\w+\.|"\w+"\.)?(?:\w+|"\w+")) | \w+\((?:|\g<2>)\)
+            )
+            (?:\s+ASC|\s+DESC)?
+            (?:\s+NULLS\s+(?:FIRST|LAST))?
+          )
+          (?:\s*,\s*\g<1>)*
+          \z
+        /ix
+        private_constant :COLUMN_NAME, :COLUMN_NAME_WITH_ORDER
+
         private
 
           def oracle_downcase(column_name)

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

@@ -7,7 +7,7 @@ module ActiveRecord
         private
 
           def visit_ColumnDefinition(o)
-            if [:blob, :clob, :nclob].include?(sql_type = type_to_sql(o.type,  o.options).downcase.to_sym)
+            if [:blob, :clob, :nclob].include?(sql_type = type_to_sql(o.type, **o.options).downcase.to_sym)
               if (tablespace = default_tablespace_for(sql_type))
                 @lob_tablespaces ||= {}
                 @lob_tablespaces[o.name] = tablespace

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

@@ -17,7 +17,7 @@ module ActiveRecord
         ].each do |column_type|
           module_eval <<-CODE, __FILE__, __LINE__ + 1
             def #{column_type}(*args, **options)
-              args.each { |name| column(name, :#{column_type}, options) }
+              args.each { |name| column(name, :#{column_type}, **options) }
             end
           CODE
         end

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

@@ -198,7 +198,7 @@ module ActiveRecord
 
         def create_table(table_name, **options)
           create_sequence = options[:id] != false
-          td = create_table_definition table_name, options
+          td = create_table_definition table_name, **options
 
           if options[:id] != false && !options[:as]
             pk = options.fetch(:primary_key) do
@@ -208,7 +208,7 @@ module ActiveRecord
             if pk.is_a?(Array)
               td.primary_keys pk
             else
-              td.primary_key pk, options.fetch(:id, :primary_key), options
+              td.primary_key pk, options.fetch(:id, :primary_key), **options
             end
           end
 
@@ -288,7 +288,7 @@ module ActiveRecord
         end
 
         def add_index(table_name, column_name, options = {}) #:nodoc:
-          index_name, index_type, quoted_column_names, tablespace, index_options = add_index_options(table_name, column_name, options)
+          index_name, index_type, quoted_column_names, tablespace, index_options = add_index_options(table_name, column_name, **options)
           execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} (#{quoted_column_names})#{tablespace} #{index_options}"
           if index_type == "UNIQUE"
             unless /\(.*\)/.match?(quoted_column_names)
@@ -402,14 +402,14 @@ module ActiveRecord
           execute "DROP SYNONYM #{quote_table_name(name)}"
         end
 
-        def add_reference(table_name, *args)
-          OracleEnhanced::ReferenceDefinition.new(*args).add_to(update_table_definition(table_name, self))
+        def add_reference(table_name, ref_name, **options)
+          OracleEnhanced::ReferenceDefinition.new(ref_name, **options).add_to(update_table_definition(table_name, self))
         end
 
-        def add_column(table_name, column_name, type, options = {}) #:nodoc:
+        def add_column(table_name, column_name, type, **options) #:nodoc:
           type = aliased_types(type.to_s, type)
           at = create_alter_table table_name
-          at.add_column(column_name, type, options)
+          at.add_column(column_name, type, **options)
           add_column_sql = schema_creation.accept at
           add_column_sql << tablespace_for((type_to_sql(type).downcase.to_sym), nil, table_name, column_name)
           execute add_column_sql
@@ -453,7 +453,7 @@ module ActiveRecord
           end
 
           td = create_table_definition(table_name)
-          cd = td.new_column_definition(column.name, type, options)
+          cd = td.new_column_definition(column.name, type, **options)
           change_column_stmt = schema_creation.accept cd
           change_column_stmt << tablespace_for((type_to_sql(type).downcase.to_sym), nil, options[:table_name], options[:column_name]) if type
           change_column_sql = "ALTER TABLE #{quote_table_name(table_name)} MODIFY #{change_column_stmt}"
@@ -619,8 +619,8 @@ module ActiveRecord
             OracleEnhanced::SchemaCreation.new self
           end
 
-          def create_table_definition(*args)
-            OracleEnhanced::TableDefinition.new(self, *args)
+          def create_table_definition(*args, **options)
+            OracleEnhanced::TableDefinition.new(self, *args, **options)
           end
 
           def new_column_from_field(table_name, field)

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

@@ -387,10 +387,22 @@ describe "OracleEnhancedConnection" do
   end
 
   describe "auto reconnection" do
+    include SchemaSpecHelper
+
     before(:all) do
       ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
       @conn = ActiveRecord::Base.connection.instance_variable_get("@connection")
       @sys_conn = ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(SYS_CONNECTION_PARAMS)
+      schema_define do
+        create_table :posts, force: true
+      end
+      class ::Post < ActiveRecord::Base
+      end
+    end
+
+    after(:all) do
+      Object.send(:remove_const, "Post")
+      ActiveRecord::Base.clear_cache!
     end
 
     before(:each) do
@@ -440,6 +452,20 @@ describe "OracleEnhancedConnection" do
         expect { @conn.select("SELECT * FROM dual") }.to raise_error(OCIError)
       end
     end
+
+    it "should reconnect and execute query if connection is lost and auto retry is enabled" do
+      Post.create!
+      ActiveRecord::Base.connection.auto_retry = true
+      kill_current_session
+      expect(Post.take).not_to be_nil
+    end
+
+    it "should not reconnect and execute query if connection is lost and auto retry is disabled" do
+      Post.create!
+      ActiveRecord::Base.connection.auto_retry = false
+      kill_current_session
+      expect { Post.take }.to raise_error(ActiveRecord::StatementInvalid)
+    end
   end
 
   describe "describe table" do

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

@@ -21,7 +21,7 @@ describe "OracleEnhancedAdapter schema dump" do
   def create_test_posts_table(options = {})
     options[:force] = true
     schema_define do
-      create_table :test_posts, options do |t|
+      create_table :test_posts, **options do |t|
         t.string :title
         t.timestamps null: true
       end

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

@@ -80,7 +80,8 @@ describe "OracleEnhancedAdapter schema definition" do
   describe "sequence creation parameters" do
     def create_test_employees_table(sequence_start_value = nil)
       schema_define do
-        create_table :test_employees, sequence_start_value ? { sequence_start_value: sequence_start_value } : {} do |t|
+        options = sequence_start_value ? { sequence_start_value: sequence_start_value } : {}
+        create_table :test_employees, **options do |t|
           t.string      :first_name
           t.string      :last_name
         end

data/spec/spec_helper.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "simplecov"
-SimpleCov.start
 require "rubygems"
 require "bundler"
 require "yaml"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc2
+  version: 6.0.4
 platform: ruby
 authors:
 - Raimonds Simanovskis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2020-08-18 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.rc2
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc2
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: ruby-plsql
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,7 @@ homepage: http://github.com/rsim/oracle-enhanced
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -135,38 +135,38 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Oracle enhanced adapter for ActiveRecord
 test_files:
-- spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb
+- spec/spec_helper.rb
+- spec/spec_config.yaml.template
 - 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_data_types_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/quoting_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/schema_dumper_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/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/structure_dump_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/context_index_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
+- spec/active_record/oracle_enhanced/type/decimal_spec.rb
 - 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/boolean_spec.rb
+- spec/active_record/oracle_enhanced/type/json_spec.rb
+- spec/active_record/oracle_enhanced/type/raw_spec.rb
+- spec/active_record/oracle_enhanced/type/binary_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/character_string_spec.rb
 - spec/active_record/oracle_enhanced/type/integer_spec.rb
-- spec/spec_config.yaml.template
+- spec/active_record/oracle_enhanced/type/float_spec.rb
 - 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