activerecord-oracle_enhanced-adapter 1.5.6 → 1.6.9

data/RUNNING_TESTS.md

@@ -16,7 +16,9 @@ to increase process limit and then restart the database (this will be necessary
 Ruby versions
 -------------
 
-It is recommended to use [RVM](http://rvm.beginrescueend.com) to run tests with different Ruby implementations. oracle_enhanced is mainly tested with MRI 1.8.7 (all Rails versions) and 1.9.2 (Rails 3) and JRuby 1.6.
+oracle_enhanced is tested with MRI 2.1.x and 2.2.x, and JRuby 1.7.x and 9.0.x.x.  
+
+It is recommended to use [RVM](http://rvm.beginrescueend.com) to run tests with different Ruby implementations.
 
 Running tests
 -------------
@@ -26,19 +28,22 @@ Running tests
         SQL> CREATE USER oracle_enhanced IDENTIFIED BY oracle_enhanced;
         SQL> GRANT unlimited tablespace, create session, create table, create sequence, create procedure, create trigger, create view, create materialized view, create database link, create synonym, create type, ctxapp TO oracle_enhanced;
 
-* If you use RVM then switch to corresponding Ruby (1.8.7, 1.9.2 or JRuby) and it is recommended to create isolated gemset for test purposes (e.g. rvm create gemset oracle_enhanced)
+        SQL> CREATE USER oracle_enhanced_schema IDENTIFIED BY oracle_enhanced_schema;
+        SQL> GRANT unlimited tablespace, create session, create table, create sequence, create procedure, create trigger, create view, create materialized view, create database link, create synonym, create type, ctxapp TO oracle_enhanced_schema;
+
+* If you use RVM then switch to corresponding Ruby. It is recommended to create isolated gemsets for test purposes (e.g. rvm create gemset oracle_enhanced)
 
 * Install bundler with
 
         gem install bundler
 
-* Set RAILS_GEM_VERSION to Rails version that you would like to use in oracle_enhanced tests, e.g.
-
-        export RAILS_GEM_VERSION=3.0.3
-
 * Install necessary gems with
 
         bundle install
+        
+* Configure database credentials in one of two ways:
+    * copy spec/spec_config.yaml.template to spec/spec_config.yaml and modify as needed
+    * set required environment variables (see DATABASE_NAME in spec_helper.rb)
 
 * Run tests with
 

data/VERSION

@@ -1 +1 @@
-1.5.6
+1.6.9

data/activerecord-oracle_enhanced-adapter.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-oracle_enhanced-adapter}
-  s.version = "1.5.6"
+  s.version = "1.6.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.license = 'MIT'
   s.authors = [%q{Raimonds Simanovskis}]
-  s.date = %q{2015-03-30}
+  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.
 }
@@ -30,23 +30,27 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     "activerecord-oracle_enhanced-adapter.gemspec",
     "lib/active_record/connection_adapters/emulation/oracle_adapter.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_adapter.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_column.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_column_dumper.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_connection.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_context_index.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_cpk.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_database_statements.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_dirty.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_jdbc_connection.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_oci_connection.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_procedures.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_schema_creation.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_schema_definitions.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_schema_dumper.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_schema_statements.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_schema_statements_ext.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_structure_dump.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced_version.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/column.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/column_dumper.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/connection.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/context_index.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/cpk.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/dirty.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/database_tasks.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/oci_connection.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/procedures.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/schema_creation.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/schema_definitions.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/schema_dumper.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/schema_statements.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/schema_statements_ext.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/structure_dump.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced/version.rb",
+    "lib/active_record/oracle_enhanced/type/integer.rb",
+    "lib/active_record/oracle_enhanced/type/timestamp.rb",
+    "lib/active_record/oracle_enhanced/type/raw.rb",
     "lib/activerecord-oracle_enhanced-adapter.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb",
@@ -88,9 +92,9 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.4"])
-      s.add_development_dependency(%q<activerecord>, [">= 0"])
+      s.add_development_dependency(%q<activerecord>, ["~> 4.2.1"])
       s.add_development_dependency(%q<activemodel>, [">= 0"])
       s.add_development_dependency(%q<activesupport>, [">= 0"])
       s.add_development_dependency(%q<actionpack>, [">= 0"])
@@ -100,9 +104,9 @@ This adapter is superset of original ActiveRecord Oracle adapter.
       s.add_development_dependency(%q<ruby-plsql>, [">= 0.4.4"])
       s.add_development_dependency(%q<ruby-oci8>, [">= 2.0.4"])
     else
-      s.add_dependency(%q<jeweler>, ["~> 1.8"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0"])
       s.add_dependency(%q<rspec>, ["~> 2.4"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<activerecord>, ["~> 4.2.1"])
       s.add_dependency(%q<activemodel>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<actionpack>, [">= 0"])
@@ -113,9 +117,9 @@ This adapter is superset of original ActiveRecord Oracle adapter.
       s.add_dependency(%q<ruby-oci8>, [">= 2.0.4"])
     end
   else
-    s.add_dependency(%q<jeweler>, ["~> 1.8"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0"])
     s.add_dependency(%q<rspec>, ["~> 2.4"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<activerecord>, ["~> 4.2.1"])
     s.add_dependency(%q<activemodel>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<actionpack>, [">= 0"])
@@ -126,4 +130,3 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     s.add_dependency(%q<ruby-oci8>, [">= 2.0.4"])
   end
 end
-

data/lib/active_record/connection_adapters/{oracle_enhanced_column.rb → oracle_enhanced/column.rb}

@@ -2,11 +2,13 @@ module ActiveRecord
   module ConnectionAdapters #:nodoc:
     class OracleEnhancedColumn < Column
 
-      attr_reader :table_name, :forced_column_type, :nchar, :virtual_column_data_default, :returning_id #:nodoc:
+      attr_reader :table_name, :nchar, :virtual_column_data_default, :returning_id #:nodoc:
 
-      def initialize(name, default, sql_type = nil, null = true, table_name = nil, forced_column_type = nil, virtual=false, returning_id=false) #:nodoc:
+      FALSE_VALUES << 'N'
+      TRUE_VALUES << 'Y'
+
+      def initialize(name, default, cast_type, sql_type = nil, null = true, table_name = nil, virtual=false, returning_id=false) #:nodoc:
         @table_name = table_name
-        @forced_column_type = forced_column_type
         @virtual = virtual
         @virtual_column_data_default = default.inspect if virtual
         @returning_id = returning_id
@@ -15,32 +17,20 @@ module ActiveRecord
         else
           default_value = self.class.extract_value_from_default(default)
         end
-        super(name, default_value, sql_type, null)
+        super(name, default_value, cast_type, sql_type, null)
         # Is column NCHAR or NVARCHAR2 (will need to use N'...' value quoting for these data types)?
         # Define only when needed as adapter "quote" method will check at first if instance variable is defined.
-        @nchar = true if @type == :string && sql_type[0,1] == 'N'
-        @object_type = sql_type.include? '.'
-      end
-
-      def type_cast(value) #:nodoc:
-        case type
-        when :raw
-          OracleEnhancedColumn.string_to_raw(value)
-        when :datetime
-          OracleEnhancedAdapter.emulate_dates ? guess_date_or_time(value) : super
-        when :float
-          !value.nil? ? self.class.value_to_decimal(value) : super
-        else
-          super
+        if sql_type 
+          @nchar = true if cast_type.class == ActiveRecord::Type::String && sql_type[0,1] == 'N'
+          @object_type = sql_type.include? '.'
         end
+        # TODO: Need to investigate when `sql_type` becomes nil
       end
 
-      def type_cast_code(var_name)
-        type == :float ? "#{self.class.name}.value_to_decimal(#{var_name})" : super
-      end
-
-      def klass
-        type == :float ? BigDecimal : super
+      def type_cast(value) #:nodoc:
+        return OracleEnhancedColumn::string_to_raw(value) if type == :raw
+        return guess_date_or_time(value) if type == :datetime && OracleEnhancedAdapter.emulate_dates
+        super
       end
 
       def virtual?
@@ -96,45 +86,6 @@ module ActiveRecord
       
       private
 
-      def simplified_type(field_type)
-        forced_column_type ||
-        case field_type
-        when /decimal|numeric|number/i
-          if OracleEnhancedAdapter.emulate_booleans && field_type.upcase == "NUMBER(1)"
-            :boolean
-          elsif extract_scale(field_type) == 0 ||
-                # if column name is ID or ends with _ID
-                OracleEnhancedAdapter.emulate_integers_by_column_name && OracleEnhancedAdapter.is_integer_column?(name, table_name)
-            :integer
-          elsif field_type.upcase == "NUMBER"
-            OracleEnhancedAdapter.number_datatype_coercion
-          else
-            :decimal
-          end
-        when /raw/i
-          :raw
-        when /char/i
-          if OracleEnhancedAdapter.emulate_booleans_from_strings &&
-             OracleEnhancedAdapter.is_boolean_column?(name, field_type, table_name)
-            :boolean
-          else
-            :string
-          end
-        when /date/i
-          if OracleEnhancedAdapter.emulate_dates_by_column_name && OracleEnhancedAdapter.is_date_column?(name, table_name)
-            :date
-          else
-            :datetime
-          end
-        when /timestamp/i
-          :timestamp
-        when /time/i
-          :datetime
-        else
-          super
-        end
-      end
-
       def self.extract_value_from_default(default)
         case default
           when String

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

@@ -0,0 +1,66 @@
+module ActiveRecord #:nodoc:
+  module ConnectionAdapters #:nodoc:
+    module OracleEnhanced #:nodoc:
+      module ColumnDumper #:nodoc:
+        def self.included(base) #:nodoc:
+          base.class_eval do
+            private
+            alias_method_chain :column_spec,            :oracle_enhanced
+            alias_method_chain :prepare_column_options, :oracle_enhanced
+            alias_method_chain :migration_keys,         :oracle_enhanced
+
+            def oracle_enhanced_adapter?
+            # return original method if not using 'OracleEnhanced'
+              if (rails_env = defined?(Rails.env) ? Rails.env : (defined?(RAILS_ENV) ? RAILS_ENV : nil)) &&
+                  ActiveRecord::Base.configurations[rails_env] &&
+                  ActiveRecord::Base.configurations[rails_env]['adapter'] != 'oracle_enhanced'
+                return false
+              else
+                return true
+              end
+            end
+          end
+        end
+
+        def column_spec_with_oracle_enhanced(column, types)
+          # return original method if not using 'OracleEnhanced'
+          return column_spec_without_oracle_enhanced(column, types) unless oracle_enhanced_adapter?
+
+          spec = prepare_column_options(column, types)
+          (spec.keys - [:name, :type]).each do |k|
+            key_s = (k == :virtual_type ? "type: " : "#{k.to_s}: ")
+            spec[k] = key_s + spec[k]
+          end
+          spec
+        end
+
+        def prepare_column_options_with_oracle_enhanced(column, types)
+          # return original method if not using 'OracleEnhanced'
+          return prepare_column_options_without_oracle_enhanced(column, types) unless oracle_enhanced_adapter?
+
+          spec = {}
+          spec[:name]      = column.name.inspect
+          spec[:type]      = column.virtual? ? 'virtual' : column.type.to_s
+          spec[:virtual_type] = column.type.inspect if column.virtual? && column.sql_type != 'NUMBER'
+          spec[:limit]     = column.limit.inspect if column.limit != types[column.type][:limit] && column.type != :decimal
+          spec[:precision] = column.precision.inspect if !column.precision.nil?
+          spec[:scale]     = column.scale.inspect if !column.scale.nil?
+          spec[:null]      = 'false' if !column.null
+          spec[:as]        = column.virtual_column_data_default if column.virtual?
+          spec[:default]   = schema_default(column) if column.has_default? && !column.virtual?
+          spec[:comment]   = column.comment.inspect unless column.comment.nil?
+          spec.delete(:default) if spec[:default].nil?
+          spec
+        end
+
+        def migration_keys_with_oracle_enhanced
+          # TODO `& column_specs.map(&:keys).flatten` should be exetuted here
+          # return original method if not using 'OracleEnhanced'
+          return migration_keys_without_oracle_enhanced unless oracle_enhanced_adapter?
+
+          [:name, :limit, :precision, :scale, :default, :null, :as, :virtual_type, :comment]
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/{oracle_enhanced_connection.rb → oracle_enhanced/connection.rb}

@@ -109,11 +109,11 @@ end
 # if MRI or YARV
 if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby'
   ORACLE_ENHANCED_CONNECTION = :oci
-  require 'active_record/connection_adapters/oracle_enhanced_oci_connection'
+  require 'active_record/connection_adapters/oracle_enhanced/oci_connection'
 # if JRuby
 elsif RUBY_ENGINE == 'jruby'
   ORACLE_ENHANCED_CONNECTION = :jdbc
-  require 'active_record/connection_adapters/oracle_enhanced_jdbc_connection'
+  require 'active_record/connection_adapters/oracle_enhanced/jdbc_connection'
 else
   raise "Unsupported Ruby engine #{RUBY_ENGINE}"
 end