activerecord-oracle_enhanced-adapter 6.0.6 → 6.1.0.rc1

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

@@ -8,9 +8,8 @@ module ActiveRecord #:nodoc:
         STATEMENT_TOKEN = "\n\n/\n\n"
 
         def structure_dump #:nodoc:
-          sequences = select(<<~SQL.squish, "sequences to dump at structure dump")
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */
-            sequence_name, min_value, max_value, increment_by, order_flag, cycle_flag
+          sequences = select(<<~SQL.squish, "SCHEMA")
+            SELECT 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,8 +17,8 @@ module ActiveRecord #:nodoc:
           structure = sequences.map do |result|
             "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 /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ table_name FROM all_tables t
+          tables = select_values(<<~SQL.squish, "SCHEMA")
+            SELECT 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,8 +29,8 @@ module ActiveRecord #:nodoc:
           tables.each do |table_name|
             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 /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ column_name, data_type, data_length, char_used, char_length,
+            columns = select_all(<<~SQL.squish, "SCHEMA")
+              SELECT 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}'
@@ -55,9 +54,8 @@ module ActiveRecord #:nodoc:
             structure << structure_dump_column_comments(table_name)
           end
 
-          join_with_statement_token(structure) <<
-            structure_dump_fk_constraints <<
-            structure_dump_views
+          join_with_statement_token(structure) << structure_dump_fk_constraints
+          join_with_statement_token(structure) << structure_dump_views
         end
 
         def structure_dump_column(column) #:nodoc:
@@ -91,8 +89,8 @@ module ActiveRecord #:nodoc:
 
         def structure_dump_primary_key(table) #:nodoc:
           opts = { name: "", cols: [] }
-          pks = select_all(<<~SQL.squish, "Primary Keys")
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ a.constraint_name, a.column_name, a.position
+          pks = select_all(<<~SQL.squish, "SCHEMA")
+            SELECT a.constraint_name, a.column_name, a.position
               FROM all_cons_columns a
               JOIN all_constraints c
                 ON a.constraint_name = c.constraint_name
@@ -110,8 +108,8 @@ module ActiveRecord #:nodoc:
 
         def structure_dump_unique_keys(table) #:nodoc:
           keys = {}
-          uks = select_all(<<~SQL.squish, "Primary Keys")
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ a.constraint_name, a.column_name, a.position
+          uks = select_all(<<~SQL.squish, "SCHEMA")
+            SELECT a.constraint_name, a.column_name, a.position
               FROM all_cons_columns a
               JOIN all_constraints c
                 ON a.constraint_name = c.constraint_name
@@ -146,8 +144,8 @@ module ActiveRecord #:nodoc:
         end
 
         def structure_dump_fk_constraints #:nodoc:
-          foreign_keys = select_all(<<~SQL.squish, "foreign keys at structure dump")
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ table_name FROM all_tables
+          foreign_keys = select_all(<<~SQL.squish, "SCHEMA")
+            SELECT table_name FROM all_tables
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema') ORDER BY 1
           SQL
           fks = foreign_keys.map do |table|
@@ -174,8 +172,8 @@ module ActiveRecord #:nodoc:
 
         def structure_dump_column_comments(table_name)
           comments = []
-          columns = select_values(<<~SQL.squish, "column comments at structure dump")
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ column_name FROM user_tab_columns
+          columns = select_values(<<~SQL.squish, "SCHEMA")
+            SELECT column_name FROM user_tab_columns
             WHERE table_name = '#{table_name}' ORDER BY column_id
           SQL
 
@@ -208,8 +206,8 @@ module ActiveRecord #:nodoc:
         # Extract all stored procedures, packages, synonyms.
         def structure_dump_db_stored_code #:nodoc:
           structure = []
-          all_source = select_all(<<~SQL.squish, "stored program at structure dump")
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ DISTINCT name, type
+          all_source = select_all(<<~SQL.squish, "SCHEMA")
+            SELECT DISTINCT name, type
             FROM all_source
             WHERE type IN ('PROCEDURE', 'PACKAGE', 'PACKAGE BODY', 'FUNCTION', 'TRIGGER', 'TYPE')
             AND name NOT LIKE 'BIN$%'
