activerecord-oracle_enhanced-adapter 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d99c4b97f53eecf7ac93bda8a0227e2a70e26a46
-  data.tar.gz: e56c8c915a99a5aa4ac33dd677a88115a5b6c3a8
+  metadata.gz: e7bf4f74b9131f30ae47274a973191aea66e03d3
+  data.tar.gz: 2af0f28befbf925eb787298ee035658312d428e0
 SHA512:
-  metadata.gz: f67caad4031fb546f11244bbe6fe31d95c3a1d50459279b6d53edbba944eea48e53eb63b879755682a93166d4a10e7aa5171fa32f3901b7f787d2ec722f48275
-  data.tar.gz: 94067d976fee397e877c152f4d789525747b3dc344e8e5c321308046abb6a0c1df0d79d810254399b63e0cf5a7da81d733828f50c508bd4bd7d5ed1b9bb13698
+  metadata.gz: 0d85c334b48b66f131f75a1762f1db4e70c5d0908847f83261b4e36a7d91cbfdddb8d5dfeea74c41cf3a3abf969f4e7079cecc8727647346abd0685fbbfa4252
+  data.tar.gz: 6a47685852c79569b1e7bec9bbb4c20835009144ed5e10e9725d20cb4337da8ce1406836151dd89890b00729e958655fcdb5b0f6273f11e88c91ca8cec94ed69

data/History.md

