activerecord-oracle_enhanced-adapter-monky_patch_755 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5f4ae731eb481175433c8d957add4457c1fdb359
-  data.tar.gz: e61dcaa85b1a36bd231863e7349394e2c275c589
+SHA256:
+  metadata.gz: 06fe1c2f06a608758e071627802d4ddfdfb6b650d0a41c0f6359adda79e31af4
+  data.tar.gz: 80f000c4cb4114014d0a1c4b1f7d2586ff449aa1d7ca63f063ab3d6c3d86e40d
 SHA512:
-  metadata.gz: 17dae0dd78ec2bed3b9dfe4249c92ed7bd755244dc05132a12bc66b9afe254728373e71d65156a5931cafbd90d1962b75e2b38ccf8a982fa70cdc8160d5e42ae
-  data.tar.gz: e56022b35d084c5a935eacba0c8b794a121315309fd5800cab9d7668f2097ff63e87f5bc3599c51b7b8b1c28c8df2bf81a7f423de16f5a03677894737eac4000
+  metadata.gz: 1387e40b2fa4d8c0a916e1b9170511c90b93b0c60618f3891ab0a3d3e2fb04318f70d48b5dc33c2961cb32f0886c4180e3a74de7b2c31fff18fcceb9cf36d0e2
+  data.tar.gz: 51aa051b7dde9d41082f9ebb8cb42ffb262d5626f79b4af110db40d00c2460b52cc9b465dc31af4c34aca4a3fe5512576c0f2f9a97ce831f940fbbbd2d2aaf23

data/README.md

