activerecord-oracle_enhanced-adapter-monky_patch_755 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 126a4ca05008abafa013f727d12b1e63d8cc93a1
-  data.tar.gz: 356e802ba546bf6aa21d9d9d26d5464a6010757d
+  metadata.gz: 5f4ae731eb481175433c8d957add4457c1fdb359
+  data.tar.gz: e61dcaa85b1a36bd231863e7349394e2c275c589
 SHA512:
-  metadata.gz: 67a203db760816d586498789b00a35a94dda46c007073266ee726b239413377c8514cccd2bfa87bc1a838f45707d432505b5f4a6c7a8055d9e6b6661c0f05e62
-  data.tar.gz: 8e143df1032a05f846c2fbbadfa0e93298e71f5d697acd5eab5789ece32f96f0ec93c9042d97ab51b75313961bc71749d4b7e149388db50e8cc9f5ee03c5acc8
+  metadata.gz: 17dae0dd78ec2bed3b9dfe4249c92ed7bd755244dc05132a12bc66b9afe254728373e71d65156a5931cafbd90d1962b75e2b38ccf8a982fa70cdc8160d5e42ae
+  data.tar.gz: e56022b35d084c5a935eacba0c8b794a121315309fd5800cab9d7668f2097ff63e87f5bc3599c51b7b8b1c28c8df2bf81a7f423de16f5a03677894737eac4000

data/README.md

@@ -26,8 +26,8 @@ $ gem install activerecord-oracle_enhanced-adapter-monky_patch_755
 
 ## Target
 
-* 'activerecord', '=> 4.2.1'
-* 'activerecord-oracle_enhanced-adapter', '~> 1.6.0'
+* 'activerecord', '>= 4.2.1'
+* 'activerecord-oracle_enhanced-adapter', '>= 1.6.0'
 
 ## Motivation
 

data/lib/activerecord/monkey_patch.rb

@@ -1,6 +1,11 @@
-case Rails::VERSION::MAJOR
-when 4; require 'activerecord/monkey_patch/rails4'
-when 5; require 'activerecord/monkey_patch/rails5'
+if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 2
+  require 'activerecord/monkey_patch/rails4_2'
+elsif ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR == 0
+  require 'activerecord/monkey_patch/rails5_0'
+elsif ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR == 1
+  require 'activerecord/monkey_patch/rails5_1'
+else
+  raise "Unsupported version of Active Record: #{ActiveRecord.version}"
 end
 
 #

data/lib/activerecord/monkey_patch/{rails5.rb → rails5_0.rb}

@@ -18,12 +18,42 @@ module ActiveRecord
   end
 
   module ConnectionAdapters
-    #
-    # Original code is the following URL.
-    #
-    #   https://github.com/rsim/oracle-enhanced/blob/rails5/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb#L938
-    #
     class OracleEnhancedAdapter
+      #
+      # `supports_datetime_with_precision?` method and `native_database_types` method are overwriting
+      # the mapping between Rails and Oracle type to match Rails 4.2 behavior.
+      #
+      # The following is the SQL type when generating datetime column.
+      #
+      # - Rails 5 ... `TIMESTAMP(6)' SQL type.
+      # - Rails 4 ... `DATE' SQL type. ***This is the behavior of the monkey patch***.
+      #
+      # Original code is the following URL.
+      #
+      # https://github.com/rsim/oracle-enhanced/blob/v1.7.9/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb#L521
+      #
+      def supports_datetime_with_precision?
+        false
+      end
+
+      def native_database_types
+        native_database_types_patch = {
+          datetime: { name: "DATE" },
+          time:     { name: "DATE" }
+        }
+
+        if emulate_booleans_from_strings
+          ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter::NATIVE_DATABASE_TYPES_BOOLEAN_STRINGS.dup.merge(native_database_types_patch)
+        else
+          ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter::NATIVE_DATABASE_TYPES.dup.merge(native_database_types_patch)
+        end
+      end
+
+      #
+      # Original code is the following URL.
+      #
+      #   https://github.com/rsim/oracle-enhanced/blob/rails5/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb#L938
+      #
       def columns_without_cache(table_name, name = nil) #:nodoc:
         table_name = table_name.to_s
         # get ignored_columns by original table name
