activerecord-oracle_enhanced-adapter 6.0.0 → 6.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c77f9b16cb8c699e6c8916d1cd5c3546f0bd03ed49d2e72106a66dfd9273d88
-  data.tar.gz: bf3b674aebc3267df0668fd211b29b361ebe4c60b5832282ea39d281b6a5bf4a
+  metadata.gz: 1410c7eb8f55a7b4c96b8016f31c573512699978498ee6effae6d4875b1e3f31
+  data.tar.gz: 36cbc570c5c5a1c6d074353f1de0d8d6ce07c90fd5b906727d7ee2e78a473a1e
 SHA512:
-  metadata.gz: ac56991732d1cb09f4996c23d399909045ab89d67388e54636c37e94a4bb599f8d9676717ce0c04d07ba3f7d39bd4271942b1d96a9963663422685fe1c565358
-  data.tar.gz: 740c29c91f5d4b2786493cc035786064bde94bd21d67c5ccee83e54654dd98e31d8ea147255f9f8297446655bafdb19450fbf0878c29add0232bd417e6e30e26
+  metadata.gz: 1f1ba2aed7eef1fa08e31c4fe7f43762eb077b10e412f9db61228589d1387f440b64b17db05fd3fd796e0eb4ebc8ca00f91f767f0ea6402e079783265cb583a6
+  data.tar.gz: 700df5182daf9a04a67dcc478aa378d9deb8d09fba726ccf2ce9878b8c1dc70f56a5a135048e00438e5078b9916467f8b356e6a3a4bc5bc8897fb874a8a686c3

data/History.md

