further clean-up and fixes

Author: akostadinov

config/initializers/oracle.rb

@@ -49,7 +49,12 @@ def close_and_clear_statements
       end
     end
 
+    # uncomment the commented our lines for https://github.com/rsim/oracle-enhanced/pull/2485
+    # if you uncomment them and things don't fail, then they are taking effect
     ActiveRecord::Base.skip_callback(:update, :after, :enhanced_write_lobs)
+    # ActiveRecord::Base.skip_callback(:create, :after, :enhanced_write_lobs)
+    ActiveRecord::Base.skip_callback(:update, :before, :record_changed_lobs)
+    # ActiveRecord::Base.skip_callback(:create, :before, :record_lobs_for_create)
 
     # For more information see https://github.com/rsim/oracle-enhanced/pull/2483
     module OracleEnhancedSmartQuoting
@@ -195,47 +200,6 @@ def find_one(id)
       end
     end)
 
-    ActiveRecord::ConnectionAdapters::OracleEnhanced::SchemaStatements.module_eval do
-      def distinct_relation_for_primary_key(relation) # :nodoc:
-        primary_key_columns = Array(relation.primary_key).map do |column|
-          visitor.compile(relation.table[column])
-        end
-
-        values = columns_for_distinct(
-          primary_key_columns,
-          relation.order_values
-        )
-
-        limited = relation.reselect(values).distinct!
-
-        # The original code in https://github.com/rails/rails/blob/v7.1.5.1/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb#L1404-L1406
-        # ----
-        # limited_ids = select_rows(limited.arel, "SQL").map do |results|
-        #   results.last(Array(relation.primary_key).length) # ignores order values for MySQL and PostgreSQL
-        # end
-        # ----
-        # The change is needed because in Oracle, because otherwise the resulting `limited_ids` array would be wrong. For example,
-        # for a ServiceContract model that has the primary key "id" and a query with ordering and filtering you may get:
-        # 1. `limited` variable can be something like: #<ActiveRecord::Relation [#<ServiceContract alias_0__: "live", id: 4, raw_rnum_: 1>]>
-        # 2. `select_rows` would then return [["live",4,1]]
-        # 3. `limited_ids` calculation will result in [[1]], which is an invalid IDs list (the expected is [[4]])
-        # The updated code doesn't make assumptions about how many columns are selected or their order, but fetches the values according
-        # to the primary key column names
-        limited_ids = select_all(limited.arel, "SQL").to_ary.map do |result|
-          result.values_at(*Array(relation.primary_key))
-        end
-
-        if limited_ids.empty?
-          relation.none!
-        else
-          relation.where!(**Array(relation.primary_key).zip(limited_ids.transpose).to_h)
-        end
-
-        relation.limit_value = relation.offset_value = nil
-        relation
-      end
-    end
-
     # see https://github.com/rsim/oracle-enhanced/issues/2276
     module OracleEnhancedAdapterSchemaIssue2276
       def column_definitions(table_name)

lib/arel/visitors/oracle12_hack.rb

@@ -20,17 +20,19 @@ def visit_Arel_Nodes_Equality(o, collector)
         collector
       end
 
-      # remove when addressed: https://github.com/rsim/oracle-enhanced/pull/2247 - included in v7.1.0
-      def visit_Arel_Nodes_Matches o, collector
-        if !o.case_sensitive && o.left && o.right
-          o.left = Arel::Nodes::NamedFunction.new('UPPER', [o.left])
-          o.right = Arel::Nodes::NamedFunction.new('UPPER', [o.right])
+      # remove once fixed in https://github.com/rsim/oracle-enhanced/pull/2573 (8.1.4+)
+      # Note that I'm not fully happy with this as the other visitor is missing potential
+      # patches that we have in this visitor. But limit+lock should be rare and simpler.
+      # An example failing operation without this is ProxyRule#move_to_top
+      def visit_Arel_Nodes_SelectStatement(o, collector)
+        if o.limit && o.lock
+          @oracle11_visitor ||= Arel::Visitors::Oracle.new(@connection)
+          return @oracle11_visitor.accept(o.dup, collector)
         end
-
-        super o, collector
+        super
       end
 
-      # Remove after upgrade to a version with
+      # can remove both after upgrade to a version with (8.1.4+ perhaps)
       # https://github.com/rsim/oracle-enhanced/pull/2654
       def visit_Arel_Nodes_In(o, collector)
         attr, values = o.left, o.right