@@ -218,7 +216,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 /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ text
+              SELECT text
               FROM all_source
               WHERE name = '#{source['name']}'
               AND type = '#{source['type']}'
@@ -240,8 +238,8 @@ module ActiveRecord #:nodoc:
 
         def structure_dump_views #:nodoc:
           structure = []
-          views = select_all(<<~SQL.squish, "views at structure dump")
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ view_name, text FROM all_views
+          views = select_all(<<~SQL.squish, "SCHEMA")
+            SELECT view_name, text FROM all_views
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema') ORDER BY view_name ASC
           SQL
           views.each do |view|
@@ -252,8 +250,8 @@ module ActiveRecord #:nodoc:
 
         def structure_dump_synonyms #:nodoc:
           structure = []
-          synonyms = select_all(<<~SQL.squish, "synonyms at structure dump")
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ owner, synonym_name, table_name, table_owner
+          synonyms = select_all(<<~SQL.squish, "SCHEMA")
+            SELECT owner, synonym_name, table_name, table_owner
             FROM all_synonyms
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
           SQL
@@ -265,15 +263,14 @@ module ActiveRecord #:nodoc:
         end
 
         def structure_drop #:nodoc:
-          sequences = select_values(<<~SQL.squish, "sequences to drop at structure dump")
-            SELECT/*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */
-            sequence_name FROM all_sequences where sequence_owner = SYS_CONTEXT('userenv', 'current_schema') ORDER BY 1
+          sequences = select_values(<<~SQL.squish, "SCHEMA")
+            SELECT 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 /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ table_name from all_tables t
+          tables = select_values(<<~SQL.squish, "SCHEMA")
+            SELECT 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)
@@ -288,8 +285,8 @@ module ActiveRecord #:nodoc:
         end
 
         def temp_table_drop #:nodoc:
-          temporary_tables = select_values(<<~SQL.squish, "temporary tables to drop at structure dump")
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ table_name FROM all_tables
+          temporary_tables = select_values(<<~SQL.squish, "SCHEMA")
+            SELECT table_name FROM all_tables
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
             AND secondary = 'N' AND temporary = 'Y' ORDER BY 1
           SQL
@@ -319,12 +316,11 @@ module ActiveRecord #:nodoc:
         end
 
       private
-
         # Called only if `supports_virtual_columns?` returns true
         # return [{'column_name' => 'FOOS', 'data_default' => '...'}, ...]
         def virtual_columns_for(table)
-          select_all(<<~SQL.squish, "virtual columns for")
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ column_name, data_default
+          select_all(<<~SQL.squish, "SCHEMA")
+            SELECT column_name, data_default
             FROM all_tab_cols
             WHERE virtual_column = 'YES'
             AND owner = SYS_CONTEXT('userenv', 'current_schema')
@@ -334,8 +330,8 @@ 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 /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ #{short_type}_name FROM all_#{short_type.tableize}
+          features = select_values(<<~SQL.squish, "SCHEMA")
+            SELECT #{short_type}_name FROM all_#{short_type.tableize}
             where owner = SYS_CONTEXT('userenv', 'current_schema')
           SQL
           statements = features.map do |name|
@@ -345,8 +341,8 @@ module ActiveRecord #:nodoc:
         end
 
         def drop_sql_for_object(type)
-          objects = select_values(<<~SQL.squish, "objects to drop")
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ object_name FROM all_objects
+          objects = select_values(<<~SQL.squish, "SCHEMA")
+            SELECT 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/type_metadata.rb

@@ -4,6 +4,8 @@ module ActiveRecord
   module ConnectionAdapters #:nodoc:
     module OracleEnhanced
       class TypeMetadata < DelegateClass(ActiveRecord::ConnectionAdapters::SqlTypeMetadata) # :nodoc:
+        include Deduplicable
+
         attr_reader :virtual
 
         def initialize(type_metadata, virtual: nil)
@@ -23,7 +25,6 @@ module ActiveRecord
         end
 
         protected
-
           def attributes_for_hash
             [self.class, @type_metadata, virtual]
           end

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -30,6 +30,9 @@
 # contribution.
 # portions Copyright 2005 Graham Jenkins
 