@@ -1,3 +1,39 @@
+## 6.0.5 / 2020-12-17
+
+* Changes and bug fixes
+  * Address `next_sequence_value` ArgumentError syntax [#2048 #2050]
+  * Add /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ hint to address slow SCHEMA queries [#2055, #2069]
+  * `build_subselect` does not have ordering [#2023, #2070, #2073]
+
+## 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

data/VERSION

@@ -1 +1 @@
-6.0.0
+6.0.6

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
 
@@ -247,12 +254,14 @@ module ActiveRecord
           columns.each do |col|
             value = attributes[col.name]
             # changed sequence of next two lines - should check if value is nil before converting to yaml
-            next if value.blank?
+            next unless value
             if klass.attribute_types[col.name].is_a? Type::Serialized
               value = klass.attribute_types[col.name].serialize(value)
+              # value can be nil after serialization because ActiveRecord serializes [] and {} as nil
+              next unless 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 +272,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

@@ -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_dumper.rb

@@ -169,7 +169,7 @@ module ActiveRecord #:nodoc:
           def extract_expression_for_virtual_column(column)
             column_name = column.name
             @connection.select_value(<<~SQL.squish, "Table comment", [bind_string("table_name", table_name.upcase), bind_string("column_name", column_name.upcase)]).inspect
-              select data_default from all_tab_columns
+              select /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ data_default from all_tab_columns
               where owner = SYS_CONTEXT('userenv', 'current_schema')
               and table_name = :table_name
               and column_name = :column_name

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

@@ -12,7 +12,8 @@ module ActiveRecord
 
         def tables #:nodoc:
           select_values(<<~SQL.squish, "tables")
-            SELECT DECODE(table_name, UPPER(table_name), LOWER(table_name), table_name)
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */
+            DECODE(table_name, UPPER(table_name), LOWER(table_name), table_name)
             FROM all_tables
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
             AND secondary = 'N'
@@ -44,7 +45,7 @@ module ActiveRecord
           end
 
           select_values(<<~SQL.squish, "table exists", [bind_string("owner", table_owner), bind_string("table_name", table_name)]).any?
-            SELECT owner, table_name
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ owner, table_name
             FROM all_tables
             WHERE owner = :owner
             AND table_name = :table_name
@@ -60,13 +61,15 @@ module ActiveRecord
 
         def views # :nodoc:
           select_values(<<~SQL.squish, "views")
-            SELECT LOWER(view_name) FROM all_views WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */
+            LOWER(view_name) FROM all_views WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
           SQL
         end
 
         def materialized_views #:nodoc:
           select_values(<<~SQL.squish, "materialized views")
-            SELECT LOWER(mview_name) FROM all_mviews WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */
+            LOWER(mview_name) FROM all_mviews WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
           SQL
         end
 
@@ -88,7 +91,7 @@ module ActiveRecord
           default_tablespace_name = default_tablespace
 
           result = select_all(<<~SQL.squish, "indexes", [bind_string("table_name", table_name)])
-            SELECT LOWER(i.table_name) AS table_name, LOWER(i.index_name) AS index_name, i.uniqueness,
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ LOWER(i.table_name) AS table_name, LOWER(i.index_name) AS index_name, i.uniqueness,
               i.index_type, i.ityp_owner, i.ityp_name, i.parameters,
               LOWER(i.tablespace_name) AS tablespace_name,
               LOWER(c.column_name) AS column_name, e.column_expression,
@@ -118,7 +121,7 @@ module ActiveRecord
               if row["index_type"] == "DOMAIN" && row["ityp_owner"] == "CTXSYS" && row["ityp_name"] == "CONTEXT"
                 procedure_name = default_datastore_procedure(row["index_name"])
                 source = select_values(<<~SQL.squish, "procedure", [bind_string("procedure_name", procedure_name.upcase)]).join
-                  SELECT text
+                  SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ text
                   FROM all_source
                   WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
                     AND name = :procedure_name
@@ -198,7 +201,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 +211,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 +291,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)
@@ -362,7 +365,7 @@ module ActiveRecord
         def index_name_exists?(table_name, index_name)
           (_owner, table_name) = @connection.describe(table_name)
           result = select_value(<<~SQL.squish, "index name exists")
-            SELECT 1 FROM all_indexes i
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ 1 FROM all_indexes i
             WHERE i.owner = SYS_CONTEXT('userenv', 'current_schema')
                AND i.table_owner = SYS_CONTEXT('userenv', 'current_schema')
                AND i.table_name = '#{table_name}'
@@ -402,14 +405,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 +456,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}"
@@ -496,7 +499,7 @@ module ActiveRecord
         def table_comment(table_name) #:nodoc:
           (_owner, table_name) = @connection.describe(table_name)
           select_value(<<~SQL.squish, "Table comment", [bind_string("table_name", table_name)])
-            SELECT comments FROM all_tab_comments
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ comments FROM all_tab_comments
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
               AND table_name = :table_name
           SQL
@@ -512,7 +515,7 @@ module ActiveRecord
           # TODO: it  does not exist in Abstract adapter
           (_owner, table_name) = @connection.describe(table_name)
           select_value(<<~SQL.squish, "Column comment", [bind_string("table_name", table_name), bind_string("column_name", column_name.upcase)])
-            SELECT comments FROM all_col_comments
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ comments FROM all_col_comments
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
               AND table_name = :table_name
               AND column_name = :column_name
@@ -529,7 +532,7 @@ module ActiveRecord
 
         def tablespace(table_name)
           select_value(<<~SQL.squish, "tablespace")
-            SELECT tablespace_name
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ tablespace_name
             FROM all_tables
             WHERE table_name='#{table_name.to_s.upcase}'
             AND owner = SYS_CONTEXT('userenv', 'current_schema')
@@ -541,7 +544,7 @@ module ActiveRecord
           (_owner, desc_table_name) = @connection.describe(table_name)
 
           fk_info = select_all(<<~SQL.squish, "Foreign Keys", [bind_string("desc_table_name", desc_table_name)])
-            SELECT r.table_name to_table
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ r.table_name to_table
                   ,rc.column_name references_column
                   ,cc.column_name
                   ,c.constraint_name name
@@ -583,7 +586,7 @@ module ActiveRecord
 
         def disable_referential_integrity(&block) #:nodoc:
           old_constraints = select_all(<<~SQL.squish, "Foreign Keys to disable and enable")
-            SELECT constraint_name, owner, table_name
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ constraint_name, owner, table_name
               FROM all_constraints
               WHERE constraint_type = 'R'
               AND status = 'ENABLED'
@@ -619,8 +622,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)
@@ -699,7 +702,7 @@ module ActiveRecord
             return unless tablespace
 
             index_name = select_value(<<~SQL.squish, "Index name for primary key",  [bind_string("table_name", table_name.upcase)])
-              SELECT index_name FROM all_constraints
+              SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ index_name FROM all_constraints
                   WHERE table_name = :table_name
                   AND constraint_type = 'P'
                   AND owner = SYS_CONTEXT('userenv', 'current_schema')

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

@@ -9,7 +9,8 @@ module ActiveRecord #:nodoc:
 
         def structure_dump #:nodoc:
           sequences = select(<<~SQL.squish, "sequences to dump at structure dump")
