RubyGems - activerecord-oracle_enhanced-adapter-monky_patch_755 - Versions diffs - 0.1.0 → 0.2.0 - Mend

activerecord-oracle_enhanced-adapter-monky_patch_755 0.1.0 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +4 -4
data/README.md +3 -1
data/lib/activerecord/monkey_patch.rb +6 -2
data/lib/activerecord/monkey_patch/rails5.rb +187 -0
data/lib/oracle_enhanced/monkey_patch_755/version.rb +1 -1
metadata +43 -10

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f52477ecfea60965cab665db9538b9ec3628e8a
-  data.tar.gz: 233d34227e9b5f6862f632348e644c74dbd389b2
+  metadata.gz: 126a4ca05008abafa013f727d12b1e63d8cc93a1
+  data.tar.gz: 356e802ba546bf6aa21d9d9d26d5464a6010757d
 SHA512:
-  metadata.gz: fee727e8ec1ee52b3279c61992463e6ee9cdbf3861879d52a6024293997dbdaefd21fc7538eced4b7a332a7037ce7de0dfc741b0f2012532a1a1845e53d56fdd
-  data.tar.gz: 0a2d87e55362fd8afdb70d7a11eca11c5582c225f28add0763cb7e7df773ec75a33d6f6a4168dcad72829473c91e6a7ae89bd245ca0b3695e4b8ea12baf8e88b
+  metadata.gz: 67a203db760816d586498789b00a35a94dda46c007073266ee726b239413377c8514cccd2bfa87bc1a838f45707d432505b5f4a6c7a8055d9e6b6661c0f05e62
+  data.tar.gz: 8e143df1032a05f846c2fbbadfa0e93298e71f5d697acd5eab5789ece32f96f0ec93c9042d97ab51b75313961bc71749d4b7e149388db50e8cc9f5ee03c5acc8

data/README.md CHANGED Viewed

@@ -2,6 +2,8 @@
 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.**
 ## Installation
 Add these lines to your application's Gemfile:
@@ -24,7 +26,7 @@ $ gem install activerecord-oracle_enhanced-adapter-monky_patch_755
 ## Target
-* 'activerecord', '~>4.2.1'
+* 'activerecord', '=> 4.2.1'
 * 'activerecord-oracle_enhanced-adapter', '~> 1.6.0'
 ## Motivation

data/lib/activerecord/monkey_patch.rb CHANGED Viewed

@@ -1,4 +1,7 @@
-require 'activerecord/monkey_patch/rails4'
+case Rails::VERSION::MAJOR
+when 4; require 'activerecord/monkey_patch/rails4'
+when 5; require 'activerecord/monkey_patch/rails5'
+end
 #
 # This code is a monkey patch for oracle-enhanced ISSUE #755.
@@ -10,7 +13,8 @@ module ActiveRecord
     def adjust_timezone_offset(opts)
       if ActiveRecord::Base.connection_config[:adapter] != 'oracle_enhanced' ||
         ActiveRecord::VERSION::MAJOR != SUPPORTED_MAJOR_VERSION ||
-        ActiveRecord.version < Gem::Version.create(MINIMUM_SUPPORTED_VERSION)
+        ActiveRecord.version < Gem::Version.create(MINIMUM_SUPPORTED_VERSION) ||
+        Gem::Version.create(ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter::VERSION ) > Gem::Version.create('1.7.3')
         return opts
       end

data/lib/activerecord/monkey_patch/rails5.rb ADDED Viewed

@@ -0,0 +1,187 @@
+module ActiveRecord
+  module MonkeyPatch
+    SUPPORTED_MAJOR_VERSION = 5
+    MINIMUM_SUPPORTED_VERSION = '5.0.0'.freeze
+  end
+  #
+  # Original code is the following URL.
+  #
+  # https://github.com/rails/rails/blob/v5.0.0.1/activerecord/lib/active_record/internal_metadata.rb#L18
+  #
+  class InternalMetadata < ActiveRecord::Base
+     class << self
+       def []=(key, value)
+         find_or_initialize_by(key: key).update_attributes!(value: value.to_s)
+       end
+     end
+  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
+      def columns_without_cache(table_name, name = nil) #:nodoc:
+        table_name = table_name.to_s
+        # get ignored_columns by original table name
+        ignored_columns = ignored_table_columns(table_name)
+        (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 = '#{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.delete_if do |row|
+          ignored_columns && ignored_columns.include?(row['name'].downcase)
+        end.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
+      #
+      # Original code is the following URL.
+      #
+      # https://github.com/rsim/oracle-enhanced/blob/rails5/lib/active_record/connection_adapters/oracle_enhanced/quoting.rb#L87
+      #
+      module Quoting
+        def quote(value, column = nil) #:nodoc:
+          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
+      end
+    end
+  end
+  #
+  # Original code is the following URL.
+  #
+  #   https://github.com/rails/rails/blob/v5.0.0/activerecord/lib/active_record/relation/where_clause_factory.rb#L9
+  #
+  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.0.0/activerecord/lib/active_record/statement_cache.rb#L83
+  #
+  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 CHANGED Viewed

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

metadata CHANGED Viewed

@@ -1,57 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter-monky_patch_755
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Koichi ITO
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: activerecord-oracle_enhanced-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: ruby-oci8
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: 'A monkey patch for oracle-enhanced ISSUE #755.'
 email: koic.ito@gmail.com
 executables: []
@@ -63,6 +91,7 @@ files:
 - 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/oracle_enhanced/monkey_patch_755/hooks.rb
 - lib/oracle_enhanced/monkey_patch_755/railtie.rb
 - lib/oracle_enhanced/monkey_patch_755/version.rb
@@ -70,7 +99,10 @@ homepage: http://github.com/koic/oracle-enhanced-monky_patch_755
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+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.
 rdoc_options: []
 require_paths:
 - lib
@@ -86,8 +118,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key:
 specification_version: 4
 summary: 'A monkey patch for oracle-enhanced ISSUE #755.'
 test_files: []
+has_rdoc: