activerecord-oracle_enhanced-adapter 6.0.0.rc3 → 6.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c926b2695dd5ff701df97bbadf49b5e329328efea371d15b800b8972c35564b
-  data.tar.gz: c0287f267d0aa059cff3758fd74f4ed78ddcc9ec58bf6ac6161a273a1b79d0f4
+  metadata.gz: 47264bf6ac81ec4786fb1c3021c29661b8a02df12ac7a2ffc2e4ad02353794dd
+  data.tar.gz: eaceb8f2950700b0cc5eba5c1b0f7dae657bf26aa529444e83d901c7a4cb46ac
 SHA512:
-  metadata.gz: d04e65f639a7a6340dff1c2e8c495cce82c7cadf47e4ca804c248f91eeb7e5c2c2fc1d13bf3cafa4e9f7186ac77cdde82d60ce0518040cbcd13f772d0eee788e
-  data.tar.gz: 07bbee305ed490b431138035335d3412ab8ef66df7850bdcacb13ba923f78392bb9d54d1b61d9d211b51b22cf513ef9afc7506d9a5c4e1a3ab9cfc4524887260
+  metadata.gz: 0c96bb5cdf7508d310484f6a6f25bec23c9eee8029df4e9cd4075f6acd1671c02d90837db4a88ca054745d218664049b55ec238cb5313d47dbbf868b85d829ea
+  data.tar.gz: 2ef70ebd9e11f9c6a5739b7644c4ac770b4fb2c3ebc2b56b46479625b3de0f89d78f77618ac7fe077416a373859662d5c4dd11ee7ff0eca4651198aca181d973

data/History.md

@@ -1,3 +1,129 @@
+## 6.1.0.rc1 / 2020-11-03
+
+* Changes and bug fixes
+  * 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
+
+* Changes and bug fixes
+  * create_table_definition and add_column take keyword arguments [#1942, #2043]
+  * Fix keyword arguments errors for Ruby 2.8.0-dev [#1977,#2043]
+  * Fix a build errors when using Ruby 2.8.0-dev [#1983, #2043]
+
+## 6.0.3 / 2020-06-16
+
+* Changes and bug fixes
+  * Auto retry works for other `exec_*` methods [#1976, #1981]
+  * Allow column name with function (e.g. `length(title)`) as safe SQL string [#2017, #2018]
+
+* CI
+  * CI against latest Ruby versions [#1979]
+
+## 6.0.2 / 2019-12-25
+
+* Changes and bug fixes
+  * Uninstall SimpleCov [#1968]
+
+## 6.0.1 / 2019-12-20
+
+* Changes and bug fixes
+  * Address `undefined local variable or method `sql' [#1932 #1962 #1963]
+
+* CI
+  * CI against Ruby 2.6.4 and Ruby 2.5.6 [#1922]
+
+## 6.0.0 / 2019-08-17
+
+* Major changes, including changes since 6.0.0.beta1
+
+  * Support Rails 6.0.0
+  * Rails 6 requires Ruby 2.5 [#1801]
+  * Support longer identifier for Oracle database 12.2 or higher [#1703 #1705]
+  * Introduce `use_shorter_identifier` [#1707]
+  * Change `default_sequence_start_value` from 10000 to 1 [#1636]
+  * Address `ORA-01795: maximum number of expressions in a list is 1000`
+
+* CI
+  * CI against JRuby 9.2.8.0 #1912
+
 ## 6.0.0.rc3 / 2019-07-27
 
 * Changes and bug fixes

data/README.md

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

@@ -24,23 +24,25 @@ 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/
+            if (name == "EXPLAIN") && sql.start_with?("EXPLAIN")
               res = true
             else
               columns = cursor.get_col_names.map do |col_name|
@@ -51,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
@@ -65,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
@@ -96,36 +98,39 @@ 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
               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
 
@@ -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
 
@@ -189,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:
@@ -252,7 +259,7 @@ module ActiveRecord
               value = klass.attribute_types[col.name].serialize(value)
             end
             uncached do
-              unless lob_record = select_one(<<~SQL.squish, "Writable Large Object")
+              unless lob_record = select_one(sql = <<~SQL.squish, "Writable Large Object")
                 SELECT #{quote_column_name(col.name)} FROM #{quote_table_name(table_name)}
                 WHERE #{quote_column_name(klass.primary_key)} = #{id} FOR UPDATE
               SQL
@@ -263,6 +270,16 @@ module ActiveRecord
             end
           end
         end
+
+        private
+          def with_retry
+            @connection.with_retry do
+              yield
+            rescue
+              @statements.clear
+              raise
+            end
+          end
       end
     end
   end

data/lib/active_record/connection_adapters/oracle_enhanced/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