-            SELECT sequence_name, min_value, max_value, increment_by, order_flag, cycle_flag
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */
+            sequence_name, min_value, max_value, increment_by, order_flag, cycle_flag
             FROM all_sequences
             where sequence_owner = SYS_CONTEXT('userenv', 'current_schema') ORDER BY 1
           SQL
@@ -18,7 +19,7 @@ module ActiveRecord #:nodoc:
             "CREATE SEQUENCE #{quote_table_name(result["sequence_name"])} MINVALUE #{result["min_value"]} MAXVALUE #{result["max_value"]} INCREMENT BY #{result["increment_by"]} #{result["order_flag"] == 'Y' ? "ORDER" : "NOORDER"} #{result["cycle_flag"] == 'Y' ? "CYCLE" : "NOCYCLE"}"
           end
           tables = select_values(<<~SQL.squish, "tables at structure dump")
-            SELECT table_name FROM all_tables t
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ table_name FROM all_tables t
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema') AND secondary = 'N'
             AND NOT EXISTS (SELECT mv.mview_name FROM all_mviews mv
                             WHERE mv.owner = t.owner AND mv.mview_name = t.table_name)
@@ -30,7 +31,7 @@ module ActiveRecord #:nodoc:
             virtual_columns = virtual_columns_for(table_name) if supports_virtual_columns?
             ddl = +"CREATE#{ ' GLOBAL TEMPORARY' if temporary_table?(table_name)} TABLE \"#{table_name}\" (\n"
             columns = select_all(<<~SQL.squish, "columns at structure dump")
-              SELECT column_name, data_type, data_length, char_used, char_length,
+              SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ column_name, data_type, data_length, char_used, char_length,
               data_precision, data_scale, data_default, nullable
               FROM all_tab_columns
               WHERE table_name = '#{table_name}'
@@ -54,8 +55,9 @@ module ActiveRecord #:nodoc:
             structure << structure_dump_column_comments(table_name)
           end
 
-          join_with_statement_token(structure) << structure_dump_fk_constraints
-          join_with_statement_token(structure) << structure_dump_views
+          join_with_statement_token(structure) <<
+            structure_dump_fk_constraints <<
+            structure_dump_views
         end
 
         def structure_dump_column(column) #:nodoc:
@@ -90,7 +92,7 @@ module ActiveRecord #:nodoc:
         def structure_dump_primary_key(table) #:nodoc:
           opts = { name: "", cols: [] }
           pks = select_all(<<~SQL.squish, "Primary Keys")
-            SELECT a.constraint_name, a.column_name, a.position
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ a.constraint_name, a.column_name, a.position
               FROM all_cons_columns a
               JOIN all_constraints c
                 ON a.constraint_name = c.constraint_name
@@ -109,7 +111,7 @@ module ActiveRecord #:nodoc:
         def structure_dump_unique_keys(table) #:nodoc:
           keys = {}
           uks = select_all(<<~SQL.squish, "Primary Keys")
-            SELECT a.constraint_name, a.column_name, a.position
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ a.constraint_name, a.column_name, a.position
               FROM all_cons_columns a
               JOIN all_constraints c
                 ON a.constraint_name = c.constraint_name
@@ -145,7 +147,7 @@ module ActiveRecord #:nodoc:
 
         def structure_dump_fk_constraints #:nodoc:
           foreign_keys = select_all(<<~SQL.squish, "foreign keys at structure dump")
-            SELECT table_name FROM all_tables
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ table_name FROM all_tables
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema') ORDER BY 1
           SQL
           fks = foreign_keys.map do |table|
@@ -173,7 +175,7 @@ module ActiveRecord #:nodoc:
         def structure_dump_column_comments(table_name)
           comments = []
           columns = select_values(<<~SQL.squish, "column comments at structure dump")
-            SELECT column_name FROM user_tab_columns
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ column_name FROM user_tab_columns
             WHERE table_name = '#{table_name}' ORDER BY column_id
           SQL
 
@@ -207,7 +209,7 @@ module ActiveRecord #:nodoc:
         def structure_dump_db_stored_code #:nodoc:
           structure = []
           all_source = select_all(<<~SQL.squish, "stored program at structure dump")
-            SELECT DISTINCT name, type
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ DISTINCT name, type
             FROM all_source
             WHERE type IN ('PROCEDURE', 'PACKAGE', 'PACKAGE BODY', 'FUNCTION', 'TRIGGER', 'TYPE')
             AND name NOT LIKE 'BIN$%'