@@ -106,6 +136,34 @@ module ActiveRecord
     end
 
     module OracleEnhanced
+      #
+      # This is a monkey patch to the problem below.
+      # As a result of `rails db:schema:dump`, the `DATE` type column expects to return `t.datetime :created_at`.
+      # But actually `t.date :created_at` is returned.
+      #
+      # Perhaps, converting the `DATE` type created in Rails 4 to `TIMESTAMP(6)` type that is used in Rails 5 makes
+      # this monkey patch unnecessary.
+      #
+      # Original code is the following URL.
+      #
+      # https://github.com/rsim/oracle-enhanced/blob/v1.7.9/lib/active_record/connection_adapters/oracle_enhanced/column_dumper.rb#L5-L14
+      #
+      module ColumnDumper
+        def column_spec(column)
+          spec = Hash[prepare_column_options(column).map { |k, v| [k, "#{k}: #{v}"] }]
+          spec[:name] = column.name.inspect
+          if column.virtual?
+            spec[:type] = "virtual"
+          else
+            spec[:type] = schema_type(column).to_s
+          end
+
+          spec[:type] = "datetime" if spec[:type] == "date" # *** This line includes a monky patch condition. ***
+
+          spec
+        end
+      end
+
       #
       # Original code is the following URL.
       #

data/lib/activerecord/monkey_patch/rails5_1.rb