@@ -2,7 +2,9 @@
 
 A monkey patch for oracle-enhanced ISSUE [#755](https://github.com/rsim/oracle-enhanced/issues/755).
 
-**ISSUE #755 has been resolved at activerecord-oracle_enhanced-adapter 1.7.3.**
+**ISSUE #755 has been resolved on activerecord-oracle_enhanced-adapter 1.7.3 or higher.**
+
+The development of this gem has ended. Rails 5.2 or higher are not supported.
 
 ## Installation
 

data/lib/activerecord/monkey_patch/rails5_1.rb

@@ -184,6 +184,21 @@ module ActiveRecord
           end
         end
       end
+
+      module SchemaStatements
+        # https://github.com/rsim/oracle-enhanced/blob/v1.7.9/lib/active_record/connection_adapters/oracle_enhanced/schema_statements.rb#L290
+        def change_column_null(table_name, column_name, null, default = nil) #:nodoc:
+          column = column_for(table_name, column_name)
+
+          unless null || default.nil?
+            execute("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL")
+          end
+
+          sql_type = column.sql_type.to_s == 'DATETIME' ? 'DATE' : column.sql_type # monkey_patched
+
+          change_column table_name, column_name, sql_type, :null => null
+        end
+      end
     end
   end
 

data/lib/activerecord/monkey_patch/rails5_2.rb

@@ -0,0 +1,219 @@
+module ActiveRecord
+  module MonkeyPatch
+    SUPPORTED_MAJOR_VERSION = 5
+    MINIMUM_SUPPORTED_VERSION = '5.2.0'.freeze
+  end
+
+  module ConnectionAdapters
+    #
+    # This is a monkey patch to the problem below.
+    # As a result of `bin/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.2.1/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb#L13-L15
+    #
+    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
+
+    module OracleEnhanced
+      module SchemaStatements
+
+        #
+        # Original code is the following URL.
+        #  https://github.com/rsim/oracle-enhanced/blob/v5.2.3/lib/active_record/connection_adapters/oracle_enhanced/schema_statements.rb#L618-L652
+        #
+        def new_column_from_field(table_name, field)
+          limit, scale = field["limit"], field["scale"]
+          if limit || scale
+            field["sql_type"] += "(#{(limit || 38).to_i}" + ((scale = scale.to_i) > 0 ? ",#{scale})" : ")")
+          end
+
+          if field["sql_type_owner"]
+            field["sql_type"] = field["sql_type_owner"] + "." + field["sql_type"]
+          end
+
+          is_virtual = field["virtual_column"] == "YES"
+
+          # clean up odd default spacing from Oracle
+          if field["data_default"] && !is_virtual
+            field["data_default"].sub!(/^(.*?)\s*$/, '\1')
+
+            # 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
+            # TODO: Needs better fix to fallback "N" to false
+            field["data_default"] = false if (field["data_default"] == "N" && OracleEnhancedAdapter.emulate_booleans_from_strings)
+          end
+
+          type_metadata = fetch_type_metadata(field["sql_type"], is_virtual)
+
+          # *** Its a monkey patch paragraph. ***
+p "sql_type: #{type_metadata.sql_type}"
+          if /date/i === type_metadata.sql_type
+            if type_metadata.type == :date
+              type_metadata.instance_eval('@sql_type = "DATETIME"')
+            end
+          end
+
+          default_value = extract_value_from_default(field["data_default"])
+          default_value = nil if is_virtual
+          OracleEnhanced::Column.new(oracle_downcase(field["name"]),
+                                     default_value,
+                                     type_metadata,
+                                     field["nullable"] == "Y",
+                                     table_name,
+                                     field["column_comment"]
+                                    )
+        end
+      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/v5.2.3/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
+      #
+      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
+    end
+
+    module OracleEnhanced
+      module Quoting
+        #
+        # Original code has been removed.
+        #
+        # https://github.com/rsim/oracle-enhanced/commit/28dd91ccbbbf8e1e313ba816257ad281860f100b
+        #
+        def quote(value)
+# p caller.each {|c| p c }
+p "*** quote: #{value}"
+p "*** quote: #{value.class}"
+          case value
+          when ::Date, ::Time, ::DateTime # *** Its a monky patch condition. ***
+p "xxx quote: #{value.class}"
+p "xxx quote acts_like?: #{value.acts_like?(:time)}"
+            if value.acts_like?(:time)
+              zone_conversion_method = ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
+
+#          p "*** quote respond_to?: #{value.respond_to?(zone_conversion_method)}"
+              if value.respond_to?(zone_conversion_method)
+                value = value.send(zone_conversion_method)
+              end
+            end
+
+#          p "*** quote to_s(:db): #{value.to_s(:db)}"
+            "'#{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)
+#          p "*** _type_cast: #{value}"
+#          p "*** _type_cast: #{value.class}"
+          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::Type::OracleEnhanced::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.2.0.beta2/activerecord/lib/active_record/relation/where_clause_factory.rb
+  #
+  class Relation
+    class WhereClauseFactory
+      def build(opts, other)
+# p "*** WhereClauseFactory #{opts}"
+# p "*** WhereClauseFactory #{opts.class}"
+        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!
+
+          parts = predicate_builder.build_from_hash(attributes)
+        when Arel::Nodes::Node
+          parts = [opts]
+        else
+          raise ArgumentError, "Unsupported argument type: #{opts} (#{opts.class})"
+        end
+
+        WhereClause.new(parts)
+      end
+    end
+  end
+
+  #
+  # Original code is the following URL.
+  #   https://github.com/rails/rails/blob/v5.2.0.beta2/activerecord/lib/active_record/statement_cache.rb#L83-L87
+  #
+  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.3.0'.freeze
+    VERSION = '1.0.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.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Koichi ITO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2019-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activerecord-oracle_enhanced-adapter
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +65,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +75,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +105,7 @@ files:
 - lib/activerecord/monkey_patch/rails4_2.rb
 - lib/activerecord/monkey_patch/rails5_0.rb
 - lib/activerecord/monkey_patch/rails5_1.rb
+- lib/activerecord/monkey_patch/rails5_2.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
@@ -108,6 +121,8 @@ post_install_message: |
   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
 
+  Also this gem doesn't support Rails 5.2 or higher.
+
   Thank you.
 rdoc_options: []
 require_paths:
@@ -123,8 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: 'A monkey patch for oracle-enhanced ISSUE #755.'