@@ -216,7 +218,7 @@ module ActiveRecord #:nodoc:
           all_source.each do |source|
             ddl = +"CREATE OR REPLACE   \n"
             texts = select_all(<<~SQL.squish, "all source at structure dump")
-              SELECT text
+              SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ text
               FROM all_source
               WHERE name = '#{source['name']}'
               AND type = '#{source['type']}'
@@ -239,7 +241,7 @@ module ActiveRecord #:nodoc:
         def structure_dump_views #:nodoc:
           structure = []
           views = select_all(<<~SQL.squish, "views at structure dump")
-            SELECT view_name, text FROM all_views
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ view_name, text FROM all_views
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema') ORDER BY view_name ASC
           SQL
           views.each do |view|
@@ -251,7 +253,7 @@ module ActiveRecord #:nodoc:
         def structure_dump_synonyms #:nodoc:
           structure = []
           synonyms = select_all(<<~SQL.squish, "synonyms at structure dump")
-            SELECT owner, synonym_name, table_name, table_owner
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ owner, synonym_name, table_name, table_owner
             FROM all_synonyms
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
           SQL
@@ -264,13 +266,14 @@ module ActiveRecord #:nodoc:
 
         def structure_drop #:nodoc:
           sequences = select_values(<<~SQL.squish, "sequences to drop at structure dump")
-            SELECT sequence_name FROM all_sequences where sequence_owner = SYS_CONTEXT('userenv', 'current_schema') ORDER BY 1
+            SELECT/*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */
+            sequence_name FROM all_sequences where sequence_owner = SYS_CONTEXT('userenv', 'current_schema') ORDER BY 1
           SQL
           statements = sequences.map do |seq|
             "DROP SEQUENCE \"#{seq}\""
           end
           tables = select_values(<<~SQL.squish, "tables to drop at structure dump")
-            SELECT table_name from all_tables t
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ table_name from all_tables t
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema') AND secondary = 'N'
             AND NOT EXISTS (SELECT mv.mview_name FROM all_mviews mv
                             WHERE mv.owner = t.owner AND mv.mview_name = t.table_name)
@@ -286,7 +289,7 @@ module ActiveRecord #:nodoc:
 
         def temp_table_drop #:nodoc:
           temporary_tables = select_values(<<~SQL.squish, "temporary tables to drop at structure dump")
-            SELECT table_name FROM all_tables
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ table_name FROM all_tables
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
             AND secondary = 'N' AND temporary = 'Y' ORDER BY 1
           SQL
@@ -321,7 +324,7 @@ module ActiveRecord #:nodoc:
         # return [{'column_name' => 'FOOS', 'data_default' => '...'}, ...]
         def virtual_columns_for(table)
           select_all(<<~SQL.squish, "virtual columns for")
-            SELECT column_name, data_default
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ column_name, data_default
             FROM all_tab_cols
             WHERE virtual_column = 'YES'
             AND owner = SYS_CONTEXT('userenv', 'current_schema')
@@ -332,7 +335,7 @@ module ActiveRecord #:nodoc:
         def drop_sql_for_feature(type)
           short_type = type == "materialized view" ? "mview" : type
           features = select_values(<<~SQL.squish, "features to drop")
-            SELECT #{short_type}_name FROM all_#{short_type.tableize}
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ #{short_type}_name FROM all_#{short_type.tableize}
             where owner = SYS_CONTEXT('userenv', 'current_schema')
           SQL
           statements = features.map do |name|
@@ -343,7 +346,7 @@ module ActiveRecord #:nodoc:
 
         def drop_sql_for_object(type)
           objects = select_values(<<~SQL.squish, "objects to drop")
-            SELECT object_name FROM all_objects
+            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ object_name FROM all_objects
             WHERE object_type = '#{type.upcase}' and owner = SYS_CONTEXT('userenv', 'current_schema')
           SQL
           statements = objects.map do |name|

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -449,7 +449,7 @@ module ActiveRecord
       # when inserting a new database record (see #prefetch_primary_key?).
       def next_sequence_value(sequence_name)
         # if sequence_name is set to :autogenerated then it means that primary key will be populated by trigger
-        raise ArgumentError "Trigger based primary key is not supported" if sequence_name == AUTOGENERATED_SEQUENCE_NAME
+        raise ArgumentError.new "Trigger based primary key is not supported" if sequence_name == AUTOGENERATED_SEQUENCE_NAME
         # call directly connection method to avoid prepared statement which causes fetching of next sequence value twice
         select_value(<<~SQL.squish, "next sequence value")
           SELECT #{quote_table_name(sequence_name)}.NEXTVAL FROM dual