+require "arel/visitors/oracle"
+require "arel/visitors/oracle12"
+require "active_record/connection_adapters"
 require "active_record/connection_adapters/abstract_adapter"
 require "active_record/connection_adapters/statement_pool"
 require "active_record/connection_adapters/oracle_enhanced/connection"
@@ -213,13 +216,24 @@ module ActiveRecord
       cattr_accessor :use_shorter_identifier
       self.use_shorter_identifier = false
 
+      ##
+      # :singleton-method:
+      # By default, OracleEnhanced adapter will grant unlimited tablespace, create session, create table, create view,
+      # and create sequence when running the rake task db:create.
+      #
+      # If you wish to change these permissions you can add the following line to your initializer file:
+      #
+      #   ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.permissions =
+      #   ["create session", "create table", "create view", "create sequence", "create trigger", "ctxapp"]
+      cattr_accessor :permissions
+      self.permissions = ["create session", "create table", "create view", "create sequence"]
+
       ##
       # :singleton-method:
       # Specify default sequence start with value (by default 1 if not explicitly set), e.g.:
 
       class StatementPool < ConnectionAdapters::StatementPool
         private
-
           def dealloc(stmt)
             stmt.close
           end
@@ -238,6 +252,14 @@ module ActiveRecord
         ADAPTER_NAME
       end
 
+      # Oracle enhanced adapter has no implementation because
+      # Oracle Database cannot detect `NoDatabaseError`.
+      # Please refer to the following discussion for details.
+      # https://github.com/rsim/oracle-enhanced/pull/1900
+      def self.database_exists?(config)
+        raise NotImplementedError
+      end
+
       def arel_visitor # :nodoc:
         if supports_fetch_first_n_rows_and_offset?
           Arel::Visitors::Oracle12.new(self)
@@ -266,6 +288,10 @@ module ActiveRecord
         true
       end
 
+      def supports_common_table_expressions?
+        true
+      end
+
       def supports_views?
         true
       end
@@ -438,6 +464,7 @@ module ActiveRecord
       end
 
       def discard!
+        super
         @connection = nil
       end
 
@@ -451,7 +478,7 @@ module ActiveRecord
         # if sequence_name is set to :autogenerated then it means that primary key will be populated by trigger
         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_value(<<~SQL.squish, "SCHEMA")
           SELECT #{quote_table_name(sequence_name)}.NEXTVAL FROM dual
         SQL
       end
@@ -489,7 +516,7 @@ module ActiveRecord
         end
 
         if primary_key && sequence_name