@@ -1,3 +1,24 @@
+## 1.5.2 / 2014-01-24
+
+* Enhancements
+ * Supports Rails 4.1.0.beta1
+ * Support Rails 4 Database Tasks [#404]
+ * Create sequence when add primary_key column [#406]
+ * Move `SchemaCreation` to its own file [#381]
+ * Remove unused OracleEnhancedColumnDefinition [#382]
+ * Log bind variables after they were type casted [#385]
+ * Remove add_order_by_for_association_limiting! [#388]
+ * Support named savepoints [#389]
+ * Support self.extract_value_from_default [#395]
+ * Remove oracle_enhanced_core_ext.rb [#397]
+ * Remove unused to_sql_with_foreign_keys and lob_columns [#398]
+ * Remove ruby-oci8 v1 code [#405]
+
+* Bug Fix
+  * Move add_column_options! into SchemaCreation class [#384]
+  * Add options_include_default! [#384]
+  * Use OCI8::Metadata::Base#obj_link [#399]
+
 ## 1.5.1 / 2013-11-30
 
 * Enhancements

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

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.1"
+  s.version = "1.5.2"
 
   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{2013-11-30}
+  s.date = %q{2014-01-24}
   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.
 }
@@ -29,18 +29,17 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     "VERSION",
     "activerecord-oracle_enhanced-adapter.gemspec",
     "lib/active_record/connection_adapters/emulation/oracle_adapter.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced.rake",
     "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_core_ext.rb",
     "lib/active_record/connection_adapters/oracle_enhanced_cpk.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",
@@ -51,8 +50,8 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     "spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb",
-    "spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb",
+    "spec/active_record/connection_adapters/oracle_enhanced_database_tasks_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb",
@@ -71,8 +70,8 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     "spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb",
-    "spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb",
+    "spec/active_record/connection_adapters/oracle_enhanced_database_tasks_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb",

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -736,7 +736,10 @@ module ActiveRecord
       end
 
       def exec_query(sql, name = 'SQL', binds = [])
-        log(sql, name, binds) do
+        type_casted_binds = binds.map { |col, val|
+          [col, type_cast(val, col)]
+        }
+        log(sql, name, type_casted_binds) do
           cursor = nil
           cached = false
           if binds.empty?
@@ -938,15 +941,15 @@ module ActiveRecord
         @connection.autocommit = true
       end
 
-      def create_savepoint #:nodoc:
+      def create_savepoint(name = current_savepoint_name) #:nodoc:
         execute("SAVEPOINT #{current_savepoint_name}")
       end
 
-      def rollback_to_savepoint #:nodoc:
+      def rollback_to_savepoint(name = current_savepoint_name) #:nodoc:
         execute("ROLLBACK TO #{current_savepoint_name}")
       end
 
-      def release_savepoint #:nodoc:
+      def release_savepoint(name = current_savepoint_name) #:nodoc:
         # there is no RELEASE SAVEPOINT statement in Oracle
       end
 
@@ -1332,6 +1335,13 @@ module ActiveRecord
       def pk_and_sequence_for_without_cache(table_name, owner=nil, desc_table_name=nil, db_link=nil) #:nodoc:
         (owner, desc_table_name, db_link) = @connection.describe(table_name) unless owner
 
+        seqs = select_values(<<-SQL.strip.gsub(/\s+/, ' '), 'Sequence')
+          select us.sequence_name
+          from all_sequences#{db_link} us
+          where us.sequence_owner = '#{owner}'
+          and us.sequence_name = '#{desc_table_name}_SEQ'
+        SQL
+
         # changed back from user_constraints to all_constraints for consistency
         pks = select_values(<<-SQL.strip.gsub(/\s+/, ' '), 'Primary Key')
           SELECT cc.column_name
@@ -1344,7 +1354,8 @@ module ActiveRecord
         SQL
 
         # only support single column keys
-        pks.size == 1 ? [oracle_downcase(pks.first), nil] : nil
+        pks.size == 1 ? [oracle_downcase(pks.first),
+                         oracle_downcase(seqs.first)] : nil
       end
 
       # Returns just a table's primary key
@@ -1394,8 +1405,8 @@ module ActiveRecord
           s = s.to_sql unless s.is_a?(String)
           # remove any ASC/DESC modifiers
           s.gsub(/\s+(ASC|DESC)\s*?/i, '')
-          }.reject(&:blank?).map.with_index { |column,i| 
-            "FIRST_VALUE(#{column}) OVER (PARTITION BY #{columns} ORDER BY #{column}) AS alias_#{i}__" 
+          }.reject(&:blank?).map.with_index { |column,i|
+            "FIRST_VALUE(#{column}) OVER (PARTITION BY #{columns} ORDER BY #{column}) AS alias_#{i}__"
           }
           [super, *order_columns].join(', ')
       end
@@ -1404,21 +1415,6 @@ module ActiveRecord
         select_value("SELECT temporary FROM user_tables WHERE table_name = '#{table_name.upcase}'") == 'Y'
       end
 
-      # ORDER BY clause for the passed order option.
-      #
-      # Uses column aliases as defined by #distinct.
-      #
-      # In Rails 3.x this method is moved to Arel
-      def add_order_by_for_association_limiting!(sql, options) #:nodoc:
-        return sql if options[:order].blank?
-
-        order = options[:order].split(',').collect { |s| s.strip }.reject(&:blank?)
-        order.map! {|s| $1 if s =~ / (.*)/}
-        order = order.zip((0...order.size).to_a).map { |s,i| "alias_#{i}__ #{s}" }.join(', ')
-
-        sql << " ORDER BY #{order}"
-      end
-
       # construct additional wrapper subquery if select.offset is used to avoid generation of invalid subquery
       # ... IN ( SELECT * FROM ( SELECT raw_sql_.*, rownum raw_rnum_ FROM ( ... ) raw_sql_ ) WHERE raw_rnum_ > ... )
       def join_to_update(update, select) #:nodoc:
@@ -1551,9 +1547,6 @@ require 'active_record/connection_adapters/oracle_enhanced_schema_dumper'
 # Implementation of structure dump
 require 'active_record/connection_adapters/oracle_enhanced_structure_dump'
 
-# Add BigDecimal#to_d, Fixnum#to_d and Bignum#to_d methods if not already present
-require 'active_record/connection_adapters/oracle_enhanced_core_ext'
-
 require 'active_record/connection_adapters/oracle_enhanced_version'
 
 module ActiveRecord
@@ -1563,85 +1556,5 @@ end
 # Patches and enhancements for column dumper
 require 'active_record/connection_adapters/oracle_enhanced_column_dumper'
 
-module ActiveRecord
-  module ConnectionAdapters
-    class OracleEnhancedAdapter < AbstractAdapter
-      class SchemaCreation < AbstractAdapter::SchemaCreation
-        private
-
-        def visit_ColumnDefinition(o)
-          if o.type.to_sym == :virtual
-            sql_type = type_to_sql(o.default[:type], o.limit, o.precision, o.scale) if o.default[:type]
-            "#{quote_column_name(o.name)} #{sql_type} AS (#{o.default[:as]})"
-          else
-            super
-          end
-        end
-
-        def visit_TableDefinition(o)
-          tablespace = tablespace_for(:table, o.options[:tablespace])
-          create_sql = "CREATE#{' GLOBAL TEMPORARY' if o.temporary} TABLE "
-          create_sql << "#{quote_table_name(o.name)} ("
-          create_sql << o.columns.map { |c| accept c }.join(', ')
-          create_sql << ")"
-          unless o.temporary
-            create_sql << " ORGANIZATION #{o.options[:organization]}" if o.options[:organization]
-            create_sql << "#{tablespace}"
-          end
-          create_sql << " #{o.options[:options]}"
-          create_sql
-        end
-
-        def tablespace_for(obj_type, tablespace_option, table_name=nil, column_name=nil)
-          tablespace_sql = ''
-          if tablespace = (tablespace_option || default_tablespace_for(obj_type))
-            tablespace_sql << if [:blob, :clob].include?(obj_type.to_sym)
-              " LOB (#{quote_column_name(column_name)}) STORE AS #{column_name.to_s[0..10]}_#{table_name.to_s[0..14]}_ls (TABLESPACE #{tablespace})"
-            else
-              " TABLESPACE #{tablespace}"
-            end
-          end
-          tablespace_sql
-        end
-
-        def default_tablespace_for(type)
-          (ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[type] || 
-           ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[native_database_types[type][:name]]) rescue nil
-        end
-
-        def foreign_key_definition(to_table, options = {})
-          @conn.foreign_key_definition(to_table, options)
-        end
-
-      end
-      
-      def schema_creation
-          SchemaCreation.new self
-      end
-    end
-
-    def add_column_options!(sql, options)
-      type = options[:type] || ((column = options[:column]) && column.type)
-      type = type && type.to_sym
-      # handle case of defaults for CLOB columns, which would otherwise get "quoted" incorrectly
-      if options_include_default?(options)
-        if type == :text
-          sql << " DEFAULT #{quote(options[:default])}"
-        else
-          # from abstract adapter
-          sql << " DEFAULT #{quote(options[:default], options[:column])}"
-        end
-      end
-      # must explicitly add NULL or NOT NULL to allow change_column to work on migrations
-      if options[:null] == false
-        sql << " NOT NULL"
-      elsif options[:null] == true
-        sql << " NULL" unless type == :primary_key
-      end
-      # add AS expression for virtual columns
-      if options[:as].present?
-        sql << " AS (#{options[:as]})"
-      end
-    end
-  end
-end
+# Moved SchemaCreation class
+require 'active_record/connection_adapters/oracle_enhanced_schema_creation'

data/lib/active_record/connection_adapters/oracle_enhanced_column.rb

@@ -10,8 +10,12 @@ module ActiveRecord
         @virtual = virtual
         @virtual_column_data_default = default.inspect if virtual
         @returning_id = returning_id
-        default = nil if virtual
-        super(name, default, sql_type, null)
+        if virtual
+          default_value = nil
+        else
+          default_value = self.class.extract_value_from_default(default)
+        end
+        super(name, default_value, 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'
@@ -114,6 +118,15 @@ module ActiveRecord
         end
       end
 
+      def self.extract_value_from_default(default)
+        case default
+          when String
+            default.gsub(/''/, "'")
+          else
+            default
+        end
+      end
+
       def guess_date_or_time(value)
         value.respond_to?(:hour) && (value.hour == 0 and value.min == 0 and value.sec == 0) ?
           Date.new(value.year, value.month, value.day) : value

data/lib/active_record/connection_adapters/oracle_enhanced_database_tasks.rb

@@ -0,0 +1,61 @@
+module ActiveRecord
+  module ConnectionAdapters
+    class OracleEnhancedAdapter
+      class DatabaseTasks
+        delegate :connection, :establish_connection, :to => ActiveRecord::Base
+
+        def initialize(config)
+          @config = config
+        end
+
+        def create
+          print "Please provide the SYSTEM password for your Oracle installation\n>"
+          system_password = $stdin.gets.strip
+          establish_connection(@config.merge('username' => 'SYSTEM', 'password' => system_password))
+          begin
+            connection.execute "CREATE USER #{@config['username']} IDENTIFIED BY #{@config['password']}"
+          rescue => e
+            if e.message =~ /ORA-01920/ # user name conflicts with another user or role name
+              connection.execute "ALTER USER #{@config['username']} IDENTIFIED BY #{@config['password']}"
+            else
+              raise e
+            end
+          end
+          connection.execute "GRANT unlimited tablespace TO #{@config['username']}"
+          connection.execute "GRANT create session TO #{@config['username']}"
+          connection.execute "GRANT create table TO #{@config['username']}"
+          connection.execute "GRANT create sequence TO #{@config['username']}"
+        end
+
+        def drop
+          establish_connection(@config)
+          connection.execute_structure_dump(connection.full_drop)
+        end
+
+        def purge
+          drop
+          connection.execute('PURGE RECYCLEBIN') rescue nil
+        end
+
+        def structure_dump(filename)
+          establish_connection(@config)
+          File.open(filename, 'w:utf-8') { |f| f << connection.structure_dump }
+          if connection.supports_migrations?
+            File.open(filename, 'a') { |f| f << connection.dump_schema_information }
+          end
+          if @config['structure_dump'] == 'db_stored_code'
+             File.open(filename, 'a') { |f| f << connection.structure_dump_db_stored_code }
+          end
+        end
+
+        def structure_load(filename)
+          establish_connection(@config)
+          connection.execute_structure_dump(File.read(filename))
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Tasks::DatabaseTasks.register_task(/(oci|oracle)/, ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter::DatabaseTasks)
+

data/lib/active_record/connection_adapters/oracle_enhanced_oci_connection.rb

@@ -254,9 +254,7 @@ module ActiveRecord
           else
             value
           end
-        # ruby-oci8 1.0 returns OraDate
-        # ruby-oci8 2.0 returns Time or DateTime
-        when OraDate, Time, DateTime
+        when Time, DateTime
           if OracleEnhancedAdapter.emulate_dates && date_without_time?(value)
             value.to_date
           else
@@ -353,66 +351,15 @@ end
 
 class OCI8 #:nodoc:
 
-  class Cursor #:nodoc:
-    if method_defined? :define_a_column
-      # This OCI8 patch is required with the ruby-oci8 1.0.x or lower.
-      # Set OCI8::BindType::Mapping[] to change the column type
-      # when using ruby-oci8 2.0.
-
-      alias :enhanced_define_a_column_pre_ar :define_a_column
-      def define_a_column(i)
-        case do_ocicall(@ctx) { @parms[i - 1].attrGet(OCI_ATTR_DATA_TYPE) }
-        when 8;   @stmt.defineByPos(i, String, 65535) # Read LONG values
-        when 187; @stmt.defineByPos(i, OraDate) # Read TIMESTAMP values
-        when 108
-          if @parms[i - 1].attrGet(OCI_ATTR_TYPE_NAME) == 'XMLTYPE'
-            @stmt.defineByPos(i, String, 65535)
-          else
-            raise 'unsupported datatype'
-          end
-        else enhanced_define_a_column_pre_ar i
-        end
-      end
-    end
-  end
-
-  if OCI8.public_method_defined?(:describe_table)
-    # ruby-oci8 2.0 or upper
-
-    def describe(name)
-      info = describe_table(name.to_s)
-      raise %Q{"DESC #{name}" failed} if info.nil?
+  def describe(name)
+    info = describe_table(name.to_s)
+    raise %Q{"DESC #{name}" failed} if info.nil?
+    if info.respond_to? :obj_link and info.obj_link
+      [info.obj_schema, info.obj_name, '@' + info.obj_link]
+    else
       [info.obj_schema, info.obj_name]
     end
-  else
-    # ruby-oci8 1.0.x or lower
-
-    # missing constant from oci8 < 0.1.14
-    OCI_PTYPE_UNK = 0 unless defined?(OCI_PTYPE_UNK)
-
-    # Uses the describeAny OCI call to find the target owner and table_name
-    # indicated by +name+, parsing through synonynms as necessary. Returns
-    # an array of [owner, table_name].
-    def describe(name)
-      @desc ||= @@env.alloc(OCIDescribe)
-      @desc.attrSet(OCI_ATTR_DESC_PUBLIC, -1) if VERSION >= '0.1.14'
-      do_ocicall(@ctx) { @desc.describeAny(@svc, name.to_s, OCI_PTYPE_UNK) } rescue raise %Q{"DESC #{name}" failed; does it exist?}
-      info = @desc.attrGet(OCI_ATTR_PARAM)
-
-      case info.attrGet(OCI_ATTR_PTYPE)
-      when OCI_PTYPE_TABLE, OCI_PTYPE_VIEW
-        owner      = info.attrGet(OCI_ATTR_OBJ_SCHEMA)
-        table_name = info.attrGet(OCI_ATTR_OBJ_NAME)
-        [owner, table_name]
-      when OCI_PTYPE_SYN
-        schema = info.attrGet(OCI_ATTR_SCHEMA_NAME)
-        name   = info.attrGet(OCI_ATTR_NAME)
-        describe(schema + '.' + name)
-      else raise %Q{"DESC #{name}" failed; not a table or view.}
-      end
-    end
   end
-
 end
 
 # The OCI8AutoRecover class enhances the OCI8 driver with auto-recover and
@@ -490,12 +437,5 @@ class OCI8EnhancedAutoRecover < DelegateClass(OCI8) #:nodoc:
     end
   end
 
-  # otherwise not working in Ruby 1.9.1
-  if RUBY_VERSION =~ /^1\.9/
-    def describe(name) #:nodoc:
-      @connection.describe(name)
-    end
-  end
-
 end
 #:startdoc:

data/lib/active_record/connection_adapters/oracle_enhanced_schema_creation.rb

@@ -0,0 +1,89 @@
+module ActiveRecord
+  module ConnectionAdapters
+    class OracleEnhancedAdapter < AbstractAdapter
+      class SchemaCreation < AbstractAdapter::SchemaCreation
+        private
+
+        def visit_ColumnDefinition(o)
+          if o.type.to_sym == :virtual
+            sql_type = type_to_sql(o.default[:type], o.limit, o.precision, o.scale) if o.default[:type]
+            "#{quote_column_name(o.name)} #{sql_type} AS (#{o.default[:as]})"
+          else
+            super
+          end
+        end
+
+        def visit_TableDefinition(o)
+          tablespace = tablespace_for(:table, o.options[:tablespace])
+          create_sql = "CREATE#{' GLOBAL TEMPORARY' if o.temporary} TABLE "
+          create_sql << "#{quote_table_name(o.name)} ("
+          create_sql << o.columns.map { |c| accept c }.join(', ')
+          create_sql << ")"
+          unless o.temporary
+            create_sql << " ORGANIZATION #{o.options[:organization]}" if o.options[:organization]
+            create_sql << "#{tablespace}"
+          end
+          create_sql << " #{o.options[:options]}"
+          create_sql
+        end
+
+        def tablespace_for(obj_type, tablespace_option, table_name=nil, column_name=nil)
+          tablespace_sql = ''
+          if tablespace = (tablespace_option || default_tablespace_for(obj_type))
+            tablespace_sql << if [:blob, :clob].include?(obj_type.to_sym)
+              " LOB (#{quote_column_name(column_name)}) STORE AS #{column_name.to_s[0..10]}_#{table_name.to_s[0..14]}_ls (TABLESPACE #{tablespace})"
+            else
+              " TABLESPACE #{tablespace}"
+            end
+          end
+          tablespace_sql
+        end
+
+        def default_tablespace_for(type)
+          (ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[type] || 
+           ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[native_database_types[type][:name]]) rescue nil
+        end
+
+        def foreign_key_definition(to_table, options = {})
+          @conn.foreign_key_definition(to_table, options)
+        end
+
+        def add_column_options!(sql, options)
+          type = options[:type] || ((column = options[:column]) && column.type)
+          type = type && type.to_sym
+          # handle case of defaults for CLOB columns, which would otherwise get "quoted" incorrectly
+          if options_include_default?(options)
+            if type == :text
+              sql << " DEFAULT #{@conn.quote(options[:default])}"
+            else
+              # from abstract adapter
+              sql << " DEFAULT #{@conn.quote(options[:default], options[:column])}"
+            end
+          end
+          # must explicitly add NULL or NOT NULL to allow change_column to work on migrations
+          if options[:null] == false
+            sql << " NOT NULL"
+          elsif options[:null] == true
+            sql << " NULL" unless type == :primary_key
+          end
+          # add AS expression for virtual columns
+          if options[:as].present?
+            sql << " AS (#{options[:as]})"
+          end
+        end
+
+        # This method does not exist in SchemaCreation at Rails 4.0
+        # It can be removed only when Oracle enhanced adapter supports Rails 4.1 and higher
+        def options_include_default?(options)
+          options.include?(:default) && !(options[:null] == false && options[:default].nil?)
+        end
+
+      end
+      
+      def schema_creation
+          SchemaCreation.new self
+      end
+
+    end
+  end
+end

data/lib/active_record/connection_adapters/oracle_enhanced_schema_definitions.rb

@@ -10,38 +10,12 @@ module ActiveRecord
       :tablespace, :columns) #:nodoc:
     end
 
-    module OracleEnhancedColumnDefinition
-       def self.included(base) #:nodoc:
-        base.class_eval do
-          #alias_method_chain :to_sql, :virtual_columns
-          #alias to_s :to_sql
-        end
-       end
-
-      def to_sql_with_virtual_columns
-        if type == :virtual
-          sql_type = base.type_to_sql(default[:type], limit, precision, scale) if default[:type]
-          "#{base.quote_column_name(name)} #{sql_type} AS (#{default[:as]})"
-        else
-          to_sql_without_virtual_columns
-        end
-      end
-
-      def lob?
-        ['CLOB', 'BLOB'].include?(sql_type)
-      end
-    end
-
     module OracleEnhancedSchemaDefinitions #:nodoc:
       def self.included(base)
         base::TableDefinition.class_eval do
           include OracleEnhancedTableDefinition
         end
 
-        base::ColumnDefinition.class_eval do
-          include OracleEnhancedColumnDefinition
-        end
-        
         # Available starting from ActiveRecord 2.1
         base::Table.class_eval do
           include OracleEnhancedTable
@@ -60,8 +34,6 @@ module ActiveRecord
       def self.included(base) #:nodoc:
         base.class_eval do
           alias_method_chain :references, :foreign_keys
-          #alias_method_chain :to_sql, :foreign_keys
-
           alias_method_chain :column, :virtual_columns
         end
       end
@@ -142,16 +114,6 @@ module ActiveRecord
         end
       end
     
-      def to_sql_with_foreign_keys #:nodoc:
-        sql = to_sql_without_foreign_keys
-        sql << ', ' << (foreign_keys * ', ') unless foreign_keys.blank?
-        sql
-      end
-
-      def lob_columns
-        columns.select(&:lob?)
-      end
-    
       def foreign_keys
         @foreign_keys ||= []
       end

data/lib/active_record/connection_adapters/oracle_enhanced_schema_statements.rb

@@ -278,6 +278,8 @@ module ActiveRecord
         add_column_sql << tablespace_for((type_to_sql(type).downcase.to_sym), nil, table_name, column_name) if type
 
         execute(add_column_sql)
+
+        create_sequence_and_trigger(table_name, options) if type && type.to_sym == :primary_key
       ensure
         clear_table_columns_cache(table_name)
       end

data/lib/active_record/connection_adapters/oracle_enhanced_structure_dump.rb

@@ -149,17 +149,17 @@ module ActiveRecord #:nodoc:
                       AND name NOT LIKE 'BIN$%'
                       AND owner = SYS_CONTEXT('userenv', 'session_user') ORDER BY type").each do |source|
           ddl = "CREATE OR REPLACE   \n"
-          lines = select_all(%Q{
+          select_all(%Q{
                   SELECT text
                     FROM all_source
                    WHERE name = '#{source['name']}'
                      AND type = '#{source['type']}'
                      AND owner = SYS_CONTEXT('userenv', 'session_user')
                    ORDER BY line
-                }).map do |row|
+                }).each do |row|
             ddl << row['text']
           end
-          ddl << ";" unless ddl.strip[-1,1] == ";"
+          ddl << ";" unless ddl.strip[-1,1] == ';'
           structure << ddl
         end
 
@@ -240,7 +240,7 @@ module ActiveRecord #:nodoc:
 
       def execute_structure_dump(string)
         string.split(STATEMENT_TOKEN).each do |ddl|
-          ddl.chop! if ddl.last == ";"
+          ddl.chop! if ddl[-1,1] == ';'
           execute(ddl) unless ddl.blank?
         end
       end

data/lib/activerecord-oracle_enhanced-adapter.rb

@@ -5,7 +5,7 @@ if defined?(::Rails::Railtie)
     module ConnectionAdapters
       class OracleEnhancedRailtie < ::Rails::Railtie
         rake_tasks do
-          load 'active_record/connection_adapters/oracle_enhanced.rake'
+          load 'active_record/connection_adapters/oracle_enhanced_database_tasks.rb'
         end
 
         ActiveSupport.on_load(:active_record) do
@@ -22,4 +22,4 @@ if defined?(::Rails::Railtie)
     end
   end
 
-end
+end

data/spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb

@@ -174,6 +174,8 @@ describe "OracleEnhancedAdapter context index" do
   describe "on multiple tables" do
     before(:all) do
       @conn = ActiveRecord::Base.connection
+      @oracle12c = !! @conn.select_value(
+                      "select * from product_component_version where product like 'Oracle%' and to_number(substr(version,1,2)) = 12")
       create_tables
       class ::Post < ActiveRecord::Base
         has_many :comments, dependent: :destroy
@@ -192,10 +194,13 @@ describe "OracleEnhancedAdapter context index" do
     end
 
     after(:each) do
+      @conn.remove_context_index :posts, name: 'post_and_comments_index' rescue nil
+      @conn.remove_context_index :posts, index_column: :all_text rescue nil
       Post.destroy_all
     end
 
     it "should create multiple table index with specified main index column" do
+      pending "It always fails when Oracle 12c 12.1.0 used." if @oracle12c
       @conn.add_context_index :posts,
         [:title, :body,
         # specify aliases always with AS keyword
@@ -210,10 +215,10 @@ describe "OracleEnhancedAdapter context index" do
       ["aaa", "bbb", "ccc", "ddd", "eee", "fff"].each do |word|
         Post.contains(:all_text, word).to_a.should == [@post]
       end
-      @conn.remove_context_index :posts, name: 'post_and_comments_index'
     end
 
     it "should create multiple table index with specified main index column (when subquery has newlines)" do
+      pending "It always fails when Oracle 12c 12.1.0 used." if @oracle12c
       @conn.add_context_index :posts,
         [:title, :body,
          # specify aliases always with AS keyword
@@ -232,7 +237,6 @@ describe "OracleEnhancedAdapter context index" do
       ["aaa", "bbb", "ccc", "ddd", "eee", "fff"].each do |word|
         Post.contains(:all_text, word).to_a.should == [@post]
       end
-      @conn.remove_context_index :posts, name: 'post_and_comments_index'
     end
 
     it "should find by search term within specified field" do
@@ -252,7 +256,6 @@ describe "OracleEnhancedAdapter context index" do
       Post.contains(:all_text, "ccc within comment_body").to_a.should be_empty
       Post.contains(:all_text, "ddd within comment_body").to_a.should == [@post]
       Post.contains(:all_text, "ddd within comment_author").to_a.should be_empty
-      @conn.remove_context_index :posts, index_column: :all_text
     end
 
   end

data/spec/active_record/connection_adapters/oracle_enhanced_database_tasks_spec.rb

@@ -0,0 +1,89 @@
+require 'spec_helper'
+require 'active_record/connection_adapters/oracle_enhanced_database_tasks'
+require 'stringio'
+require 'tempfile'
+
+describe "Oracle Enhanced adapter database tasks" do
+  let(:config) { CONNECTION_PARAMS.with_indifferent_access }
+
+  describe "create" do
+    let(:new_user_config) { config.merge({username: "oracle_enhanced_test_user"}) }
+    before do
+      fake_terminal(SYSTEM_CONNECTION_PARAMS[:password]) do
+        ActiveRecord::Tasks::DatabaseTasks.create(new_user_config)
+      end
+    end
+    it "creates user" do
+      query = "SELECT COUNT(*) FROM dba_users WHERE UPPER(username) = '#{new_user_config[:username].upcase}'"
+      ActiveRecord::Base.connection.select_value(query).should == 1
+    end
+    after do
+      ActiveRecord::Base.connection.execute("DROP USER #{new_user_config[:username]}");
+    end
+
+    def fake_terminal(input)
+      $stdin = StringIO.new
+      $stdout = StringIO.new
+      $stdin.puts(input)
+      $stdin.rewind
+      yield
+    ensure
+      $stdin = STDIN
+      $stdout = STDOUT
+    end
+  end
+
+  context "with test table" do
+    before do
+      ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+      ActiveRecord::Base.connection.execute "CREATE TABLE test_posts (name VARCHAR2(20))"
+    end
+
+    describe "drop" do
+      before { ActiveRecord::Tasks::DatabaseTasks.drop(config) }
+      it "drops all tables" do
+        ActiveRecord::Base.connection.table_exists?(:test_posts).should be_false
+      end
+    end
+
+    describe "purge" do
+      before { ActiveRecord::Tasks::DatabaseTasks.purge(config) }
+      it "drops all tables" do
+        ActiveRecord::Base.connection.table_exists?(:test_posts).should be_false
+        ActiveRecord::Base.connection.select_value("SELECT COUNT(*) FROM RECYCLEBIN").should == 0
+      end
+    end
+
+    describe "structure" do
+      let(:temp_file) { Tempfile.new(["oracle_enhanced", ".sql"]).path }
+      before { ActiveRecord::SchemaMigration.create_table }
+
+      describe "structure_dump" do
+        before { ActiveRecord::Tasks::DatabaseTasks.structure_dump(config, temp_file) }
+        it "dumps the database structure to a file" do
+          contents = File.read(temp_file)
+          contents.should include('CREATE TABLE "TEST_POSTS"')
+        end
+      end
+
+      describe "structure_load" do
+        before do
+          ActiveRecord::Tasks::DatabaseTasks.structure_dump(config, temp_file)
+          ActiveRecord::Tasks::DatabaseTasks.drop(config)
+          ActiveRecord::Tasks::DatabaseTasks.structure_load(config, temp_file)
+        end
+        it "loads the database structure from a file" do
+          ActiveRecord::Base.connection.table_exists?(:test_posts).should be_true
+        end
+      end
+
+      after do
+        File.delete(temp_file)
+        ActiveRecord::SchemaMigration.drop_table
+      end
+    end
+
+    after { ActiveRecord::Base.connection.execute "DROP TABLE test_posts" rescue nil }
+  end
+end
+

data/spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb

@@ -10,6 +10,25 @@ describe "OracleEnhancedAdapter schema definition" do
       "select * from product_component_version where product like 'Oracle%' and to_number(substr(version,1,2)) >= 11")
   end
 
+  describe 'option to create sequence when adding a column' do
+    before do
+      @conn = ActiveRecord::Base.connection
+      schema_define do
+        create_table :keyboards, :force => true, :id  => false do |t|
+          t.string      :name
+        end
+        add_column :keyboards, :id, :primary_key
+      end
+      class ::Keyboard < ActiveRecord::Base; end
+    end
+
+    it 'creates a sequence when adding a column with create_sequence = true' do
+      _, sequence_name = ActiveRecord::Base.connection.pk_and_sequence_for_without_cache(:keyboards)
+
+      sequence_name.should == Keyboard.sequence_name
+    end
+  end
+
   describe "table and sequence creation with non-default primary key" do
 
     before(:all) do

metadata

@@ -1,195 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-30 00:00:00.000000000 Z
+date: 2014-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   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: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: journey
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord-deprecated_finders
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-plsql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: ruby-oci8
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |
@@ -201,7 +201,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .rspec
+- ".rspec"
 - Gemfile
 - History.md
 - License.txt
@@ -211,18 +211,18 @@ files:
 - VERSION
 - activerecord-oracle_enhanced-adapter.gemspec
 - lib/active_record/connection_adapters/emulation/oracle_adapter.rb
-- lib/active_record/connection_adapters/oracle_enhanced.rake
 - 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_core_ext.rb
 - lib/active_record/connection_adapters/oracle_enhanced_cpk.rb
+- lib/active_record/connection_adapters/oracle_enhanced_database_tasks.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
@@ -233,9 +233,9 @@ files:
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_database_tasks_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_emulate_oracle_adapter_spec.rb
@@ -254,17 +254,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Oracle enhanced adapter for ActiveRecord

data/lib/active_record/connection_adapters/oracle_enhanced.rake

@@ -1,105 +0,0 @@
-# implementation idea taken from JDBC adapter
-# added possibility to execute previously defined task (passed as argument to task block)
-def redefine_task(*args, &block)
-  task_name = Hash === args.first ? args.first.keys[0] : args.first
-  existing_task = Rake.application.lookup task_name
-  existing_actions = nil
-  if existing_task
-    class << existing_task; public :instance_variable_set, :instance_variable_get; end
-    existing_task.instance_variable_set "@prerequisites", FileList[]
-    existing_actions = existing_task.instance_variable_get "@actions"
-    existing_task.instance_variable_set "@actions", []
-  end
-  task(*args) do
-    block.call(existing_actions)
-  end
-end
-
-# Creates database user with db:create
-if defined?(create_database) == 'method'
-  def create_database_with_oracle_enhanced(config)
-    if config['adapter'] == 'oracle_enhanced'
-      print "Please provide the SYSTEM password for your oracle installation\n>"
-      system_password = $stdin.gets.strip
-      ActiveRecord::Base.establish_connection(config.merge('username' => 'SYSTEM', 'password' => system_password))
-      begin
-        ActiveRecord::Base.connection.execute "CREATE USER #{config['username']} IDENTIFIED BY #{config['password']}"
-      rescue => e
-        if e.message =~ /ORA-01920/ # user name conflicts with another user or role name
-          ActiveRecord::Base.connection.execute "ALTER USER #{config['username']} IDENTIFIED BY #{config['password']}"
-        else
-          raise e
-        end
-      end
-      ActiveRecord::Base.connection.execute "GRANT unlimited tablespace TO #{config['username']}"
-      ActiveRecord::Base.connection.execute "GRANT create session TO #{config['username']}"
-      ActiveRecord::Base.connection.execute "GRANT create table TO #{config['username']}"
-      ActiveRecord::Base.connection.execute "GRANT create sequence TO #{config['username']}"
-    else
-      create_database_without_oracle_enhanced(config)
-    end
-  end
-  alias :create_database_without_oracle_enhanced :create_database
-  alias :create_database :create_database_with_oracle_enhanced
-end
-
-# Drops database user with db:drop
-if defined?(drop_database) == 'method'
-  def drop_database_with_oracle_enhanced(config)
-    if config['adapter'] == 'oracle_enhanced'
-      ActiveRecord::Base.establish_connection(config)
-      ActiveRecord::Base.connection.execute_structure_dump(ActiveRecord::Base.connection.full_drop)
-    else
-      drop_database_without_oracle_enhanced(config)
-    end
-  end
-  alias :drop_database_without_oracle_enhanced :drop_database
-  alias :drop_database :drop_database_with_oracle_enhanced
-end
-
-namespace :db do
-
-  namespace :structure do
-    redefine_task :dump => :environment do |existing_actions|
-      abcs = ActiveRecord::Base.configurations
-      rails_env = defined?(Rails.env) ? Rails.env : RAILS_ENV
-      if abcs[rails_env]['adapter'] == 'oracle_enhanced'
-        ActiveRecord::Base.establish_connection(abcs[rails_env])
-        File.open("db/#{rails_env}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
-        if ActiveRecord::Base.connection.supports_migrations?
-          File.open("db/#{rails_env}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information }
-        end
-        if abcs[rails_env]['structure_dump'] == "db_stored_code"
-           File.open("db/#{rails_env}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.structure_dump_db_stored_code }
-        end
-      else
-        Array(existing_actions).each{|action| action.call}
-      end
-    end
-  end
-
-  namespace :test do
-    redefine_task :clone_structure => [ "db:structure:dump", "db:test:purge" ] do |existing_actions|
-      abcs = ActiveRecord::Base.configurations
-      rails_env = defined?(Rails.env) ? Rails.env : RAILS_ENV
-      if abcs[rails_env]['adapter'] == 'oracle_enhanced' && abcs['test']['adapter'] == 'oracle_enhanced'
-        ActiveRecord::Base.establish_connection(:test)
-        ActiveRecord::Base.connection.execute_structure_dump(File.read("db/#{rails_env}_structure.sql"))
-      else
-        Array(existing_actions).each{|action| action.call}
-      end
-    end
-
-    redefine_task :purge => :environment do |existing_actions|
-      abcs = ActiveRecord::Base.configurations
-      if abcs['test']['adapter'] == 'oracle_enhanced'
-        ActiveRecord::Base.establish_connection(:test)
-        ActiveRecord::Base.connection.execute_structure_dump(ActiveRecord::Base.connection.full_drop)
-        ActiveRecord::Base.connection.execute("PURGE RECYCLEBIN") rescue nil
-      else
-        Array(existing_actions).each{|action| action.call}
-      end
-    end
-
-  end
-end

data/lib/active_record/connection_adapters/oracle_enhanced_core_ext.rb

@@ -1,25 +0,0 @@
-require "bigdecimal"
-
-unless BigDecimal.method_defined?(:to_d)
-  BigDecimal.class_eval do
-    def to_d #:nodoc:
-      self
-    end
-  end
-end
-
-unless Bignum.method_defined?(:to_d)
-  Bignum.class_eval do
-    def to_d #:nodoc:
-      BigDecimal.new(self.to_s)
-    end
-  end
-end
-
-unless Fixnum.method_defined?(:to_d)
-  Fixnum.class_eval do
-    def to_d #:nodoc:
-      BigDecimal.new(self.to_s)
-    end
-  end
-end

data/spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb

@@ -1,19 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe "OracleEnhancedAdapter to_d method" do
-  it "BigDecimal#to_d returns the same decimal number" do
-    d = BigDecimal.new("12345678901234567890.0123456789")
-    d.to_d.should == d
-  end
-  
-  it "Bignum#to_d translates large integer to decimal" do
-    n = 12345678901234567890
-    n.to_d.should == BigDecimal.new(n.to_s)
-  end
-
-  it "Fixnum#to_d translates small integer to decimal" do
-    n = 123456
-    n.to_d.should == BigDecimal.new(n.to_s)
-  end
-end