@@ -526,7 +526,7 @@ module ActiveRecord
       # Default tablespace name of current user
       def default_tablespace
         select_value(<<~SQL.squish, "default tablespace")
-          SELECT LOWER(default_tablespace) FROM user_users
+          SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ LOWER(default_tablespace) FROM user_users
           WHERE username = SYS_CONTEXT('userenv', 'current_schema')
         SQL
       end
@@ -535,7 +535,7 @@ module ActiveRecord
         (owner, desc_table_name) = @connection.describe(table_name)
 
         select_all(<<~SQL.squish, "Column definitions")
-          SELECT cols.column_name AS name, cols.data_type AS sql_type,
+          SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ cols.column_name AS name, cols.data_type AS sql_type,
                  cols.data_default, cols.nullable, cols.virtual_column, cols.hidden_column,
                  cols.data_type_owner AS sql_type_owner,
                  DECODE(cols.data_type, 'NUMBER', data_precision,
@@ -567,7 +567,7 @@ module ActiveRecord
         (owner, desc_table_name) = @connection.describe(table_name)
 
         seqs = select_values(<<~SQL.squish, "Sequence")
-          select us.sequence_name
+          select /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ us.sequence_name
           from all_sequences us
           where us.sequence_owner = '#{owner}'
           and us.sequence_name = upper(#{quote(default_sequence_name(desc_table_name))})
@@ -575,7 +575,7 @@ module ActiveRecord
 
         # changed back from user_constraints to all_constraints for consistency
         pks = select_values(<<~SQL.squish, "Primary Key")
-          SELECT cc.column_name
+          SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ cc.column_name
             FROM all_constraints c, all_cons_columns cc
            WHERE c.owner = '#{owner}'
              AND c.table_name = #{quote(desc_table_name)}
@@ -609,7 +609,7 @@ module ActiveRecord
         (_owner, desc_table_name) = @connection.describe(table_name)
 
         pks = select_values(<<~SQL.squish, "Primary Keys", [bind_string("table_name", desc_table_name)])
-          SELECT cc.column_name
+          SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ cc.column_name
             FROM all_constraints c, all_cons_columns cc
            WHERE c.owner = SYS_CONTEXT('userenv', 'current_schema')
              AND c.table_name = :table_name
@@ -639,7 +639,8 @@ module ActiveRecord
 
       def temporary_table?(table_name) #:nodoc:
         select_value(<<~SQL.squish, "temporary table", [bind_string("table_name", table_name.upcase)]) == "Y"
-          SELECT temporary FROM all_tables WHERE table_name = :table_name and owner = SYS_CONTEXT('userenv', 'current_schema')
+          SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */
+          temporary FROM all_tables WHERE table_name = :table_name and owner = SYS_CONTEXT('userenv', 'current_schema')
         SQL
       end
 
@@ -746,3 +747,26 @@ require "active_record/connection_adapters/oracle_enhanced/version"
 module ActiveRecord
   autoload :OracleEnhancedProcedures, "active_record/connection_adapters/oracle_enhanced/procedures"
 end
+
+# Backport #2070 into relese60 branch by adding some dirty monkey patch
+# Because #2002 has been merged to release61 branch or newer, not available for release60 branch.
+module Arel # :nodoc: all
+  module Visitors
+    class Oracle < Arel::Visitors::ToSql
+      private
+        def build_subselect(key, o)
+          stmt             = super
+          stmt.orders      = [] # `orders` will never be set to prevent `ORA-00907`.
+          stmt
+        end
+    end
+    class Oracle12 < Arel::Visitors::ToSql
+      private
+        def build_subselect(key, o)
+          stmt             = super
+          stmt.orders      = [] # `orders` will never be set to prevent `ORA-00907`.
+          stmt
+        end
+    end
+  end
+end

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/active_record/connection_adapters/oracle_enhanced/structure_dump_spec.rb

@@ -66,7 +66,7 @@ describe "OracleEnhancedAdapter structure dump" do
         ALTER TABLE TEST_POSTS
         ADD CONSTRAINT fk_test_post_foo FOREIGN KEY (foo_id) REFERENCES foos(id)
       SQL
-      dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
+      dump = ActiveRecord::Base.connection.structure_dump
       expect(dump.split('\n').length).to eq(1)
       expect(dump).to match(/ALTER TABLE \"?TEST_POSTS\"? ADD CONSTRAINT \"?FK_TEST_POST_FOO\"? FOREIGN KEY \(\"?FOO_ID\"?\) REFERENCES \"?FOOS\"?\(\"?ID\"?\)/i)
     end
@@ -86,7 +86,7 @@ describe "OracleEnhancedAdapter structure dump" do
         ADD CONSTRAINT fk_test_post_baz FOREIGN KEY (baz_id) REFERENCES foos(baz_id)
       SQL
 
-      dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
+      dump = ActiveRecord::Base.connection.structure_dump
       expect(dump.split('\n').length).to eq(1)
       expect(dump).to match(/ALTER TABLE \"?TEST_POSTS\"? ADD CONSTRAINT \"?FK_TEST_POST_BAZ\"? FOREIGN KEY \(\"?BAZ_ID\"?\) REFERENCES \"?FOOS\"?\(\"?BAZ_ID\"?\)/i)
     end

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -150,6 +150,45 @@ describe "OracleEnhancedAdapter" do
     end
   end
 
+  describe "`has_many` assoc has `dependent: :delete_all` with `order`" do
+    before(:all) do
+      schema_define do
+        create_table :test_posts do |t|
+          t.string      :title
+        end
+        create_table :test_comments do |t|
+          t.integer     :test_post_id
+          t.string      :description
+        end
+        add_index :test_comments, :test_post_id
+      end
+      class ::TestPost < ActiveRecord::Base
+        has_many :test_comments, -> { order(:id) }, dependent: :delete_all
+      end
+      class ::TestComment < ActiveRecord::Base
+        belongs_to :test_post
+      end
+      TestPost.transaction do
+        post = TestPost.create!(title: "Title")
+        TestComment.create!(test_post_id: post.id, description: "Description")
+      end
+    end
+
+    after(:all) do
+      schema_define do
+        drop_table :test_comments
+        drop_table :test_posts
+      end
+      Object.send(:remove_const, "TestPost")
+      Object.send(:remove_const, "TestComment")
+      ActiveRecord::Base.clear_cache!
+    end
+
+    it "should not occur `ActiveRecord::StatementInvalid: OCIError: ORA-00907: missing right parenthesis`" do
+      expect { TestPost.first.destroy }.not_to raise_error
+    end
+  end
+
   describe "eager loading" do
     before(:all) do
       schema_define do
@@ -392,6 +431,45 @@ describe "OracleEnhancedAdapter" do
     end
   end
 
+  describe "Binary lob column" do
+    before(:all) do
+      schema_define do
+        create_table :test_binary_columns do |t|
+          t.binary :attachment
+        end
+      end
+      class ::TestBinaryColumn < ActiveRecord::Base
+      end
+    end
+
+    after(:all) do
+      schema_define do
+        drop_table :test_binary_columns
+      end
+      Object.send(:remove_const, "TestBinaryColumn")
+      ActiveRecord::Base.table_name_prefix = nil
+      ActiveRecord::Base.clear_cache!
+    end
+
+    before(:each) do
+      set_logger
+    end
+
+    after(:each) do
+      clear_logger
+    end
+
+    it "should serialize with non UTF-8 data" do
+      binary_value = +"Hello \x93\xfa\x96\x7b"
+      binary_value.force_encoding "UTF-8"
+
+      binary_column_object = TestBinaryColumn.new
+      binary_column_object.attachment = binary_value
+
+      expect(binary_column_object.save!).to eq(true)
+    end
+  end
+
   describe "quoting" do
     before(:all) do
       schema_define do

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
+  version: 6.0.6
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-17 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -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
+rubygems_version: 3.2.3
 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/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/connection_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/context_index_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/database_tasks_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/dbms_output_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/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/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/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/connection_adapters/oracle_enhanced_adapter_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_data_types_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/boolean_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/dirty_spec.rb
+- spec/active_record/oracle_enhanced/type/float_spec.rb
 - spec/active_record/oracle_enhanced/type/integer_spec.rb
+- spec/active_record/oracle_enhanced/type/json_spec.rb
+- spec/active_record/oracle_enhanced/type/national_character_string_spec.rb
+- spec/active_record/oracle_enhanced/type/national_character_text_spec.rb
+- spec/active_record/oracle_enhanced/type/raw_spec.rb
+- spec/active_record/oracle_enhanced/type/text_spec.rb
+- spec/active_record/oracle_enhanced/type/timestamp_spec.rb
 - spec/spec_config.yaml.template
+- spec/spec_helper.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