@@ -0,0 +1,242 @@
+module ActiveRecord
+  module MonkeyPatch
+    SUPPORTED_MAJOR_VERSION = 5
+    MINIMUM_SUPPORTED_VERSION = '5.1.0'.freeze
+  end
+
+  module ConnectionAdapters
+    #
+    # This is a monkey patch to the problem below.
+    # As a result of `rails db:schema:dump`, the `DATE` type column expects to return `t.datetime :created_at`.
+    # But actually `t.date :created_at` is returned.
+    #
+    # Perhaps, converting the `DATE` type created in Rails 4 to `TIMESTAMP(6)` type that is used in Rails 5 makes
+    # this monkey patch unnecessary.
+    #
+    # Original code is the following URL.
+    #
+    # https://github.com/rails/rails/blob/v5.1.0.beta1/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb#L9-L11
+    #
+    module ColumnDumper
+      def column_spec(column)
+        # The following 2 lines are a main monkey patch in this method.
+        spec = Hash[prepare_column_options(column).map { |k, v| [k, "#{k}: #{v}"] }]
+
+        schema_type = (column.type == :date) ? :datetime : schema_type_with_virtual(column)
+
+        [schema_type, prepare_column_options(column)]
+      end
+    end
+
+    class OracleEnhancedAdapter
+      #
+      # `supports_datetime_with_precision?` method and `native_database_types` method are overwriting
+      # the mapping between Rails and Oracle type to match Rails 4.2 behavior.
+      #
+      # The following is the SQL type when generating datetime column.
+      #
+      # - Rails 5 ... `TIMESTAMP(6)' SQL type.
+      # - Rails 4 ... `DATE' SQL type. ***This is the behavior of the monkey patch***.
+      #
+      # Original code is the following URL.
+      #
+      # https://github.com/rsim/oracle-enhanced/blob/v1.8.0.rc1/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb#L336
+      #
+      def supports_datetime_with_precision?
+        false
+      end
+
+      def native_database_types
+        native_database_types_patch = {
+          datetime: { name: "DATE" },
+          time:     { name: "DATE" }
+        }
+
+        if emulate_booleans_from_strings
+          ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter::NATIVE_DATABASE_TYPES_BOOLEAN_STRINGS.dup.merge(native_database_types_patch)
+        else
+          ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter::NATIVE_DATABASE_TYPES.dup.merge(native_database_types_patch)
+        end
+      end
+
+      #
+      # Original code is the following URL.
+      #
+      #  https://github.com/rsim/oracle-enhanced/blob/v1.8.0.beta1/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb#L735-L801
+      #
+      def columns_without_cache(table_name, name = nil) #:nodoc:
+        table_name = table_name.to_s
+
+        (owner, desc_table_name, db_link) = @connection.describe(table_name)
+
+        # reset do_not_prefetch_primary_key cache for this table
+        @@do_not_prefetch_primary_key[table_name] = nil
+
+        table_cols = <<-SQL.strip.gsub(/\s+/, " ")
+            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,
+                                     'FLOAT', data_precision,
+                                     'VARCHAR2', DECODE(char_used, 'C', char_length, data_length),
+                                     'RAW', DECODE(char_used, 'C', char_length, data_length),
+                                     'CHAR', DECODE(char_used, 'C', char_length, data_length),
+                                      NULL) AS limit,
+                   DECODE(data_type, 'NUMBER', data_scale, NULL) AS scale,
+                   comments.comments as column_comment
+              FROM all_tab_cols#{db_link} cols, all_col_comments#{db_link} comments
+             WHERE cols.owner      = '#{owner}'
+               AND cols.table_name = #{quote(desc_table_name)}
+               AND cols.hidden_column = 'NO'
+               AND cols.owner = comments.owner
+               AND cols.table_name = comments.table_name
+               AND cols.column_name = comments.column_name
+             ORDER BY cols.column_id
+          SQL
+
+        # added deletion of ignored columns
+        select_all(table_cols, name).to_a.map do |row|
+          limit, scale = row["limit"], row["scale"]
+          if limit || scale
+            row["sql_type"] += "(#{(limit || 38).to_i}" + ((scale = scale.to_i) > 0 ? ",#{scale})" : ")")
+          end
+
+          if row["sql_type_owner"]
+            row["sql_type"] = row["sql_type_owner"] + "." + row["sql_type"]
+          end
+
+          is_virtual = row["virtual_column"] == "YES"
+
+          # clean up odd default spacing from Oracle
+          if row["data_default"] && !is_virtual
+            row["data_default"].sub!(/^(.*?)\s*$/, '\1')
+
+            # If a default contains a newline these cleanup regexes need to
+            # match newlines.
+            row["data_default"].sub!(/^'(.*)'$/m, '\1')
+            row["data_default"] = nil if row["data_default"] =~ /^(null|empty_[bc]lob\(\))$/i
+            # TODO: Needs better fix to fallback "N" to false
+            row["data_default"] = false if (row["data_default"] == "N" && OracleEnhancedAdapter.emulate_booleans_from_strings)
+          end
+
+          type_metadata = fetch_type_metadata(row["sql_type"])
+
+          # *** Its a monkey patch paragraph. ***
+          if /date/i === type_metadata.sql_type
+            if type_metadata.type == :date
+              type_metadata.instance_eval('@sql_type = "DATETIME"')
+            end
+          end
+
+          new_column(oracle_downcase(row["name"]),
+                     row["data_default"],
+                     type_metadata,
+                     row["nullable"] == "Y",
+                     table_name,
+                     is_virtual,
+                     false,
+                     row["column_comment"]
+                    )
+        end
+      end
+    end
+
+    module OracleEnhanced
+      module Quoting
+        #
+        # Original code has been removed.
+        #
+        # https://github.com/rsim/oracle-enhanced/commit/28dd91ccbbbf8e1e313ba816257ad281860f100b
+        #
+        def quote(value)
+          case value
+          when ::Date, ::Time, ::DateTime # *** Its a monky patch condition. ***
+            if value.acts_like?(:time)
+              zone_conversion_method = ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
+
+              if value.respond_to?(zone_conversion_method)
+                value = value.send(zone_conversion_method)
+              end
+            end
+
+            "'#{value.to_s(:db)}'"
+          else
+            super
+          end
+        end
+
+        #
+        # Follow up to https://github.com/rsim/oracle-enhanced/pull/1267/commits/f26432f679fb836f4f4d72f6a7e9999da175ac91
+        #
+        def _type_cast(value)
+          case value
+          when Date, Time # *** Its a monky patch condition. ***
+            if value.acts_like?(:time)
+              zone_conversion_method = ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
+              value.respond_to?(zone_conversion_method) ? value.send(zone_conversion_method) : value
+            else
+              value
+            end
+          when ActiveRecord::OracleEnhanced::Type::NationalCharacterString::Data
+            value.to_s
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+
+  #
+  # Original code is the following URL.
+  #
+  #   https://github.com/rails/rails/blob/v5.1.0.beta1/activerecord/lib/active_record/relation/where_clause_factory.rb
+  #
+  class Relation
+    class WhereClauseFactory
+
+      def build(opts, other)
+        binds = []
+
+        case opts
+        when String, Array
+          parts = [klass.send(:sanitize_sql, other.empty? ? opts : ([opts] + other))]
+        when Hash
+          opts = ActiveRecord::MonkeyPatch.adjust_timezone_offset(opts)
+
+          attributes = predicate_builder.resolve_column_aliases(opts)
+          attributes = klass.send(:expand_hash_conditions_for_aggregates, attributes)
+          attributes.stringify_keys!
+
+          attributes, binds = predicate_builder.create_binds(attributes)
+
+          parts = predicate_builder.build_from_hash(attributes)
+        when Arel::Nodes::Node
+          parts = [opts]
+          binds = other
+        else
+          raise ArgumentError, "Unsupported argument type: #{opts} (#{opts.class})"
+        end
+
+        WhereClause.new(parts, binds)
+      end
+    end
+  end
+
+  #
+  # Original code is the following URL.
+  #
+  #   https://github.com/rails/rails/blob/v5.1.0.beta1/activerecord/lib/active_record/statement_cache.rb#L81-L85
+  #
+  class StatementCache # :nodoc:
+    class BindMap # :nodoc:
+      def bind(values)
+        values = ActiveRecord::MonkeyPatch.adjust_timezone_offset(values)
+
+        bas = @bound_attributes.dup
+        @indexes.each_with_index { |offset,i| bas[offset] = bas[offset].with_cast_value(values[i]) }
+        bas
+      end
+    end
+  end
+end