-          new_start_value = select_value(<<~SQL.squish, "new start value")
+          new_start_value = select_value(<<~SQL.squish, "SCHEMA")
             select NVL(max(#{quote_column_name(primary_key)}),0) + 1 from #{quote_table_name(table_name)}
           SQL
 
@@ -500,33 +527,33 @@ module ActiveRecord
 
       # Current database name
       def current_database
-        select_value(<<~SQL.squish, "current database on CDB ")
+        select_value(<<~SQL.squish, "SCHEMA")
           SELECT SYS_CONTEXT('userenv', 'con_name') FROM dual
         SQL
       rescue ActiveRecord::StatementInvalid
-        select_value(<<~SQL.squish, "current database")
+        select_value(<<~SQL.squish, "SCHEMA")
           SELECT SYS_CONTEXT('userenv', 'db_name') FROM dual
         SQL
       end
 
       # Current database session user
       def current_user
-        select_value(<<~SQL.squish, "current user")
+        select_value(<<~SQL.squish, "SCHEMA")
           SELECT SYS_CONTEXT('userenv', 'session_user') FROM dual
         SQL
       end
 
       # Current database session schema
       def current_schema
-        select_value(<<~SQL.squish, "current schema")
+        select_value(<<~SQL.squish, "SCHEMA")
           SELECT SYS_CONTEXT('userenv', 'current_schema') FROM dual
         SQL
       end
 
       # Default tablespace name of current user
       def default_tablespace
-        select_value(<<~SQL.squish, "default tablespace")
-          SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ LOWER(default_tablespace) FROM user_users
+        select_value(<<~SQL.squish, "SCHEMA")
+          SELECT LOWER(default_tablespace) FROM user_users
           WHERE username = SYS_CONTEXT('userenv', 'current_schema')
         SQL
       end
@@ -534,8 +561,8 @@ module ActiveRecord
       def column_definitions(table_name)
         (owner, desc_table_name) = @connection.describe(table_name)
 
-        select_all(<<~SQL.squish, "Column definitions")
-          SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ cols.column_name AS name, cols.data_type AS sql_type,
+        select_all(<<~SQL.squish, "SCHEMA")
+          SELECT 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,
@@ -566,16 +593,16 @@ module ActiveRecord
       def pk_and_sequence_for(table_name, owner = nil, desc_table_name = nil) #:nodoc:
         (owner, desc_table_name) = @connection.describe(table_name)
 
-        seqs = select_values(<<~SQL.squish, "Sequence")
-          select /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ us.sequence_name
+        seqs = select_values(<<~SQL.squish, "SCHEMA")
+          select us.sequence_name
           from all_sequences us
           where us.sequence_owner = '#{owner}'
           and us.sequence_name = upper(#{quote(default_sequence_name(desc_table_name))})
         SQL
 
         # changed back from user_constraints to all_constraints for consistency
-        pks = select_values(<<~SQL.squish, "Primary Key")
-          SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ cc.column_name
+        pks = select_values(<<~SQL.squish, "SCHEMA")
+          SELECT cc.column_name
             FROM all_constraints c, all_cons_columns cc
            WHERE c.owner = '#{owner}'
              AND c.table_name = #{quote(desc_table_name)}
@@ -608,8 +635,8 @@ module ActiveRecord
       def primary_keys(table_name) # :nodoc:
         (_owner, desc_table_name) = @connection.describe(table_name)
 
-        pks = select_values(<<~SQL.squish, "Primary Keys", [bind_string("table_name", desc_table_name)])
-          SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ cc.column_name
+        pks = select_values(<<~SQL.squish, "SCHEMA", [bind_string("table_name", desc_table_name)])
+          SELECT 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
@@ -628,7 +655,7 @@ module ActiveRecord
         #
         # It does not construct DISTINCT clause. Just return column names for distinct.
         order_columns = orders.reject(&:blank?).map { |s|
-            s = s.to_sql unless s.is_a?(String)
+            s = visitor.compile(s) unless s.is_a?(String)
             # remove any ASC/DESC modifiers
             s.gsub(/\s+(ASC|DESC)\s*?/i, "")
           }.reject(&:blank?).map.with_index { |column, i|
@@ -638,9 +665,8 @@ module ActiveRecord
       end
 
       def temporary_table?(table_name) #:nodoc:
-        select_value(<<~SQL.squish, "temporary table", [bind_string("table_name", table_name.upcase)]) == "Y"
-          SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */
-          temporary FROM all_tables WHERE table_name = :table_name and owner = SYS_CONTEXT('userenv', 'current_schema')
+        select_value(<<~SQL.squish, "SCHEMA", [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')
         SQL
       end
 
@@ -748,25 +774,17 @@ 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
+# Workaround for https://github.com/jruby/jruby/issues/6267
+if RUBY_ENGINE == "jruby"
+  require "jruby"
+
+  class org.jruby::RubyObjectSpace::WeakMap
+    field_reader :map
+  end
+
+  class ObjectSpace::WeakMap
+    def values
+      JRuby.ref(self).map.values.reject(&:nil?)
     end
   end
 end

data/lib/active_record/type/oracle_enhanced/boolean.rb

@@ -5,7 +5,6 @@ module ActiveRecord
     module OracleEnhanced
       class Boolean < ActiveModel::Type::Boolean # :nodoc:
         private
-
           def cast_value(value)
             # Kind of adding 'n' and 'N' to  `FALSE_VALUES`
             if ["n", "N"].include?(value)

data/lib/active_record/type/oracle_enhanced/integer.rb

@@ -5,7 +5,6 @@ module ActiveRecord
     module OracleEnhanced
       class Integer < ActiveModel::Type::Integer # :nodoc:
         private
-
           def max_value
             ("9" * 38).to_i
           end