activerecord-oracle_enhanced-adapter 1.7.7 → 1.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa268d433a58212089a08ecef9e43c163abde038
-  data.tar.gz: 4c57883d8eaa819b01c58342cd1d1ef679228f46
+  metadata.gz: ecf7fafba601af5f9f8fb575e5b969d3a182b7ea
+  data.tar.gz: 2f4e070cb162a4be21eb45dc747603683ef0c0bb
 SHA512:
-  metadata.gz: e5f806719336de611f0b0665c16ed334c35c544f2e6b9462e2e6788f41417f33e43b524769c47bc6b1b6bb67c47316c2ac84b69132f6e3253f1d32d6d5f72441
-  data.tar.gz: 03f58f1cbdec17d82868588f78f1dd26cf6532ec819410f7c0d0cdd17a4611dee283bb55f2496befba03b9e37fe13ede1cff77b5792e9fd1ef87c49bf6110caf
+  metadata.gz: 5357a8e895491e97b631594d594ec3c37c73a4a983864780df23ff7f906bd26dd8b916c94b986fdff881c17729b63abc0c230dbeea38ca8df725e0b8ea645ee2
+  data.tar.gz: f1081e23da7dc9423c85c083de163841bd73c56e77c496e87d65ad970ceb927076e0e5884aad2412315cc0ea66c4a261e3047153be4ef8bd0e7933081655e4b7

data/History.md