data/lib/oracle_enhanced/monkey_patch_755/version.rb

@@ -1,5 +1,5 @@
 module OracleEnhanced
   module MonkeyPatch755
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter-monky_patch_755
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Koichi ITO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -90,8 +90,9 @@ files:
 - README.md
 - lib/activerecord-oracle_enhanced-adapter-monky_patch_755.rb
 - lib/activerecord/monkey_patch.rb
-- lib/activerecord/monkey_patch/rails4.rb
-- lib/activerecord/monkey_patch/rails5.rb
+- lib/activerecord/monkey_patch/rails4_2.rb
+- lib/activerecord/monkey_patch/rails5_0.rb
+- lib/activerecord/monkey_patch/rails5_1.rb
 - lib/oracle_enhanced/monkey_patch_755/hooks.rb
 - lib/oracle_enhanced/monkey_patch_755/railtie.rb
 - lib/oracle_enhanced/monkey_patch_755/version.rb
@@ -101,8 +102,13 @@ licenses:
 metadata: {}
 post_install_message: |
   [activerecord-oracle_enhanced-adapter-monky_patch_755]
-  oracle-enhanced ISSUE #755 has been fixed at oracle-enhanced 1.7.3.
-  The best way is to use oracle-enhanced 1.7.3 or later. Thanks.
+  oracle-enhanced ISSUE #755 has been resolved at oracle-enhanced 1.7.3.
+  The best way is to use oracle-enhanced 1.7.3 or later.
+
+  Upgrade Rails 4.2 or older version to Rails 5.
+  See https://github.com/rsim/oracle-enhanced#upgrade-rails-42-or-older-version-to-rails-5
+
+  Thank you.
 rdoc_options: []
 require_paths:
 - lib
@@ -118,9 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: 'A monkey patch for oracle-enhanced ISSUE #755.'
 test_files: []
-has_rdoc: