activerecord-oracle_enhanced-adapter 6.0.6 → 6.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1410c7eb8f55a7b4c96b8016f31c573512699978498ee6effae6d4875b1e3f31
-  data.tar.gz: 36cbc570c5c5a1c6d074353f1de0d8d6ce07c90fd5b906727d7ee2e78a473a1e
+  metadata.gz: 47264bf6ac81ec4786fb1c3021c29661b8a02df12ac7a2ffc2e4ad02353794dd
+  data.tar.gz: eaceb8f2950700b0cc5eba5c1b0f7dae657bf26aa529444e83d901c7a4cb46ac
 SHA512:
-  metadata.gz: 1f1ba2aed7eef1fa08e31c4fe7f43762eb077b10e412f9db61228589d1387f440b64b17db05fd3fd796e0eb4ebc8ca00f91f767f0ea6402e079783265cb583a6
-  data.tar.gz: 700df5182daf9a04a67dcc478aa378d9deb8d09fba726ccf2ce9878b8c1dc70f56a5a135048e00438e5078b9916467f8b356e6a3a4bc5bc8897fb874a8a686c3
+  metadata.gz: 0c96bb5cdf7508d310484f6a6f25bec23c9eee8029df4e9cd4075f6acd1671c02d90837db4a88ca054745d218664049b55ec238cb5313d47dbbf868b85d829ea
+  data.tar.gz: 2ef70ebd9e11f9c6a5739b7644c4ac770b4fb2c3ebc2b56b46479625b3de0f89d78f77618ac7fe077416a373859662d5c4dd11ee7ff0eca4651198aca181d973

data/History.md

@@ -1,9 +1,85 @@
-## 6.0.5 / 2020-12-17
+## 6.1.0.rc1 / 2020-11-03
 
 * 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]