@@ -1,3 +1,48 @@
+## 1.7.11 / 2017-03-29
+
+* Changes and bug fixes
+  * Bump JRuby to 9.1.8.0 and add JRUBY_OPTS [#1233]
+  * Fix the BINARY_FLOAT column type returns nil in JRuby [#1256]
+
+* Known issues
+ * No changes since 1.7.7
+
+## 1.7.10 / 2017-02-03
+
+* Changes and bug fixes
+  * Address `TypeError: can't cast Java::JavaSql::Timestamp` [#1147, 1153]
+  * Use docker-oracle-xe-11g for Travis CI for release17 branch [#1150]
+  * Use JRuby 9.1.7.0 for release17 branch [#1154]
+  * Pending until further investigation made for #908 for release17 branch [#1151]
+
+* Known issues
+ * No changes since 1.7.7
+
+## 1.7.9 / 2016-12-26
+
+* Changes and bug fixes
+
+  * Fix ORA-00933 error when executing `rails db:schema:load` [#1084]
+  * Quoting booleans should return a frozen string [#1083]
+  * CI against ruby 2.4.0 [#1096, #1086]
+
+* Known issues
+ * No changes since 1.7.7
+
+## 1.7.8 / 2016-12-06
+
+* Changes and bug fixes
+  * Separate schema migration insert statements correctly [#1074]
+  * Add `use_old_oracle_visitor` example [#1068]
+  * `supports_fetch_first_n_rows_and_offset?` returns `false` when `use_old_oracle_visitor` is true {1070, #1075]
+  * Suppress `create_table(:posts, {:force=>true})` message [#1067, #1072]
+  * Enable rubocop and Code Climate [#1056, #1057, #1060, #1062, #1071]
+  * Bump MRI version for travis [#1054, #1059]
+  * Drop `ActiveRecord::InternalMetadata.table_name` after each spec [#1073]
+
+* Known issues
+ * No changes since 1.7.7
+
 ## 1.7.7 / 2016-11-15
 
 * Changes and bug fixes

data/README.md

@@ -240,6 +240,9 @@ ActiveSupport.on_load(:active_record) do
     # start primary key sequences from 1 (and not 10000) and take just one next value in each session
     self.default_sequence_start_value = "1 NOCACHE INCREMENT BY 1"
 
+    # Use old visitor for Oracle 12c database
+    self.use_old_oracle_visitor = true
+
     # other settings ...
   end
 end

data/VERSION

@@ -1 +1 @@
-1.7.7
+1.7.11

data/activerecord-oracle_enhanced-adapter.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = %q{activerecord-oracle_enhanced-adapter}
-  s.version = "1.7.7"
+  s.version = "1.7.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.required_ruby_version     = '>= 2.2.2'
   s.license = 'MIT'
   s.authors = [%q{Raimonds Simanovskis}]
-  s.date = %q{2016-11-15}
+  s.date = %q{2017-03-29}
   s.description = %q{Oracle "enhanced" ActiveRecord adapter contains useful additional methods for working with new and legacy Oracle databases.
 This adapter is superset of original ActiveRecord Oracle adapter.
 }
@@ -92,4 +92,3 @@ This adapter is superset of original ActiveRecord Oracle adapter.
   s.add_runtime_dependency(%q<ruby-plsql>, [">= 0.5.0"])
   s.license = 'MIT'
 end
-

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

@@ -1,7 +1,6 @@
 module ActiveRecord
   module ConnectionAdapters #:nodoc:
     class OracleEnhancedColumn < Column
-
       attr_reader :table_name, :nchar, :virtual_column_data_default, :returning_id #:nodoc:
 
       def initialize(name, default, sql_type_metadata = nil, null = true, table_name = nil, virtual = false, returning_id = nil, comment = nil) #:nodoc:
@@ -69,7 +68,7 @@ module ActiveRecord
 #        #TODO: may be deprecated due to conflict with variable
 #        ActiveRecord::Base.connection.column_comment(@table_name, name)
 #      end
-      
+
       private
 
       def self.extract_value_from_default(default)
@@ -85,7 +84,7 @@ module ActiveRecord
         value.respond_to?(:hour) && (value.hour == 0 and value.min == 0 and value.sec == 0) ?
           Date.new(value.year, value.month, value.day) : value
       end
-      
+
       class << self
         protected
 
@@ -128,10 +127,7 @@ module ActiveRecord
           end
           DateTime.strptime(string, OracleEnhancedAdapter.string_to_date_format).to_date
         end
-        
       end
     end
-
   end
-
 end

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

@@ -2,7 +2,6 @@ module ActiveRecord #:nodoc:
   module ConnectionAdapters #:nodoc:
     module OracleEnhanced #:nodoc:
       module ColumnDumper #:nodoc:
-
         def column_spec(column)
           spec = Hash[prepare_column_options(column).map { |k, v| [k, "#{k}: #{v}"] }]
           spec[:name] = column.name.inspect
@@ -63,7 +62,6 @@ module ActiveRecord #:nodoc:
             column.type.inspect if column.virtual?
           end
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module ActiveRecord
   module ConnectionAdapters
     # interface independent methods
     class OracleEnhancedConnection #:nodoc:
-
       def self.create(config)
         case ORACLE_ENHANCED_CONNECTION
         when :oci
@@ -97,17 +96,15 @@ module ActiveRecord
         result = select(sql, name = nil)
         result.map { |r| r.values.first }
       end
-
     end
 
     # Returns array with major and minor version of database (e.g. [12, 1])
     def database_version
       raise NoMethodError, "Not implemented for this raw driver"
-    end 
-    
-    class OracleEnhancedConnectionException < StandardError #:nodoc:
     end
 
+    class OracleEnhancedConnectionException < StandardError #:nodoc:
+    end
   end
 end
 

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

@@ -2,7 +2,6 @@ module ActiveRecord
   module ConnectionAdapters
     module OracleEnhanced
       module ContextIndex
-
         # Define full text index with Oracle specific CONTEXT index type
         #
         # Oracle CONTEXT index by default supports full text indexing of one column.
@@ -336,7 +335,6 @@ module ActiveRecord
               order("SCORE(#{score_label}) DESC")
           end
         end
-
       end
     end
   end

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

@@ -1,17 +1,15 @@
 module ActiveRecord #:nodoc:
   module ConnectionAdapters #:nodoc:
     module OracleEnhancedCpk #:nodoc:
-
       # This mightn't be in Core, but count(distinct x,y) doesn't work for me.
       # Return that not supported if composite_primary_keys gem is required.
       def supports_count_distinct? #:nodoc:
         @supports_count_distinct ||= ! defined?(CompositePrimaryKeys)
       end
-      
+
       def concat(*columns) #:nodoc:
         "(#{columns.join('||')})"
       end
-      
     end
   end
 end

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

@@ -220,7 +220,6 @@ module ActiveRecord
             write_lobs(table_name, klass, fixture, klass.lob_columns)
           end
         end
-
       end
     end
   end

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

@@ -46,13 +46,10 @@ rescue LoadError, NameError
   raise LoadError, "ERROR: ActiveRecord oracle_enhanced adapter could not load Oracle JDBC driver. Please install #{ojdbc_jars ? ojdbc_jars.join(' or ') : "Oracle JDBC"} library."
 end
 
-
 module ActiveRecord
   module ConnectionAdapters
-
     # JDBC database interface for JRuby
     class OracleEnhancedJDBCConnection < OracleEnhancedConnection #:nodoc:
-
       attr_accessor :active
       alias :active? :active
 
@@ -452,7 +449,6 @@ module ActiveRecord
         def close
           @raw_statement.close
         end
-
       end
 
       def select(sql, name = nil, return_column_names = false)
@@ -525,6 +521,8 @@ module ActiveRecord
           else
             BigDecimal.new(d.stringValue)
           end
+        when :BINARY_FLOAT
+          rset.getFloat(i)
         when :VARCHAR2, :CHAR, :LONG, :NVARCHAR2, :NCHAR
           rset.getString(i)
         when :DATE
@@ -573,8 +571,6 @@ module ActiveRecord
           end
         end
       end
-
     end
-
   end
 end

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

@@ -16,6 +16,9 @@ module ActiveRecord
             Java::oracle.sql.DATE.new(value.strftime("%Y-%m-%d %H:%M:%S"))
           when Time
             Java::java.sql.Timestamp.new(value.year-1900, value.month-1, value.day, value.hour, value.min, value.sec, value.usec * 1000)
+          when Java::JavaSql::Timestamp
+            # Returning value as it is likely this value was already type casted from Time to Java::JavaSql::Timestamp
+            value
           else
             super
           end

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

@@ -18,10 +18,8 @@ end
 
 module ActiveRecord
   module ConnectionAdapters
-
     # OCI database interface for MRI
     class OracleEnhancedOCIConnection < OracleEnhancedConnection #:nodoc:
-
       def initialize(config)
         @raw_connection = OCI8EnhancedAutoRecover.new(config, OracleEnhancedOCIFactory)
         # default schema owner
@@ -188,7 +186,6 @@ module ActiveRecord
         def close
           @raw_cursor.close
         end
-
       end
 
       def select(sql, name = nil, return_column_names = false)
@@ -312,7 +309,6 @@ module ActiveRecord
           ::DateTime.civil(year, month, day, hour, min, sec, offset)
         end
       end
-
     end
 
     # The OracleEnhancedOCIFactory factors out the code necessary to connect and
@@ -369,15 +365,10 @@ module ActiveRecord
         conn
       end
     end
-
-
   end
 end
 
-
-
 class OCI8 #:nodoc:
-
   def describe(name)
     info = describe_table(name.to_s)
     raise %Q{"DESC #{name}" failed} if info.nil?
@@ -463,6 +454,5 @@ class OCI8EnhancedAutoRecover < DelegateClass(OCI8) #:nodoc:
       retry
     end
   end
-
 end
 #:startdoc:

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

@@ -2,7 +2,7 @@ require 'active_support'
 
 module ActiveRecord #:nodoc:
   # Custom create, update, delete methods functionality.
-  # 
+  #
   # Example:
   #
   #   class Employee < ActiveRecord::Base

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

@@ -103,7 +103,7 @@ module ActiveRecord
 
         def quoted_true #:nodoc:
           return "'#{self.class.boolean_to_string(true)}'" if emulate_booleans_from_strings
-          "1"
+          "1".freeze
         end
 
         def unquoted_true #:nodoc:
@@ -113,7 +113,7 @@ module ActiveRecord
 
         def quoted_false #:nodoc:
           return "'#{self.class.boolean_to_string(false)}'" if emulate_booleans_from_strings
-          "0"
+          "0".freeze
         end
 
         def unquoted_false #:nodoc:

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

@@ -44,7 +44,7 @@ module ActiveRecord
         end
 
         def default_tablespace_for(type)
-          (ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[type] || 
+          (ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[type] ||
            ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[native_database_types[type][:name]]) rescue nil
         end
 
@@ -90,7 +90,6 @@ module ActiveRecord
             MSG
           end
         end
-
       end
     end
   end

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

@@ -1,7 +1,6 @@
 module ActiveRecord
   module ConnectionAdapters
     module OracleEnhanced
-
       class ForeignKeyDefinition < ActiveRecord::ConnectionAdapters::ForeignKeyDefinition
         def name
           if options[:name].length > OracleEnhancedAdapter::IDENTIFIER_MAX_LENGTH
@@ -18,7 +17,7 @@ module ActiveRecord
 
       class IndexDefinition < ActiveRecord::ConnectionAdapters::IndexDefinition
         attr_accessor :parameters, :statement_parameters, :tablespace
- 
+
         def initialize(table, name, unique, columns, lengths, orders, where, type, using, parameters, statement_parameters, tablespace)
           @parameters = parameters
           @statement_parameters = statement_parameters
@@ -28,7 +27,6 @@ module ActiveRecord
       end
 
       class ColumnDefinition < ActiveRecord::ConnectionAdapters::ColumnDefinition
-
       end
 
       class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition
@@ -65,7 +63,6 @@ module ActiveRecord
         def create_column_definition(name, type)
           OracleEnhanced::ColumnDefinition.new name, type
         end
-
       end
 
       class AlterTable < ActiveRecord::ConnectionAdapters::AlterTable
@@ -86,7 +83,6 @@ module ActiveRecord
           @base.remove_foreign_key(@name, options)
         end
       end
-
     end
   end
 end

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

@@ -2,7 +2,6 @@ module ActiveRecord #:nodoc:
   module ConnectionAdapters #:nodoc:
     module OracleEnhanced #:nodoc:
       module SchemaDumper #:nodoc:
-
         private
 
         def tables(stream)
@@ -198,7 +197,6 @@ module ActiveRecord #:nodoc:
             end
           end
         end
-
       end
     end
   end

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

@@ -117,6 +117,26 @@ module ActiveRecord
           super
         end
 
+        def insert_versions_sql(versions) # :nodoc:
+          sm_table = quote_table_name(ActiveRecord::Migrator.schema_migrations_table_name)
+
+          if supports_multi_insert?
+            versions.inject("INSERT ALL\n") { |sql, version|
+              sql << "INTO #{sm_table} (version) VALUES (#{quote(version)})\n"
+            } << "SELECT * FROM DUAL\n"
+          else
+            if versions.is_a?(Array)
+              # called from ActiveRecord::Base.connection#dump_schema_information
+              versions.map { |version|
+                "INSERT INTO #{sm_table} (version) VALUES (#{quote(version)})"
+              }.join("\n\n/\n\n")
+            else
+              # called from ActiveRecord::Base.connection#assume_migrated_upto_version
+              "INSERT INTO #{sm_table} (version) VALUES (#{quote(versions)})"
+            end
+          end
+        end
+
         def initialize_schema_migrations_table
           super
         end
@@ -366,7 +386,7 @@ module ActiveRecord
           if options[:dependent]
             ActiveSupport::Deprecation.warn "`:dependent` option will be deprecated. Please use `:on_delete` option"
           end
-          case options[:dependent]  
+          case options[:dependent]
           when :delete then options[:on_delete] = :cascade
           when :nullify then options[:on_delete] = :nullify
           else
@@ -449,7 +469,7 @@ module ActiveRecord
 
         def create_alter_table(name)
           OracleEnhanced::AlterTable.new create_table_definition(name, false, {})
-        end 
+        end
 
         def tablespace_for(obj_type, tablespace_option, table_name=nil, column_name=nil)
           tablespace_sql = ''
@@ -467,7 +487,6 @@ module ActiveRecord
           (default_tablespaces[type] || default_tablespaces[native_database_types[type][:name]]) rescue nil
         end
 
-
         def column_for(table_name, column_name)
           unless column = columns(table_name).find { |c| c.name == column_name.to_s }
             raise "No such column: #{table_name}.#{column_name}"
@@ -520,7 +539,6 @@ module ActiveRecord
 
           execute("ALTER INDEX #{quote_column_name(index_name)} REBUILD TABLESPACE #{tablespace}")
         end
-
       end
     end
   end

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

@@ -54,7 +54,6 @@ module ActiveRecord
               oracle_downcase(row['table_owner']), oracle_downcase(row['table_name']), oracle_downcase(row['db_link']))
           end
         end
-
       end
     end
   end

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

@@ -1,7 +1,6 @@
 module ActiveRecord #:nodoc:
   module ConnectionAdapters #:nodoc:
     module OracleEnhancedStructureDump #:nodoc:
-
       # Statements separator used in structure dump to allow loading of structure dump also with SQL*Plus
       STATEMENT_TOKEN = "\n\n/\n\n"
 
@@ -73,7 +72,7 @@ module ActiveRecord #:nodoc:
 
       def structure_dump_primary_key(table) #:nodoc:
         opts = {:name => '', :cols => []}
-        pks = select_all(<<-SQL, "Primary Keys") 
+        pks = select_all(<<-SQL, "Primary Keys")
           SELECT a.constraint_name, a.column_name, a.position
             FROM all_cons_columns a
             JOIN all_constraints c
@@ -92,7 +91,7 @@ module ActiveRecord #:nodoc:
 
       def structure_dump_unique_keys(table) #:nodoc:
         keys = {}
-        uks = select_all(<<-SQL, "Primary Keys") 
+        uks = select_all(<<-SQL, "Primary Keys")
           SELECT a.constraint_name, a.column_name, a.position
             FROM all_cons_columns a
             JOIN all_constraints c
@@ -191,7 +190,6 @@ module ActiveRecord #:nodoc:
         sql
       end
 
-
       # Extract all stored procedures, packages, synonyms and views.
       def structure_dump_db_stored_code #:nodoc:
         structure = []
@@ -215,7 +213,7 @@ module ActiveRecord #:nodoc:
           structure << ddl
         end
 
-        # export views 
+        # export views
         select_all("SELECT view_name, text FROM all_views WHERE owner = SYS_CONTEXT('userenv', 'session_user') ORDER BY view_name ASC").each do |view|
           structure << "CREATE OR REPLACE FORCE VIEW #{view['view_name']} AS\n #{view['text']}"
         end
@@ -298,7 +296,7 @@ module ActiveRecord #:nodoc:
 
       private
 
-      # virtual columns are an 11g feature.  This returns [] if feature is not 
+      # virtual columns are an 11g feature.  This returns [] if feature is not
       # present or none are found.
       # return [{'column_name' => 'FOOS', 'data_default' => '...'}, ...]
       def virtual_columns_for(table)
@@ -336,7 +334,6 @@ module ActiveRecord #:nodoc:
         string << STATEMENT_TOKEN unless string.blank?
         string
       end
-
     end
   end
 end

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -46,7 +46,6 @@ end
 
 module ActiveRecord
   class Base
-
     # Specify table columns which should be ignored by ActiveRecord, e.g.:
     #
     #   ignore_table_columns :attribute1, :attribute2
@@ -173,7 +172,6 @@ module ActiveRecord
   end
 
   module ConnectionAdapters #:nodoc:
-
     # Oracle enhanced adapter will work with both
     # Ruby 1.8/1.9 ruby-oci8 gem (which provides interface to Oracle OCI client)
     # or with JRuby and Oracle JDBC driver.
@@ -445,7 +443,7 @@ module ActiveRecord
       end
 
       def arel_visitor # :nodoc:
-        if supports_fetch_first_n_rows_and_offset? && !use_old_oracle_visitor
+        if supports_fetch_first_n_rows_and_offset?
           Arel::Visitors::Oracle12.new(self)
         else
           Arel::Visitors::Oracle.new(self)
@@ -477,7 +475,7 @@ module ActiveRecord
       end
 
       def supports_fetch_first_n_rows_and_offset?
-        if @connection.database_version == [12,1]
+        if !use_old_oracle_visitor && @connection.database_version == [12,1]
           true
         else
           false
@@ -495,7 +493,7 @@ module ActiveRecord
       end
 
       def supports_multi_insert?
-        false
+        @connection.database_version.to_s >= [11, 2].to_s
       end
 
       #:stopdoc:
@@ -767,7 +765,6 @@ module ActiveRecord
         data_sources
       end
 
-
       def data_sources
         select_values(
         "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'",
@@ -1306,7 +1303,6 @@ module ActiveRecord
           @logger.debug "DBMS_OUTPUT: #{result[:line]}" if @logger
         end
       end
-
     end
   end
 end

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

@@ -15,7 +15,6 @@ module ActiveRecord
             !FALSE_VALUES.include?(value)
           end
         end
-
       end
     end
   end

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

@@ -1,5 +1,5 @@
 #TODO Need to consider namespace change since paremt class moved to ActiveModel
-module ActiveRecord 
+module ActiveRecord
   module OracleEnhanced
     module Type
       class Integer < ActiveModel::Type::Integer # :nodoc:

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

@@ -4,7 +4,6 @@ module ActiveRecord
   module OracleEnhanced
     module Type
       class NationalCharacterString < ActiveRecord::OracleEnhanced::Type::String # :nodoc:
-
         def serialize(value)
           return unless value
           Data.new(super)

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

@@ -18,7 +18,6 @@ module ActiveRecord
             value.map { |x| "%02X" % x }.join
           end
         end
-
       end
     end
   end

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

@@ -21,7 +21,6 @@ module ActiveRecord
             super
           end
         end
-
       end
     end
   end

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

@@ -4,7 +4,6 @@ module ActiveRecord
   module OracleEnhanced
     module Type
       class Text < ActiveModel::Type::Text # :nodoc:
-
         def changed_in_place?(raw_old_value, new_value)
           #TODO: Needs to find a way not to cast here.
           raw_old_value = cast(raw_old_value)
@@ -25,7 +24,6 @@ module ActiveRecord
             @value
           end
         end
-
       end
     end
   end