+  * Support Rails 6.1.0.rc1
+  * Add support to change the permissions granted when creating DB [#1885]
+  * Refactor `create_table`'s options separation [#1886]
+  * Move schema cache to pool [#1888]
+  * Clear schema cache when a table is created/dropped/renamed [#1891]
+  * Deduplicate various Active Record schema cache structures [#1897]
+  * Support SQLCounter change to ignore "SCHEMA" and "TRANSACTION" log [#1892]
+  * Share the column and table name quote cache between connections [#1901]
+  * Add database_exists? method to connection adapters [#1906]
+  * Accept columns passed with options in remove_index [#1930]
+  * Fix `NameError` for `SchemaCreation` [#1933]
+  * Add `supports_common_table_expressions?` for CTE testing [#1946]
+  * create_table_definition and add_column take keyword arguments [#1942]
+  * Address `uninitialized constant ActiveRecord::ConnectionAdapters::AbstractAdapter::Quoting (NameError) [#1950]
+  * Fix an error when writing lobs [#1962]
+  * Uninstall SimpleCov [#1968]
+  * fix: Auto retry only works for connection.exec() [#1976]
+  * Fix keyword arguments errors for Ruby 2.8.0-dev [#1977]
+  * Fix a build errors when using Ruby 2.8.0-dev [#1983]
+  * Include sync option when dumping a context index [#1988]
+  * Use `build_result` instead of `ActiveRecord::Result.new` [#1994]
+  * Use the new API for build_results [#1995]
+  * Merge Arel visitors [#2002]
+  * Enable `Rails/IndexBy` and `Rails/IndexWith` cops [#2006]
+  * Don't refer `allowed_index_name_length` directly [#2009]
+  * Should not rely on the global `Arel::Table.engine` in the framework [#2010]
+  * Suppress `warning: already initialized constant` [#2011]
+  * Deprecate passing a column to `type_cast` [#2012]
+  * Limit number of expressions in a list during a "homogenous in" operation [#2013]
+  * Allow column name with function (e.g. `length(title)`) as safe SQL string [#2017]
+  * Default engine `ENGINE=InnoDB` is no longer dumped to make schema more agnostic [#2019]
+  * Separate primary key column options from table options [#2019]
+  * Make index options to kwargs [#2022]
+  * Make remaining migration options to kwargs [#2024]
+  * Allow TruffleRuby RUBY_ENGINE [#2046]
+  * Restore Schema Dumper behavior changed by #2019 [#2047]
+  * Support JDBC service name syntax [#2035]
+  * Use Rake 13.0.0.pre.1 [#1924]
+  * Bump RuboCop version to 0.71 [#1887]
+  * Bump RuboCop to 0.74.0 [#1914]
+  * Bump RuboCop to 0.76.0 [#1947]
+  * Use RuboCop 0.77 [#1959]
+  * Bump RuboCop to 0.82.0 [#2005]
+  * Suppress RuboCop's offenses [#2020]
+  * Enable `Layout/EmptyLinesAroundAccessModifier` cop [#1890]
+  * Disable `Style/BracesAroundHashParameters` cop [#1923]
+  * Enable `Layout/ClosingHeredocIndentation` cop [#1958]
+  * Unlock RuboCop gem versions [#1926]
+  * Enable `Rails/IndexBy` and `Rails/IndexWith` cops [#2006]
+  * Enable `Performance/DeletePrefix` and `Performance/DeleteSuffix` cops [#2021]
+  * Enable `Layout/SpaceAroundOperators` cop [#2057]
+  * Fix links to rails-dev-box running on docker [#1883]
+  * Fix spec config template copy instructions [#1884]
+  * Update UPGRADE section for Rails 5.2 [#1993]
+
+* CI
+  * Enable GitHub Actions and run RuboCop [#1925]
+  * Run CI with GitHub Actions [#2015]
+  * Enabled Dependabot by creating .dependabot/config.yml [#1931]
+  * Disable Code Climate #1938
+  * CI against JRuby 9.2.8.0 [#1911]
+  * CI against JRuby 9.2.9.0 #1948
+  * CI against Ruby 2.6.4 and Ruby 2.5.6 [#1921]
+  * CI against Ruby 2.5.7 and Ruby 2.6.5 [#1949]
+  * CI against Ruby 2.7.0 [#1975]
+  * CI against JRuby 9.2.10.0 [#1989]
+  * CI against JRuby 9.2.11.0 [#1992]
+  * CI against JRuby 9.2.11.1 [#1997]
+  * CI againt Ruby 2.7.1, 2.6.6 and 2.5.8 #1998
+  * CI against JRuby 9.2.12.0 [#2034]
+  * Use Oracle Instant Client 18.5 [#2036]
+  * Support `jruby-head` again [#2037]
+  * CI against JRuby 9.2.13.0 [#2041]
+  * CI against Ruby 2.7.2 [#2052]
+  * Remove unnecessary PATH and LD_LIBRARY_PATH environment variables [#1927]
+  * Use Ubuntu 18.04 (Bionic Beaver) at Travis CI [#1937]
+  * Run bug report template at CI [#1936]
+  * Skip known failures until #1943 is resolved [#1961]
+  * Migrate to `ruby/setup-ruby` to use Ruby 2.7 [#2026]
 
 ## 6.0.4 / 2020-08-18
 

data/README.md

@@ -663,7 +663,7 @@ if any database structure changed by migrations, execute `rails db:schema:cache:
 
 UPGRADE
 ---------------
-### Upgrade Rails 5.0 or older version to Rails 5.2
+### Upgrade Rails 5.1 or older version to Rails 5.2
 
 * `emulate_booleans_from_strings = true` change
 

data/VERSION

@@ -1 +1 @@
-6.0.6
+6.1.0.rc1

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

@@ -19,7 +19,6 @@ module ActiveRecord
         attr_reader :raw_connection
 
         private
-
           # Used always by JDBC connection as well by OCI connection when describing tables over database link
           def describe(name)
             name = name.to_s
@@ -116,8 +115,8 @@ module ActiveRecord
   end
 end
 
-# if MRI or YARV
-if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
+# if MRI or YARV or TruffleRuby
+if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "truffleruby"
   ORACLE_ENHANCED_CONNECTION = :oci
   require "active_record/connection_adapters/oracle_enhanced/oci_connection"
 # if JRuby

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

@@ -142,7 +142,6 @@ module ActiveRecord
         end
 
         private
-
           def create_datastore_procedure(table_name, procedure_name, column_names, options)
             quoted_table_name = quote_table_name(table_name)
             select_queries, column_names = column_names.partition { |c| c.to_s =~ /^\s*SELECT\s+/i }

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

@@ -25,15 +25,6 @@ module ActiveRecord
         end
         deprecate :column_name_length
 
-        # Returns the maximum allowed length for an index name. This
-        # limit is enforced by rails and Is less than or equal to
-        # <tt>index_name_length</tt>. The gap between
-        # <tt>index_name_length</tt> is to allow internal rails
-        # opreations to use prefixes in temporary opreations.
-        def allowed_index_name_length
-          index_name_length
-        end
-
         # the maximum length of an index name
         # supported by this database
         def index_name_length

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

@@ -42,7 +42,7 @@ module ActiveRecord
               cursor.exec
             end
 
-            if (name == "EXPLAIN") && sql =~ /^EXPLAIN/
+            if (name == "EXPLAIN") && sql.start_with?("EXPLAIN")
               res = true
             else
               columns = cursor.get_col_names.map do |col_name|
@@ -53,7 +53,7 @@ module ActiveRecord
               while row = cursor.fetch(fetch_options)
                 rows << row
               end
-              res = ActiveRecord::Result.new(columns, rows)
+              res = build_result(columns: columns, rows: rows)
             end
 
             cursor.close unless cached
@@ -67,7 +67,7 @@ module ActiveRecord
 
         def explain(arel, binds = [])
           sql = "EXPLAIN PLAN FOR #{to_sql(arel, binds)}"
-          return if sql =~ /FROM all_/
+          return if /FROM all_/.match?(sql)
           if ORACLE_ENHANCED_CONNECTION == :jdbc
             exec_query(sql, "EXPLAIN", binds)
           else
@@ -130,7 +130,7 @@ module ActiveRecord
               rows << [returning_id]
             end
             cursor.close unless cached
-            ActiveRecord::Result.new(returning_id_col || [], rows)
+            build_result(columns: returning_id_col || [], rows: rows)
           end
         end
 
@@ -196,11 +196,11 @@ module ActiveRecord
         end
 
         def create_savepoint(name = current_savepoint_name) #:nodoc:
-          execute("SAVEPOINT #{name}")
+          execute("SAVEPOINT #{name}", "TRANSACTION")
         end
 
         def exec_rollback_to_savepoint(name = current_savepoint_name) #:nodoc:
-          execute("ROLLBACK TO #{name}")
+          execute("ROLLBACK TO #{name}", "TRANSACTION")
         end
 
         def release_savepoint(name = current_savepoint_name) #:nodoc:
@@ -254,11 +254,9 @@ 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 unless value
+            next if value.blank?
             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 = <<~SQL.squish, "Writable Large Object")

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

@@ -27,11 +27,10 @@ module ActiveRecord
               raise e
             end
           end
-          connection.execute "GRANT unlimited tablespace TO #{@config['username']}"
-          connection.execute "GRANT create session TO #{@config['username']}"
-          connection.execute "GRANT create table TO #{@config['username']}"
-          connection.execute "GRANT create view TO #{@config['username']}"
-          connection.execute "GRANT create sequence TO #{@config['username']}"
+
+          OracleEnhancedAdapter.permissions.each do |permission|
+            connection.execute "GRANT #{permission} TO #{@config['username']}"
+          end
         end
 
         def drop

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

@@ -31,7 +31,6 @@ module ActiveRecord
         end
 
       private
-
         def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil)
           super
         ensure

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

@@ -115,9 +115,9 @@ module ActiveRecord
             else
               unless database.match?(/^(\:|\/)/)
                 # assume database is a SID if no colon or slash are supplied (backward-compatibility)
-                database = ":#{database}"
+                database = "/#{database}"
               end
-              url = config[:url] || "jdbc:oracle:thin:@#{host || 'localhost'}:#{port || 1521}#{database}"
+              url = config[:url] || "jdbc:oracle:thin:@//#{host || 'localhost'}:#{port || 1521}#{database}"
             end
 
             prefetch_rows = config[:prefetch_rows] || 100
@@ -238,7 +238,7 @@ module ActiveRecord
           begin
             yield if block_given?
           rescue Java::JavaSql::SQLException => e
-            raise unless e.message =~ /^(Closed Connection|Io exception:|No more data to read from socket|IO Error:)/
+            raise unless /^(Closed Connection|Io exception:|No more data to read from socket|IO Error:)/.match?(e.message)
             @active = false
             raise unless should_retry
             should_retry = false
@@ -512,7 +512,6 @@ module ActiveRecord
         end
 
       private
-
         def lob_to_ruby_value(val)
           case val
           when ::Java::OracleSql::CLOB

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

@@ -18,13 +18,12 @@ module ActiveRecord #:nodoc:
         module ClassMethods
           def lob_columns
             columns.select do |column|
-              column.sql_type_metadata.sql_type =~ /LOB$/
+              column.sql_type_metadata.sql_type.end_with?("LOB")
             end
           end
         end
 
         private
-
           def enhanced_write_lobs
             if self.class.connection.is_a?(ConnectionAdapters::OracleEnhancedAdapter) &&
                 !(self.class.custom_create_method || self.class.custom_update_method)

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

@@ -269,7 +269,6 @@ module ActiveRecord
         end
 
       private
-
         def date_without_time?(value)
           case value
           when OraDate
@@ -323,9 +322,9 @@ module ActiveRecord
           # connection using host, port and database name
           elsif host || port
             host ||= "localhost"
-            host = "[#{host}]" if host =~ /^[^\[].*:/  # IPv6
+            host = "[#{host}]" if /^[^\[].*:/.match?(host)  # IPv6
             port ||= 1521
-            database = "/#{database}" unless database.match(/^\//)
+            database = "/#{database}" unless database.start_with?("/")
             "//#{host}:#{port}#{database}"
           # if no host is specified then assume that
           # database parameter is TNS alias or TNS connection string

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

@@ -97,7 +97,6 @@ module ActiveRecord #:nodoc:
     end
 
     private
-
       # Creates a record with custom create method
       # and returns its id.
       def _create_record

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

@@ -169,7 +169,6 @@ module ActiveRecord
         private_constant :COLUMN_NAME, :COLUMN_NAME_WITH_ORDER
 
         private
-
           def oracle_downcase(column_name)
             return nil if column_name.nil?
             /[a-z]/.match?(column_name) ? column_name : column_name.downcase
@@ -179,8 +178,8 @@ module ActiveRecord
   end
 end
 
-# if MRI or YARV
-if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
+# if MRI or YARV or TruffleRuby
+if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "truffleruby"
   require "active_record/connection_adapters/oracle_enhanced/oci_quoting"
 # if JRuby
 elsif RUBY_ENGINE == "jruby"

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

@@ -3,9 +3,8 @@
 module ActiveRecord
   module ConnectionAdapters
     module OracleEnhanced
-      class SchemaCreation < AbstractAdapter::SchemaCreation
+      class SchemaCreation < SchemaCreation
         private
-
           def visit_ColumnDefinition(o)
             if [:blob, :clob, :nclob].include?(sql_type = type_to_sql(o.type, **o.options).downcase.to_sym)
               if (tablespace = default_tablespace_for(sql_type))
@@ -36,7 +35,7 @@ module ActiveRecord
                 create_sql << " TABLESPACE #{tablespace}"
               end
             end
-            add_table_options!(create_sql, table_options(o))
+            add_table_options!(create_sql, o)
             create_sql << " AS #{to_sql(o.as)}" if o.as
             create_sql
           end

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

@@ -4,7 +4,15 @@ module ActiveRecord #:nodoc:
   module ConnectionAdapters #:nodoc:
     module OracleEnhanced #:nodoc:
       class SchemaDumper < ConnectionAdapters::SchemaDumper #:nodoc:
+        DEFAULT_PRIMARY_KEY_COLUMN_SPEC = { precision: "38", null: "false" }.freeze
+        private_constant :DEFAULT_PRIMARY_KEY_COLUMN_SPEC
+
         private
+          def column_spec_for_primary_key(column)
+            spec = super
+            spec.except!(:precision) if prepare_column_options(column) == DEFAULT_PRIMARY_KEY_COLUMN_SPEC
+            spec
+          end
 
           def tables(stream)
             # do not include materialized views in schema dump - they should be created separately after schema creation
@@ -51,6 +59,7 @@ module ActiveRecord #:nodoc:
                   else
                     statement_parts = [ ("add_context_index " + remove_prefix_and_suffix(table).inspect) ]
                     statement_parts << index.columns.inspect
+                    statement_parts << ("sync: " + $1.inspect) if index.parameters =~ /SYNC\((.*?)\)/
                     statement_parts << ("name: " + index.name.inspect)
                   end
                 else
@@ -72,7 +81,7 @@ module ActiveRecord #:nodoc:
               index_statements = indexes.map do |index|
                 "    t.index #{index_parts(index).join(', ')}" unless index.type == "CTXSYS.CONTEXT"
               end
-              stream.puts index_statements.sort.join("\n")
+              stream.puts index_statements.compact.sort.join("\n")
             end
           end
 
@@ -107,7 +116,10 @@ module ActiveRecord #:nodoc:
                 tbl.print ", primary_key: #{pk.inspect}" unless pk == "id"
                 pkcol = columns.detect { |c| c.name == pk }
                 pkcolspec = column_spec_for_primary_key(pkcol)
-                if pkcolspec.present?
+                unless pkcolspec.empty?
+                  if pkcolspec != pkcolspec.slice(:id, :default)
+                    pkcolspec = { id: { type: pkcolspec.delete(:id), **pkcolspec }.compact }
+                  end
                   tbl.print ", #{format_colspec(pkcolspec)}"
                 end
               when Array
@@ -168,8 +180,8 @@ 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 /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ data_default from all_tab_columns
+            @connection.select_value(<<~SQL.squish, "SCHEMA", [bind_string("table_name", table_name.upcase), bind_string("column_name", column_name.upcase)]).inspect
+              select 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

@@ -11,9 +11,8 @@ module ActiveRecord
         # see: abstract/schema_statements.rb
 
         def tables #:nodoc:
-          select_values(<<~SQL.squish, "tables")
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */
-            DECODE(table_name, UPPER(table_name), LOWER(table_name), table_name)
+          select_values(<<~SQL.squish, "SCHEMA")
+            SELECT 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,8 +43,8 @@ module ActiveRecord
             table_owner, table_name = default_owner, real_name
           end
 
-          select_values(<<~SQL.squish, "table exists", [bind_string("owner", table_owner), bind_string("table_name", table_name)]).any?
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ owner, table_name
+          select_values(<<~SQL.squish, "SCHEMA", [bind_string("owner", table_owner), bind_string("table_name", table_name)]).any?
+            SELECT owner, table_name
             FROM all_tables
             WHERE owner = :owner
             AND table_name = :table_name
@@ -60,22 +59,20 @@ module ActiveRecord
         end
 
         def views # :nodoc:
-          select_values(<<~SQL.squish, "views")
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */
-            LOWER(view_name) FROM all_views WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
+          select_values(<<~SQL.squish, "SCHEMA")
+            SELECT 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 /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */
-            LOWER(mview_name) FROM all_mviews WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
+          select_values(<<~SQL.squish, "SCHEMA")
+            SELECT LOWER(mview_name) FROM all_mviews WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
           SQL
         end
 
         # get synonyms for schema dump
         def synonyms
-          result = select_all(<<~SQL.squish, "synonyms")
+          result = select_all(<<~SQL.squish, "SCHEMA")
             SELECT synonym_name, table_owner, table_name
             FROM all_synonyms where owner = SYS_CONTEXT('userenv', 'current_schema')
           SQL
@@ -90,8 +87,8 @@ module ActiveRecord
           (_owner, table_name) = @connection.describe(table_name)
           default_tablespace_name = default_tablespace
 
-          result = select_all(<<~SQL.squish, "indexes", [bind_string("table_name", table_name)])
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ LOWER(i.table_name) AS table_name, LOWER(i.index_name) AS index_name, i.uniqueness,
+          result = select_all(<<~SQL.squish, "SCHEMA", [bind_string("table_name", table_name)])
+            SELECT 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,
@@ -120,8 +117,8 @@ module ActiveRecord
               statement_parameters = nil
               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 /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ text
+                source = select_values(<<~SQL.squish, "SCHEMA", [bind_string("procedure_name", procedure_name.upcase)]).join
+                  SELECT text
                   FROM all_source
                   WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
                     AND name = :procedure_name
@@ -199,19 +196,19 @@ module ActiveRecord
         #     t.string      :last_name, :comment => “Surname”
         #   end
 
-        def create_table(table_name, **options)
-          create_sequence = options[:id] != false
-          td = create_table_definition table_name, **options
+        def create_table(table_name, id: :primary_key, primary_key: nil, force: nil, **options)
+          create_sequence = id != false
+          td = create_table_definition(
+            table_name, **options.extract!(:temporary, :options, :as, :comment, :tablespace, :organization)
+          )
 
-          if options[:id] != false && !options[:as]
-            pk = options.fetch(:primary_key) do
-              Base.get_primary_key table_name.to_s.singularize
-            end
+          if id && !td.as
+            pk = primary_key || Base.get_primary_key(table_name.to_s.singularize)
 
             if pk.is_a?(Array)
               td.primary_keys pk
             else
-              td.primary_key pk, options.fetch(:id, :primary_key), **options
+              td.primary_key pk, id, **options
             end
           end
 
@@ -229,8 +226,10 @@ module ActiveRecord
           yield td if block_given?
           create_sequence = create_sequence || td.create_sequence
 
-          if options[:force] && data_source_exists?(table_name)
-            drop_table(table_name, options)
+          if force && data_source_exists?(table_name)
+            drop_table(table_name, force: force, if_exists: true)
+          else
+            schema_cache.clear_data_source_cache!(table_name.to_s)
           end
 
           execute schema_creation.accept td
@@ -238,14 +237,14 @@ module ActiveRecord
           create_sequence_and_trigger(table_name, options) if create_sequence
 
           if supports_comments? && !supports_comments_in_create?
-            if table_comment = options[:comment].presence
+            if table_comment = td.comment.presence
               change_table_comment(table_name, table_comment)
             end
             td.columns.each do |column|
               change_column_comment(table_name, column.name, column.comment) if column.comment.present?
             end
           end
-          td.indexes.each { |c, o| add_index table_name, c, o }
+          td.indexes.each { |c, o| add_index table_name, c, **o }
 
           rebuild_primary_key_index_to_default_tablespace(table_name, options)
         end
@@ -254,13 +253,16 @@ module ActiveRecord
           if new_name.to_s.length > DatabaseLimits::IDENTIFIER_MAX_LENGTH
             raise ArgumentError, "New table name '#{new_name}' is too long; the limit is #{DatabaseLimits::IDENTIFIER_MAX_LENGTH} characters"
           end
+          schema_cache.clear_data_source_cache!(table_name.to_s)
+          schema_cache.clear_data_source_cache!(new_name.to_s)
           execute "RENAME #{quote_table_name(table_name)} TO #{quote_table_name(new_name)}"
           execute "RENAME #{quote_table_name("#{table_name}_seq")} TO #{default_sequence_name(new_name)}" rescue nil
 
           rename_table_indexes(table_name, new_name)
         end
 
-        def drop_table(table_name, options = {}) #:nodoc:
+        def drop_table(table_name, **options) #:nodoc:
+          schema_cache.clear_data_source_cache!(table_name.to_s)
           execute "DROP TABLE #{quote_table_name(table_name)}#{' CASCADE CONSTRAINTS' if options[:force] == :cascade}"
           seq_name = options[:sequence_name] || default_sequence_name(table_name)
           execute "DROP SEQUENCE #{quote_table_name(seq_name)}" rescue nil
@@ -290,7 +292,7 @@ module ActiveRecord
           end
         end
 
-        def add_index(table_name, column_name, options = {}) #:nodoc:
+        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)
           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"
@@ -309,13 +311,11 @@ module ActiveRecord
           index_type = options[:unique] ? "UNIQUE" : ""
           index_name = options[:name].to_s if options.key?(:name)
           tablespace = tablespace_for(:index, options[:tablespace])
-          max_index_length = options.fetch(:internal, false) ? index_name_length : allowed_index_name_length
-          # TODO: This option is used for NOLOGGING, needs better argumetn name
+          # TODO: This option is used for NOLOGGING, needs better argument name
           index_options = options[:options]
 
-          if index_name.to_s.length > max_index_length
-            raise ArgumentError, "Index name '#{index_name}' on table '#{table_name}' is too long; the limit is #{max_index_length} characters"
-          end
+          validate_index_length!(table_name, index_name, options.fetch(:internal, false))
+
           if table_exists?(table_name) && index_name_exists?(table_name, index_name)
             raise ArgumentError, "Index name '#{index_name}' on table '#{table_name}' already exists"
           end
@@ -326,8 +326,8 @@ module ActiveRecord
 
         # Remove the given index from the table.
         # Gives warning if index does not exist
-        def remove_index(table_name, options = {}) #:nodoc:
-          index_name = index_name_for_remove(table_name, options)
+        def remove_index(table_name, column_name = nil, **options) #:nodoc:
+          index_name = index_name_for_remove(table_name, column_name, options)
           # TODO: It should execute only when index_type == "UNIQUE"
           execute "ALTER TABLE #{quote_table_name(table_name)} DROP CONSTRAINT #{quote_column_name(index_name)}" rescue nil
           execute "DROP INDEX #{quote_column_name(index_name)}"
@@ -364,8 +364,8 @@ module ActiveRecord
         # Will always query database and not index cache.
         def index_name_exists?(table_name, index_name)
           (_owner, table_name) = @connection.describe(table_name)
-          result = select_value(<<~SQL.squish, "index name exists")
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ 1 FROM all_indexes i
+          result = select_value(<<~SQL.squish, "SCHEMA")
+            SELECT 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}'
@@ -443,7 +443,7 @@ module ActiveRecord
           change_column table_name, column_name, column.sql_type, null: null
         end
 
-        def change_column(table_name, column_name, type, options = {}) #:nodoc:
+        def change_column(table_name, column_name, type, **options) #:nodoc:
           column = column_for(table_name, column_name)
 
           # remove :null option if its value is the same as current column definition
@@ -497,9 +497,10 @@ module ActiveRecord
         end
 
         def table_comment(table_name) #:nodoc:
+          # TODO
           (_owner, table_name) = @connection.describe(table_name)
-          select_value(<<~SQL.squish, "Table comment", [bind_string("table_name", table_name)])
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ comments FROM all_tab_comments
+          select_value(<<~SQL.squish, "SCHEMA", [bind_string("table_name", table_name)])
+            SELECT comments FROM all_tab_comments
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
               AND table_name = :table_name
           SQL
@@ -514,8 +515,8 @@ module ActiveRecord
         def column_comment(table_name, column_name) #:nodoc:
           # 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 /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ comments FROM all_col_comments
+          select_value(<<~SQL.squish, "SCHEMA", [bind_string("table_name", table_name), bind_string("column_name", column_name.upcase)])
+            SELECT comments FROM all_col_comments
             WHERE owner = SYS_CONTEXT('userenv', 'current_schema')
               AND table_name = :table_name
               AND column_name = :column_name
@@ -531,8 +532,8 @@ module ActiveRecord
         end
 
         def tablespace(table_name)
-          select_value(<<~SQL.squish, "tablespace")
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ tablespace_name
+          select_value(<<~SQL.squish, "SCHEMA")
+            SELECT tablespace_name
             FROM all_tables
             WHERE table_name='#{table_name.to_s.upcase}'
             AND owner = SYS_CONTEXT('userenv', 'current_schema')
@@ -543,8 +544,8 @@ module ActiveRecord
         def foreign_keys(table_name) #:nodoc:
           (_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 /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ r.table_name to_table
+          fk_info = select_all(<<~SQL.squish, "SCHEMA", [bind_string("desc_table_name", desc_table_name)])
+            SELECT r.table_name to_table
                   ,rc.column_name references_column
                   ,cc.column_name
                   ,c.constraint_name name
@@ -585,8 +586,8 @@ module ActiveRecord
         # REFERENTIAL INTEGRITY ====================================
 
         def disable_referential_integrity(&block) #:nodoc:
-          old_constraints = select_all(<<~SQL.squish, "Foreign Keys to disable and enable")
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ constraint_name, owner, table_name
+          old_constraints = select_all(<<~SQL.squish, "SCHEMA")
+            SELECT constraint_name, owner, table_name
               FROM all_constraints
               WHERE constraint_type = 'R'
               AND status = 'ENABLED'
@@ -617,13 +618,12 @@ module ActiveRecord
         end
 
         private
-
           def schema_creation
             OracleEnhanced::SchemaCreation.new self
           end
 
-          def create_table_definition(*args, **options)
-            OracleEnhanced::TableDefinition.new(self, *args, **options)
+          def create_table_definition(name, **options)
+            OracleEnhanced::TableDefinition.new(self, name, **options)
           end
 
           def new_column_from_field(table_name, field)
@@ -645,7 +645,7 @@ module ActiveRecord
               # If a default contains a newline these cleanup regexes need to
               # match newlines.
               field["data_default"].sub!(/^'(.*)'$/m, '\1')
-              field["data_default"] = nil if field["data_default"] =~ /^(null|empty_[bc]lob\(\))$/i
+              field["data_default"] = nil if /^(null|empty_[bc]lob\(\))$/i.match?(field["data_default"])
               # TODO: Needs better fix to fallback "N" to false
               field["data_default"] = false if field["data_default"] == "N" && OracleEnhancedAdapter.emulate_booleans_from_strings
             end
@@ -702,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 /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ index_name FROM all_constraints
+              SELECT index_name FROM all_constraints
                   WHERE table_name = :table_name
                   AND constraint_type = 'P'
                   AND owner = SYS_CONTEXT('userenv', 'current_schema')