pmacs-activerecord-oracle_enhanced-adapter 1.4.2.rc1 → 1.5.5.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 55fb63832be212bdf12fc8a8e9ef24b385d2dd71
+  data.tar.gz: bd81a44bc261832f358a0eb1ef297911f73110a1
+SHA512:
+  metadata.gz: 8122b64d689f4abf8143f73fa141da3f7f461b3d31f56845f3d1a5916bc9c1db7b0d7f6a9b0a3aedc0af4deea95f1d08bf81b8814da356d37810f03438608ce1
+  data.tar.gz: 79beb44492fd15f7e122e91623fcb09c6bfef9b33038a92ef9599dd9b2b4783db375d1b2b0d6d11868ad64b48a1de35e3bd6d11133546a747c0a41a3de80d763

data/Gemfile

@@ -1,52 +1,23 @@
 source 'http://rubygems.org'
 
 group :development do
-  gem 'jeweler', '~> 1.5.1'
+  gem 'jeweler', '~> 1.8'
   gem 'rspec', '~> 2.4'
   gem 'rdoc'
 
-  if ENV['RAILS_GEM_VERSION']
-    gem 'activerecord', "=#{ENV['RAILS_GEM_VERSION']}"
-    gem 'actionpack', "=#{ENV['RAILS_GEM_VERSION']}"
-    gem 'activesupport', "=#{ENV['RAILS_GEM_VERSION']}"
-    case ENV['RAILS_GEM_VERSION']
-    when /^2.0/
-      gem 'composite_primary_keys', '=0.9.93'
-    when /^2.1/
-      gem 'composite_primary_keys', '=1.0.8'
-    when /^2.2/
-      gem 'composite_primary_keys', '=2.2.2'
-    when /^2.3.3/
-      gem 'composite_primary_keys', '=2.3.2'
-    when /^3/
-      gem 'railties', "=#{ENV['RAILS_GEM_VERSION']}"
-    end
-  else
-    %w(activerecord activemodel activesupport actionpack railties).each do |gem_name|
-      if ENV['RAILS_GEM_PATH']
-        gem gem_name, :path => File.join(ENV['RAILS_GEM_PATH'], gem_name)
-      else
-        gem gem_name, :git => "git://github.com/rails/rails"
-      end
-    end
+  gem 'activerecord',   github: 'rails/rails'
+  gem 'activemodel',    github: 'rails/rails'
+  gem 'activesupport',  github: 'rails/rails'
+  gem 'actionpack',     github: 'rails/rails'
+  gem 'railties',       github: 'rails/rails'
 
-    if ENV['AREL_GEM_PATH']
-      gem 'arel', :path => ENV['AREL_GEM_PATH']
-    else
-      gem 'arel', :git => "git://github.com/rails/arel"
-    end
+  gem 'arel',           github: 'rails/arel'
+  gem 'journey',        github: 'rails/journey'
 
-    if ENV['JOURNEY_GEM_PATH']
-      gem 'journey', :path => ENV['JOURNEY_GEM_PATH']
-    else
-      gem "journey", :git => "git://github.com/rails/journey"
-    end
-  end
-
-  gem 'ruby-plsql', '>=0.4.4'
+  gem 'activerecord-deprecated_finders'
+  gem 'ruby-plsql', '>=0.5.0'
 
   platforms :ruby do
-    gem 'ruby-oci8', '>=2.0.4'
+    gem 'ruby-oci8',    github: 'kubo/ruby-oci8'
   end
-
 end

data/History.md

@@ -1,3 +1,173 @@
+## 1.5.5 / 2014-05-23
+
+* Enhancements
+ * Oracle NUMBER datatype can be handled as Rails :float datatype [#418]
+   - Default NUMBER datatype handled as :decimal to keep compatibility
+   - Configured by setting `self.number_datatype_coercion = :float` 
+ * Add link to supported Oracle database version, JDK and Oracle JDBC Driver version [#438]
+ * Support `without_prepared_statements?` to handle `unprepared_statement` [#447]
+
+* Bug Fix
+  * Associations with name `record` do not work correctly since Rails 4 [#435]
+  * Skip another Oracle Text test when Oracle 12c used [#437]
+  * Tag bind params with a bind param object [#444]
+
+## 1.5.4 / 2014-03-25
+
+* Enhancements
+ * Support Rails 4.1.0.rc2
+ * Allow Java 8 to run with jruby [#383]
+
+* Bug Fix
+  * Fix db:schema:dump when foreign key column name is not 'id' [#409]
+  * Fix schema dump works when non Oracle adapter used [#428]
+
+## 1.5.3 / 2014-03-04
+
+* Enhancements
+ * Supports Rails 4.1.0.rc1
+ * Support rails/rails#13886 by chainging select_rows arguments [#415]
+
+* Bug Fix
+  * Fix ORA-01008: not all variables bound [#422]
+
+## 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
+ * Removed set_table_name set_primary_key set_sequence_name from unit tests [#364]
+ * Update README to support assignment methods [#365]
+ * Remove add_limit_offset! method [#369]
+ * Update Gemfile to use `bundle config --local` [#370]
+ * `describe` does not try super when no datbase link and ORA-4043 returned [#375]
+ * Support `remove_columns` [#377]
+ * Dump views in alphabetical order and add `FORCE` option [#378]
+
+* Bug Fix
+ * Fixed reverting add_column fails with v1.5.0 [#373]
+
+## 1.5.0 / 2013-11-01
+
+* Enhancements
+ * Add license in gemspec and Rakefile [#361]
+
+## 1.5.0.rc1 / 2013-10-31
+
+* Update README and HISTORY
+* No other changes since 1.5.0.beta1
+
+## 1.5.0.beta1 / 2013-10-28
+
+* Enhancements and major changes
+ * Support Rails 4.0
+ * Desupport Rails 3.2 and lower version. To support Rails 3.2, use Version 1.4.3
+ * Drop session store support [#219]
+ * Create indexes automatically for references and belongs_to [#183]
+ * Use the index name explicitly provided in a migration when reverting [#296]
+ * Rename indexes when a table or column is renamed [#286]
+ * Support refactored remove_column [#172] 
+ * Support allowed_index_name_length method [#285]
+ * Remove schema prefix from sequence name if present before truncating [#155]
+ * Bumped jeweler, ruby-plsql and ruby-oci8 version [#176]
+ * Support also ojdbc6.jar for Java 1.7 [#350]
+ * Support "activerecord-deprecated_finders" [#210]
+ * Prepared statements can be disabled [#295]
+ * Ensure disconnecting or reconnecting resets the transaction state [#220]
+ * Support for specifying transaction isolation level [#226]
+ * Rename the partial_updates config to partial_writes [#234]
+ * Deprecate passing a string as third argument of add_index [#242]
+ * Rename update method to update_record, create method to create_record [#273]
+ * Deprecate #connection in favour of accessing it via the class [#297]
+ * Support SchemaCreation [#298]
+ * Add support for foreign key creation in create_table [#317]
+ * Add virtual columns support for rail4 branch [#329]
+ * Support columns_for_distinct method [#340]
+ * Clear index cache when any table dropped [#200]
+ * Clear index cache when remove_column executed [#269]
+ * Dump schema uses ruby 1.9 style hash [#229]
+ * Support _field_changed? and drop field_changed? [#182 #254]
+ * Use arel nodes instead of raw sql [#198]
+ * Raise an ArgumentError when passing an invalid option to add_index [#242]
+ * Split OracleEnhancedColumnDumper from OracleEnhancedSchemaDumper [#292]
+ * Unit test sets default_timezone = :local [#184]
+ * Support reset_pk_sequence! [#287]
+ * Remove unnecessary pendings in unit tests [#358]
+
+* Bug Fix
+ * Address ArgumentError: wrong number of arguments (5 for 3) [#166]
+ * Address NoMethodError: undefined method `column_types' [#173]
+ * Schema dumper removes table_name_prefix and table_name_suffix [#191]
+ * Add clear_logger to address ArgumentError: wrong number of arguments (1 for 2) [#193]
+ * Use Relation#to_a as Relation#all is deprecated in Rails [#203]
+ * Address Address test_integer_zero_to_integer_zero_not_marked_as_changed failure [#207]
+ * Address NoMethodError undefined method `default_string' [#221]
+ * Address you can't redefine the primary key column 'id'. To define a custom primary key, pass { id: false } to create_table [#238]
+ * Remove unnecessary DEPRECATION WARNING [#255]
+ * Assigning "0.0" to a nullable numeric column does not make it dirty [#293]
+ * Address `rake spec` abort [#353]
+ * Correct activerecord-deprecated_finders not loaded if ENV['RAILS_GEM_VERSION'] set [#353]
+
+* Known Issues
+ * Oracle Text features are not fully supported with Oracle 12c [#331]
+
+### 1.4.3 / 2013-10-24
+
+* No changes since 1.4.3.rc2
+
+### 1.4.3.rc2 / 2013-10-23
+
+* Change build procedures
+* No other changes since 1.4.3.rc1
+
+### 1.4.3.rc1 / 2013-10-19
+
+* Enhancements:
+  * Allow inserting NULL to Oracle Spatial Data Types such as MDSYS.SDO_GEOMETRY [#311]
+  * Support ojdbc7.jar JDBC Driver [#335]
+
+* Bug fixes:
+  * Fixed Gemfile to bundle update work [#294]
+  * Fixed broken links in README.md and RUNNING_TESTS.md [#303 #306]
+  * Address rename_table works if the source table created with :id => false [#336]
+  * Use expand_path to show VERSION with Windows XP
+
+### 1.4.2 / 2013-03-18
+
+* No changes since 1.4.2.rc2
+
+### 1.4.2.rc2 / 2013-03-01
+
+* Bug fixes:
+  * Do not consider the numeric attribute as changed if the old value is zero and the new value is not a string [#247]
+  * Removed table_name_prefix and table_name_suffix when schema dumper executed [#248]
+  * Remove_column should raise an ArgumentError when no columns are passed [#246]
+  * Don't dump type for NUMBER virtual columns [#256]
+  * Address :returning_id column should be of type Column [#274]
+  * Migrated versions should be dumped in order [#277]
+  * Always write serialized LOB columns [#275]
+  * Truncate the schema_migrations index [#276]
+  * Split paths on windows machines in the right way [#231]
+
 ### 1.4.2.rc1 / 2012-11-13
 
 * Enhancements:

data/README.md

@@ -6,11 +6,42 @@ Oracle enhanced adapter for ActiveRecord
 DESCRIPTION
 -----------
 
-Oracle enhanced ActiveRecord adapter provides Oracle database access from Ruby on Rails applications. Oracle enhanced adapter can be used from Ruby on Rails versions 2.3.x and 3.x and it is working with Oracle database versions 10g and 11g.
+Oracle enhanced ActiveRecord adapter provides Oracle database access from Ruby on Rails applications. Oracle enhanced adapter can be used from Ruby on Rails versions between 2.3.x and 4.0 and it is working with Oracle database versions from 10g to 12c.
 
 INSTALLATION
 ------------
 
+### Rails 4
+
+Oracle enhanced adapter version 1.5 just supports Rails 4 and does not support Rails 3.2 or lower version of Rails.
+
+When using Ruby on Rails version 4 then in Gemfile include
+
+    gem "activerecord-oracle_enhanced-adapter", "~> 1.5.0"
+
+where instead of 1.5.0 you can specify any other desired version. It is recommended to specify version with `~>` which means that use specified version or later patch versions (in this example any later 1.5.x version but not 1.6.x version). Oracle enhanced adapter maintains API backwards compatibility during patch version upgrades and therefore it is safe to always upgrade to latest patch version.
+
+If you would like to use latest adapter version from github then specify
+
+    gem 'activerecord-oracle_enhanced-adapter', :git => 'git://github.com/rsim/oracle-enhanced.git'
+
+If you are using CRuby 1.9.3 or 2.0 then you need to install ruby-oci8 gem as well as Oracle client, e.g. [Oracle Instant Client](http://www.oracle.com/technetwork/database/features/instant-client/index-097480.html). Include in Gemfile also ruby-oci8:
+
+    gem 'ruby-oci8', '~> 2.1.0'
+
+If you are using JRuby then you need to download latest [Oracle JDBC driver](http://www.oracle.com/technetwork/database/enterprise-edition/jdbc-112010-090769.html) - either ojdbc7.jar or ojdbc6.jar for Java 7, ojdbc6.jar for Java 6 or ojdbc5.jar for Java 5. And copy this file to one of these locations:
+
+  * in `./lib` directory of Rails application
+  * in some directory which is in `PATH`
+  * in `JRUBY_HOME/lib` directory
+  * or include path to JDBC driver jar file in Java `CLASSPATH`
+
+After specifying necessary gems in Gemfile run
+
+    bundle install
+
+to install the adapter (or later run `bundle update` to force updating to latest version).
+
 ### Rails 3
 
 When using Ruby on Rails version 3 then in Gemfile include
@@ -113,7 +144,9 @@ If you deploy JRuby on Rails application in Java application server that support
       adapter: oracle_enhanced
       jndi: "jdbc/jndi_connection_name"
 
-You can find other available database.yml connection parameters in [oracle_enhanced_adapter.rb](/rsim/oracle-enhanced/blob/master/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb). There are many NLS settings as well as some other Oracle session settings.
+To use jndi with Tomcat you need to set the accessToUnderlyingConnectionAllowed to true property on the pool. See  the [Tomcat Documentation](http://tomcat.apache.org/tomcat-7.0-doc/jndi-resources-howto.html) for reference.
+
+You can find other available database.yml connection parameters in [oracle_enhanced_adapter.rb](http://github.com/rsim/oracle-enhanced/blob/master/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb). There are many NLS settings as well as some other Oracle session settings.
 
 ### Adapter settings
 
@@ -138,12 +171,35 @@ If you want to change Oracle enhanced adapter default settings then create initi
 
 In case of Rails 2 application you do not need to use `ActiveSupport.on_load(:active_record) do ... end` around settings code block.
 
-See other adapter settings in [oracle_enhanced_adapter.rb](/rsim/oracle-enhanced/blob/master/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb).
+See other adapter settings in [oracle_enhanced_adapter.rb](http://github.com/rsim/oracle-enhanced/blob/master/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb).
 
 ### Legacy schema support
 
 If you want to put Oracle enhanced adapter on top of existing schema tables then there are several methods how to override ActiveRecord defaults, see example:
 
+    class Employee < ActiveRecord::Base
+      # specify schema and table name
+      self.table_name "hr.hr_employees"
+      # specify primary key name
+      self.primary_key "employee_id"
+      # specify sequence name
+      self.sequence_name "hr.hr_employee_s"
+      # set which DATE columns should be converted to Ruby Date
+      set_date_columns :hired_on, :birth_date_on
+      # set which DATE columns should be converted to Ruby Time
+      set_datetime_columns :last_login_time
+      # set which VARCHAR2 columns should be converted to true and false
+      set_boolean_columns :manager, :active
+      # set which columns should be ignored in ActiveRecord
+      ignore_table_columns :attribute1, :attribute2
+    end
+
+You can also access remote tables over database link using
+
+    self.table_name "hr_employees@db_link"
+
+Examples for Rails 3.2 and lower version of Rails
+
     class Employee < ActiveRecord::Base
       # specify schema and table name
       set_table_name "hr.hr_employees"
@@ -257,7 +313,7 @@ And you can even create index on multiple tables by providing SELECT statements
     Post.contains(:all_text, "aaa within title")
     Post.contains(:all_text, "bbb within comment_author")
 
-### Oracle virtual collumns support
+### Oracle virtual columns support
 
 Since version R11G1 Oracle database allows adding computed [Virtual Columns](http://www.oracle-base.com/articles/11g/virtual-columns-11gr1.php) to the table.
 They can be used as normal fields in the queries, in the foreign key contstraints and to partitioning data.
@@ -366,7 +422,7 @@ When Apache with Phusion Passenger (mod_passenger or previously mod_rails) is us
 RUNNING TESTS
 -------------
 
-See [RUNNING_TESTS.md](/rsim/oracle-enhanced/blob/master/RUNNING_TESTS.md) for information how to set up environment and run Oracle enhanced adapter unit tests.
+See [RUNNING_TESTS.md](https://github.com/rsim/oracle-enhanced/blob/master/RUNNING_TESTS.md) for information how to set up environment and run Oracle enhanced adapter unit tests.
 
 LINKS
 -----

data/Rakefile

@@ -22,6 +22,7 @@ EOS
   gem.homepage = "http://github.com/pmacs/oracle-enhanced"
   gem.authors = ["Charles Treatman", "Raimonds Simanovskis"]
   gem.extra_rdoc_files = ['README.md']
+  gem.license = 'MIT'
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-1.4.2.rc1
+1.5.5

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -29,24 +29,138 @@
 # contribution.
 # portions Copyright 2005 Graham Jenkins
 
-# ActiveRecord 2.2 does not load version file automatically
-require 'active_record/version' unless defined?(ActiveRecord::VERSION)
-
 require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/oracle_enhanced_connection'
 
-require 'active_record/connection_adapters/oracle_enhanced_base_ext'
 require 'active_record/connection_adapters/oracle_enhanced_column'
 
 require 'digest/sha1'
 
+require 'arel/visitors/bind_visitor'
+
+ActiveRecord::Base.class_eval do
+  class_attribute :custom_create_method, :custom_update_method, :custom_delete_method
+end
+
 module ActiveRecord
+  class Base
+
+    # Specify table columns which should be ignored by ActiveRecord, e.g.:
+    #
+    #   ignore_table_columns :attribute1, :attribute2
+    def self.ignore_table_columns(*args)
+      connection.ignore_table_columns(table_name,*args)
+    end
+
+    # Specify which table columns should be typecasted to Date (without time), e.g.:
+    # 
+    #   set_date_columns :created_on, :updated_on
+    def self.set_date_columns(*args)
+      connection.set_type_for_columns(table_name,:date,*args)
+    end
+
+    # Specify which table columns should be typecasted to Time (or DateTime), e.g.:
+    #
+    #   set_datetime_columns :created_date, :updated_date
+    def self.set_datetime_columns(*args)
+      connection.set_type_for_columns(table_name,:datetime,*args)
+    end
+
+    # Specify which table columns should be typecasted to boolean values +true+ or +false+, e.g.:
+    #
+    #   set_boolean_columns :is_valid, :is_completed
+    def self.set_boolean_columns(*args)
+      connection.set_type_for_columns(table_name,:boolean,*args)
+    end
+
+    # Specify which table columns should be typecasted to integer values.
+    # Might be useful to force NUMBER(1) column to be integer and not boolean, or force NUMBER column without
+    # scale to be retrieved as integer and not decimal. Example:
+    #
+    #   set_integer_columns :version_number, :object_identifier
+    def self.set_integer_columns(*args)
+      connection.set_type_for_columns(table_name,:integer,*args)
+    end
+
+    # Specify which table columns should be typecasted to string values.
+    # Might be useful to specify that columns should be string even if its name matches boolean column criteria.
+    #
+    #   set_string_columns :active_flag
+    def self.set_string_columns(*args)
+      connection.set_type_for_columns(table_name,:string,*args)
+    end
+
+    # Get table comment from schema definition.
+    def self.table_comment
+      connection.table_comment(self.table_name)
+    end
+
+    def self.lob_columns
+      columns.select do |column|
+        column.respond_to?(:lob?) && column.lob?
+      end
+    end
+
+    def self.virtual_columns
+      columns.select do |column|
+        column.respond_to?(:virtual?) && column.virtual?
+      end
+    end
+
+    def arel_attributes_with_values(attribute_names)
+      virtual_column_names = self.class.virtual_columns.map(&:name)
+      super(attribute_names - virtual_column_names)
+    end
+
+    # After setting large objects to empty, select the OCI8::LOB
+    # and write back the data.
+    before_update :record_changed_lobs
+    after_update :enhanced_write_lobs
+
+    private
+
+    def enhanced_write_lobs
+      if self.class.connection.is_a?(ConnectionAdapters::OracleEnhancedAdapter) && 
+          !(
+            (self.class.custom_create_method || self.class.custom_create_method) ||
+            (self.class.custom_update_method || self.class.custom_update_method)
+          )
+        self.class.connection.write_lobs(self.class.table_name, self.class, attributes, @changed_lob_columns || self.class.lob_columns)
+      end
+    end
+
+    def record_changed_lobs
+      @changed_lob_columns = self.class.lob_columns.select do |col|
+        self.class.serialized_attributes.keys.include?(col.name) ||
+          (self.send(:"#{col.name}_changed?") && !self.class.readonly_attributes.to_a.include?(col.name))
+      end
+    end
+  end
+end
+
+module ActiveRecord
+  module ConnectionHandling #:nodoc:
+    # Establishes a connection to the database that's used by all Active Record objects.
+    def oracle_enhanced_connection(config) #:nodoc:
+      if config[:emulate_oracle_adapter] == true
+        # allows the enhanced adapter to look like the OracleAdapter. Useful to pick up
+        # conditionals in the rails activerecord test suite
+        require 'active_record/connection_adapters/emulation/oracle_adapter'
+        ConnectionAdapters::OracleAdapter.new(
+          ConnectionAdapters::OracleEnhancedConnection.create(config), logger, config)
+      else
+        ConnectionAdapters::OracleEnhancedAdapter.new(
+          ConnectionAdapters::OracleEnhancedConnection.create(config), logger, config)
+      end
+    end
+  end
+
   module ConnectionAdapters #:nodoc:
 
     # Oracle enhanced adapter will work with both
     # Ruby 1.8/1.9 ruby-oci8 gem (which provides interface to Oracle OCI client)
     # or with JRuby and Oracle JDBC driver.
-    # 
+    #
     # It should work with Oracle 9i, 10g and 11g databases.
     # Limited set of functionality should work on Oracle 8i as well but several features
     # rely on newer functionality in Oracle database.
@@ -71,9 +185,9 @@ module ActiveRecord
     # * <tt>:username</tt>
     # * <tt>:password</tt>
     # * <tt>:database</tt> - either TNS alias or connection string for OCI client or database name in JDBC connection string
-    # 
+    #
     # Optional parameters:
-    # 
+    #
     # * <tt>:host</tt> - host name for JDBC connection, defaults to "localhost"
     # * <tt>:port</tt> - port number for JDBC connection, defaults to 1521
     # * <tt>:privilege</tt> - set "SYSDBA" if you want to connect with this privilege
@@ -82,11 +196,10 @@ module ActiveRecord
     # * <tt>:cursor_sharing</tt> - cursor sharing mode to minimize amount of unique statements, defaults to "force"
     # * <tt>:time_zone</tt> - database session time zone
     #   (it is recommended to set it using ENV['TZ'] which will be then also used for database session time zone)
-    # 
+    #
     # Optionals NLS parameters:
-    # 
+    #
     # * <tt>:nls_calendar</tt>
-    # * <tt>:nls_characterset</tt>
     # * <tt>:nls_comp</tt>
     # * <tt>:nls_currency</tt>
     # * <tt>:nls_date_format</tt> - format for :date columns, defaults to <tt>YYYY-MM-DD HH24:MI:SS</tt>
@@ -96,7 +209,6 @@ module ActiveRecord
     # * <tt>:nls_language</tt>
     # * <tt>:nls_length_semantics</tt> - semantics of size of VARCHAR2 and CHAR columns, defaults to <tt>CHAR</tt>
     #   (meaning that size specifies number of characters and not bytes)
-    # * <tt>:nls_nchar_characterset</tt>
     # * <tt>:nls_nchar_conv_excp</tt>
     # * <tt>:nls_numeric_characters</tt>
     # * <tt>:nls_sort</tt>
@@ -105,7 +217,7 @@ module ActiveRecord
     # * <tt>:nls_timestamp_tz_format</tt>
     # * <tt>:nls_time_format</tt>
     # * <tt>:nls_time_tz_format</tt>
-    # 
+    #
     class OracleEnhancedAdapter < AbstractAdapter
 
       ##
@@ -126,12 +238,12 @@ module ActiveRecord
       # to Date then you can add the following line to your initializer file:
       #
       #   ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates = true
-      # 
+      #
       # As this option can have side effects when unnecessary typecasting is done it is recommended
       # that Date columns are explicily defined with +set_date_columns+ method.
       cattr_accessor :emulate_dates
       self.emulate_dates = false
-      
+
        ##
         # :singleton-method:
         # OracleEnhancedAdapter will use the default tablespace, but if you want specific types of
@@ -139,7 +251,7 @@ module ActiveRecord
         #
         #   ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces =
         #  {:clob => 'TS_LOB', :blob => 'TS_LOB', :index => 'TS_INDEX', :table => 'TS_DATA'}
-        # 
+        #
         # Using the :tablespace option where available (e.g create_table) will take precedence
         # over these settings.
       cattr_accessor :default_tablespaces
@@ -153,12 +265,19 @@ module ActiveRecord
       # to Date then you can add the following line to your initializer file:
       #
       #   ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
-      # 
+      #
       # As this option can have side effects when unnecessary typecasting is done it is recommended
       # that Date columns are explicily defined with +set_date_columns+ method.
       cattr_accessor :emulate_dates_by_column_name
       self.emulate_dates_by_column_name = false
 
+      ##
+      # :singleton-method:
+      # Specify how `NUMBER` datatype columns, without precision and scale, are handled in Rails world.
+      # Default is :decimal and other valid option is :float. Be wary of setting it to other values.
+      cattr_accessor :number_datatype_coercion
+      self.number_datatype_coercion = :decimal
+
       # Check column name to identify if it is Date (and not Time) column.
       # Is used if +emulate_dates_by_column_name+ option is set to +true+.
       # Override this method definition in initializer file if different Date column recognition is needed.
@@ -193,7 +312,7 @@ module ActiveRecord
       # Is used if +emulate_integers_by_column_name+ option is set to +true+.
       # Override this method definition in initializer file if different Integer column recognition is needed.
       def self.is_integer_column?(name, table_name = nil)
-        name =~ /(^|_)id$/i
+        !!(name =~ /(^|_)id$/i)
       end
 
       ##
@@ -212,7 +331,7 @@ module ActiveRecord
         return true if ["CHAR(1)","VARCHAR2(1)"].include?(field_type)
         field_type =~ /^VARCHAR2/ && (name =~ /_flag$/i || name =~ /_yn$/i)
       end
-      
+
       # How boolean value should be quoted to String.
       # Used if +emulate_booleans_from_strings+ option is set to +true+.
       def self.boolean_to_string(bool)
@@ -222,15 +341,15 @@ module ActiveRecord
       ##
       # :singleton-method:
       # Specify non-default date format that should be used when assigning string values to :date columns, e.g.:
-      # 
+      #
       #   ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.string_to_date_format = “%d.%m.%Y”
       cattr_accessor :string_to_date_format
       self.string_to_date_format = nil
-      
+
       ##
       # :singleton-method:
       # Specify non-default time format that should be used when assigning string values to :datetime columns, e.g.:
-      # 
+      #
       #   ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.string_to_time_format = “%d.%m.%Y %H:%M:%S”
       cattr_accessor :string_to_time_format
       self.string_to_time_format = nil
@@ -265,13 +384,22 @@ module ActiveRecord
         end
       end
 
+      class BindSubstitution < Arel::Visitors::Oracle #:nodoc:
+        include Arel::Visitors::BindVisitor
+      end
+
       def initialize(connection, logger, config) #:nodoc:
         super(connection, logger)
         @quoted_column_names, @quoted_table_names = {}, {}
         @config = config
         @statements = StatementPool.new(connection, config.fetch(:statement_limit) { 250 })
         @enable_dbms_output = false
-        @visitor = Arel::Visitors::Oracle.new self if defined?(Arel::Visitors::Oracle)
+        if config.fetch(:prepared_statements) { true }
+          @visitor = Arel::Visitors::Oracle.new self
+          @prepared_statements = true
+        else
+          @visitor = unprepared_visitor
+        end
       end
 
       def self.visitor_for(pool) # :nodoc:
@@ -279,7 +407,7 @@ module ActiveRecord
       end
 
       ADAPTER_NAME = 'OracleEnhanced'.freeze
-      
+
       def adapter_name #:nodoc:
         ADAPTER_NAME
       end
@@ -296,10 +424,15 @@ module ActiveRecord
         true
       end
 
+      def supports_transaction_isolation? #:nodoc:
+        true
+      end
+
+      NUMBER_MAX_PRECISION = 38
+
       #:stopdoc:
       DEFAULT_NLS_PARAMETERS = {
         :nls_calendar            => nil,
-        :nls_characterset        => nil,
         :nls_comp                => nil,
         :nls_currency            => nil,
         :nls_date_format         => 'YYYY-MM-DD HH24:MI:SS',
@@ -308,7 +441,6 @@ module ActiveRecord
         :nls_iso_currency        => nil,
         :nls_language            => nil,
         :nls_length_semantics    => 'CHAR',
-        :nls_nchar_characterset  => nil,
         :nls_nchar_conv_excp     => nil,
         :nls_numeric_characters  => nil,
         :nls_sort                => nil,
@@ -321,10 +453,10 @@ module ActiveRecord
 
       #:stopdoc:
       NATIVE_DATABASE_TYPES = {
-        :primary_key => "NUMBER(38) NOT NULL PRIMARY KEY",
+        :primary_key => "NUMBER(#{NUMBER_MAX_PRECISION}) NOT NULL PRIMARY KEY",
         :string      => { :name => "VARCHAR2", :limit => 255 },
         :text        => { :name => "CLOB" },
-        :integer     => { :name => "NUMBER", :limit => 38 },
+        :integer     => { :name => "NUMBER", :limit => NUMBER_MAX_PRECISION },
         :float       => { :name => "NUMBER" },
         :decimal     => { :name => "DECIMAL" },
         :datetime    => { :name => "DATE" },
@@ -364,7 +496,17 @@ module ActiveRecord
         IDENTIFIER_MAX_LENGTH
       end
 
-      # the maximum length of an index name
+      # Returns the maximum allowed length for an index name. This
+      # limit is enforced by rails and Is less than or equal to
+      # <tt>index_name_length</tt>. The gap between
+      # <tt>index_name_length</tt> is to allow internal rails
+      # opreations to use prefixes in temporary opreations.
+      def allowed_index_name_length
+        index_name_length
+      end
+
+      # the maximum length of an index name 
+      # supported by this database
       def index_name_length
         IDENTIFIER_MAX_LENGTH
       end
@@ -418,12 +560,12 @@ module ActiveRecord
       # Names must be from 1 to 30 bytes long with these exceptions:
       # * Names of databases are limited to 8 bytes.
       # * Names of database links can be as long as 128 bytes.
-      #  
+      #
       # Nonquoted identifiers cannot be Oracle Database reserved words
-      #  
+      #
       # Nonquoted identifiers must begin with an alphabetic character from
       # your database character set
-      #  
+      #
       # Nonquoted identifiers can contain only alphanumeric characters from
       # your database character set and the underscore (_), dollar sign ($),
       # and pound sign (#). Database links can also contain periods (.) and
@@ -438,7 +580,7 @@ module ActiveRecord
       # can be prefixed with schema name
       # CamelCase table names should be quoted
       def self.valid_table_name?(name) #:nodoc:
-        name = name.to_s 
+        name = name.to_s
         name =~ VALID_TABLE_NAME && !(name =~ /[A-Z]/ && name =~ /[a-z]/) ? true : false
       end
 
@@ -446,7 +588,7 @@ module ActiveRecord
         name = name.to_s
         @quoted_table_names[name] ||= name.split('.').map{|n| n.split('@').map{|m| quote_column_name(m)}.join('@')}.join('.')
       end
-      
+
       def quote_string(s) #:nodoc:
         s.gsub(/'/, "''")
       end
@@ -455,7 +597,7 @@ module ActiveRecord
         if value && column
           case column.type
           when :text, :binary
-            %Q{empty_#{ column.sql_type.downcase rescue 'blob' }()}
+            %Q{empty_#{ type_to_sql(column.type.to_sym).downcase rescue 'blob' }()}
           # NLS_DATE_FORMAT independent TIMESTAMP support
           when :timestamp
             quote_timestamp_with_to_timestamp(value)
@@ -569,7 +711,7 @@ module ActiveRecord
 
       # Reconnects to the database.
       def reconnect! #:nodoc:
-        clear_cache!
+        super
         @connection.reset!
       rescue OracleEnhancedConnectionException => e
         @logger.warn "#{adapter_name} automatic reconnection failed: #{e.message}" if @logger
@@ -582,7 +724,7 @@ module ActiveRecord
 
       # Disconnects from the database.
       def disconnect! #:nodoc:
-        clear_cache!
+        super
         @connection.logoff rescue nil
       end
 
@@ -596,7 +738,7 @@ module ActiveRecord
       end
 
       def substitute_at(column, index)
-        Arel.sql(":a#{index + 1}")
+        Arel::Nodes::BindParam.new (":a#{index + 1}")
       end
 
       def clear_cache!
@@ -604,10 +746,13 @@ 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?
+          if without_prepared_statement?(binds)
             cursor = @connection.prepare(sql)
           else
             unless @statements.key? sql
@@ -618,7 +763,7 @@ module ActiveRecord
 
             binds.each_with_index do |bind, i|
               col, val = bind
-              cursor.bind_param(i + 1, type_cast(val, col), col && col.type)
+              cursor.bind_param(i + 1, type_cast(val, col), col)
             end
 
             cached = true
@@ -626,7 +771,7 @@ module ActiveRecord
 
           cursor.exec
 
-          if name == 'EXPLAIN'
+          if name == 'EXPLAIN' and sql =~ /^EXPLAIN/
             res = true
           else
             columns = cursor.get_col_names.map do |col_name|
@@ -654,7 +799,7 @@ module ActiveRecord
       end
 
       def explain(arel, binds = [])
-        sql = "EXPLAIN PLAN FOR #{to_sql(arel)}"
+        sql = "EXPLAIN PLAN FOR #{to_sql(arel, binds)}"
         return if sql =~ /FROM all_/
         if ORACLE_ENHANCED_CONNECTION == :jdbc
           exec_query(sql, 'EXPLAIN', binds)
@@ -666,13 +811,8 @@ module ActiveRecord
 
       # Returns an array of arrays containing the field values.
       # Order is the same as that returned by #columns.
-      def select_rows(sql, name = nil)
-        # last parameter indicates to return also column list
-        result = columns = nil
-        log(sql, name) do
-          result, columns = @connection.select(sql, name, true)
-        end
-        result.map{ |v| columns.map{|c| v[c]} }
+      def select_rows(sql, name = nil, binds = [])
+        exec_query(sql, name, binds).rows
       end
 
       # Executes an INSERT statement and returns the new record's ID
@@ -696,30 +836,37 @@ module ActiveRecord
       def sql_for_insert(sql, pk, id_value, sequence_name, binds)
         unless id_value || pk.nil? || (defined?(CompositePrimaryKeys) && pk.kind_of?(CompositePrimaryKeys::CompositeKeys))
           sql = "#{sql} RETURNING #{quote_column_name(pk)} INTO :returning_id"
-          (binds = binds.dup) << [:returning_id, nil]
+          returning_id_col = OracleEnhancedColumn.new("returning_id", nil, "number", true, "dual", :integer, true, true)
+          (binds = binds.dup) << [returning_id_col, nil]
         end
         [sql, binds]
       end
 
-      EXEC_INSERT_RESULT_COLUMNS = %w(returning_id) #:nodoc:
-
       # New method in ActiveRecord 3.1
-      def exec_insert(sql, name, binds)
-        log(sql, name, binds) do
-          returning_id_index = nil
-          cursor = if @statements.key?(sql)
-            @statements[sql]
+      def exec_insert(sql, name, binds, pk = nil, sequence_name = nil)
+        type_casted_binds = binds.map { |col, val|
+          [col, type_cast(val, col)]
+        }
+        log(sql, name, type_casted_binds) do
+          returning_id_col = returning_id_index = nil
+          if without_prepared_statement?(binds)
+            cursor = @connection.prepare(sql)
           else
-            @statements[sql] = @connection.prepare(sql)
-          end
+            unless @statements.key? (sql)
+              @statements[sql] = @connection.prepare(sql)
+            end
 
-          binds.each_with_index do |bind, i|
-            col, val = bind
-            if col == :returning_id
-              returning_id_index = i + 1
-              cursor.bind_returning_param(returning_id_index, Integer)
-            else
-              cursor.bind_param(i + 1, type_cast(val, col), col && col.type)
+            cursor = @statements[sql]
+
+            binds.each_with_index do |bind, i|
+              col, val = bind
+              if col.returning_id?
+                returning_id_col = [col]
+                returning_id_index = i + 1
+                cursor.bind_returning_param(returning_id_index, Integer)
+              else
+                cursor.bind_param(i + 1, type_cast(val, col), col)
+              end
             end
           end
 
@@ -730,7 +877,7 @@ module ActiveRecord
             returning_id = cursor.get_returning_param(returning_id_index, Integer)
             rows << [returning_id]
           end
-          ActiveRecord::Result.new(EXEC_INSERT_RESULT_COLUMNS, rows)
+          ActiveRecord::Result.new(returning_id_col || [], rows)
         end
       end
 
@@ -738,7 +885,7 @@ module ActiveRecord
       def exec_update(sql, name, binds)
         log(sql, name, binds) do
           cached = false
-          if binds.empty?
+          if without_prepared_statement?(binds)
             cursor = @connection.prepare(sql)
           else
             cursor = if @statements.key?(sql)
@@ -749,7 +896,7 @@ module ActiveRecord
 
             binds.each_with_index do |bind, i|
               col, val = bind
-              cursor.bind_param(i + 1, type_cast(val, col), col && col.type)
+              cursor.bind_param(i + 1, type_cast(val, col), col)
             end
             cached = true
           end
@@ -779,6 +926,21 @@ module ActiveRecord
         @connection.autocommit = false
       end
 
+      def transaction_isolation_levels
+        # Oracle database supports `READ COMMITTED` and `SERIALIZABLE`
+        # No read uncommitted nor repeatable read supppoted
+        # http://docs.oracle.com/cd/E11882_01/server.112/e26088/statements_10005.htm#SQLRF55422
+        {
+          read_committed:   "READ COMMITTED",
+          serializable:     "SERIALIZABLE"
+        }
+      end
+
+      def begin_isolated_db_transaction(isolation)
+        begin_db_transaction
+        execute "SET TRANSACTION ISOLATION LEVEL  #{transaction_isolation_levels.fetch(isolation)}"
+      end
+
       def commit_db_transaction #:nodoc:
         @connection.commit
       ensure
@@ -791,32 +953,18 @@ 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
 
-      def add_limit_offset!(sql, options) #:nodoc:
-        # added to_i for limit and offset to protect from SQL injection
-        offset = (options[:offset] || 0).to_i
-        limit = options[:limit]
-        limit = limit.is_a?(String) && limit.blank? ? nil : limit && limit.to_i
-        if limit && offset > 0
-          sql.replace "SELECT * FROM (SELECT raw_sql_.*, ROWNUM raw_rnum_ FROM (#{sql}) raw_sql_ WHERE ROWNUM <= #{offset+limit}) WHERE raw_rnum_ > #{offset}"
-        elsif limit
-          sql.replace "SELECT * FROM (#{sql}) WHERE ROWNUM <= #{limit}"
-        elsif offset > 0
-          sql.replace "SELECT * FROM (SELECT raw_sql_.*, ROWNUM raw_rnum_ FROM (#{sql}) raw_sql_) WHERE raw_rnum_ > #{offset}"
-        end
-      end
-
       @@do_not_prefetch_primary_key = {}
 
       # Returns true for Oracle adapter (since Oracle requires primary key
@@ -842,9 +990,36 @@ module ActiveRecord
       # Returns default sequence name for table.
       # Will take all or first 26 characters of table name and append _seq suffix
       def default_sequence_name(table_name, primary_key = nil)
-        # TODO: remove schema prefix if present before truncating
-        # truncate table name if necessary to fit in max length of identifier
-        "#{table_name.to_s[0,IDENTIFIER_MAX_LENGTH-4]}_seq"
+        table_name.to_s.gsub /(^|\.)([\w$-]{1,#{sequence_name_length-4}})([\w$-]*)$/, '\1\2_seq'
+      end
+
+      def reset_pk_sequence!(table_name, primary_key = nil, sequence_name = nil) #:nodoc:
+        return nil unless table_exists?(table_name)
+        unless primary_key and sequence_name
+        # *Note*: Only primary key is implemented - sequence will be nil.
+          primary_key, sequence_name = pk_and_sequence_for(table_name)
+          # TODO This sequence_name implemantation is just enough
+          # to satisty fixures. To get correct sequence_name always
+          # pk_and_sequence_for method needs some work.
+          begin
+            sequence_name = table_name.classify.constantize.sequence_name
+          rescue
+            sequence_name = default_sequence_name(table_name)
+          end
+        end
+
+        if @logger && primary_key && !sequence_name
+          @logger.warn "#{table_name} has primary key #{primary_key} with no default sequence"
+        end
+
+        if primary_key && sequence_name
+          new_start_value = select_value("
+            select NVL(max(#{quote_column_name(primary_key)}),0) + 1 from #{quote_table_name(table_name)}
+          ", new_start_value)
+
+          execute ("DROP SEQUENCE #{quote_table_name(sequence_name)}") 
+          execute ("CREATE SEQUENCE #{quote_table_name(sequence_name)} START WITH #{new_start_value}")
+        end
       end
 
       # Inserts the given fixture into the table. Overridden to properly handle lobs.
@@ -852,9 +1027,9 @@ module ActiveRecord
         super
 
         if ActiveRecord::Base.pluralize_table_names
-          klass = table_name.singularize.camelize
+          klass = table_name.to_s.singularize.camelize
         else
-          klass = table_name.camelize
+          klass = table_name.to_s.camelize
         end
 
         klass = klass.constantize rescue nil
@@ -982,7 +1157,7 @@ module ActiveRecord
               current_index = row['index_name']
             end
 
-            # Functional index columns and virtual columns both get stored as column expressions, 
+            # Functional index columns and virtual columns both get stored as column expressions,
             # but re-creating a virtual column index as an expression (instead of using the virtual column's name)
             # results in a ORA-54018 error.  Thus, we only want the column expression value returned
             # when the column is not virtual.
@@ -1008,12 +1183,12 @@ module ActiveRecord
         @@ignore_table_columns[table_name] += args.map{|a| a.to_s.downcase}
         @@ignore_table_columns[table_name].uniq!
       end
-      
+
       def ignored_table_columns(table_name) #:nodoc:
         @@ignore_table_columns ||= {}
         @@ignore_table_columns[table_name]
       end
-      
+
       # used just in tests to clear ignored table columns
       def clear_ignored_table_columns #:nodoc:
         @@ignore_table_columns = nil
@@ -1029,7 +1204,7 @@ module ActiveRecord
           @@table_column_type[table_name][col.to_s.downcase] = column_type
         end
       end
-      
+
       def get_type_for_column(table_name, column_name) #:nodoc:
         @@table_column_type && @@table_column_type[table_name] && @@table_column_type[table_name][column_name.to_s.downcase]
       end
@@ -1086,7 +1261,7 @@ module ActiveRecord
         @@do_not_prefetch_primary_key[table_name] = nil
 
         table_cols = <<-SQL.strip.gsub(/\s+/, ' ')
-          SELECT column_name AS name, data_type AS sql_type, data_default, nullable, virtual_column, hidden_column,
+          SELECT column_name AS name, data_type AS sql_type, data_default, nullable, virtual_column, hidden_column, data_type_owner AS sql_type_owner,
                  DECODE(data_type, 'NUMBER', data_precision,
                                    'FLOAT', data_precision,
                                    'VARCHAR2', DECODE(char_used, 'C', char_length, data_length),
@@ -1102,12 +1277,16 @@ module ActiveRecord
         SQL
 
         # added deletion of ignored columns
-        select_all(table_cols, name).delete_if do |row|
+        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})" : ")")
+            row['sql_type'] += "(#{(limit || NUMBER_MAX_PRECISION).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'
@@ -1116,7 +1295,7 @@ module ActiveRecord
           if row['data_default'] && !is_virtual
             row['data_default'].sub!(/^(.*?)\s*$/, '\1')
 
-            # If a default contains a newline these cleanup regexes need to 
+            # 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
@@ -1155,7 +1334,7 @@ module ActiveRecord
       cattr_accessor :default_sequence_start_value
       self.default_sequence_start_value = 10000
 
-      # Find a table's primary key and sequence. 
+      # Find a table's primary key and sequence.
       # *Note*: Only primary key is implemented - sequence will be nil.
       def pk_and_sequence_for(table_name, owner=nil, desc_table_name=nil, db_link=nil) #:nodoc:
         if @@cache_columns
@@ -1173,6 +1352,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
@@ -1185,7 +1371,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
@@ -1203,49 +1390,48 @@ module ActiveRecord
       # Oracle requires the ORDER BY columns to be in the SELECT list for DISTINCT
       # queries. However, with those columns included in the SELECT DISTINCT list, you
       # won't actually get a distinct list of the column you want (presuming the column
-      # has duplicates with multiple values for the ordered-by columns. So we use the 
+      # has duplicates with multiple values for the ordered-by columns. So we use the
       # FIRST_VALUE function to get a single (first) value for each column, effectively
       # making every row the same.
       #
       #   distinct("posts.id", "posts.created_at desc")
-      def distinct(columns, order_by) #:nodoc:
-        return "DISTINCT #{columns}" if order_by.blank?
-
-        # construct a valid DISTINCT clause, ie. one that includes the ORDER BY columns, using
-        # FIRST_VALUE such that the inclusion of these columns doesn't invalidate the DISTINCT
-        order_columns = if order_by.is_a?(String)
-          order_by.split(',').map { |s| s.strip }.reject(&:blank?)
-        else # in latest ActiveRecord versions order_by is already Array
-          order_by
+      def distinct(columns, orders) #:nodoc:
+        # To support Rails 4.0.0 and future releases
+        # because `columns_for_distinct method introduced after Rails 4.0.0 released
+        if super.respond_to?(:columns_for_distinct)
+          super
+        else
+          order_columns = orders.map { |c|
+            c = c.to_sql unless c.is_a?(String)
+            # remove any ASC/DESC modifiers
+            c.gsub(/\s+(ASC|DESC)\s*?/i, '')
+            }.reject(&:blank?).map.with_index { |c,i| 
+              "FIRST_VALUE(#{c}) OVER (PARTITION BY #{columns} ORDER BY #{c}) AS alias_#{i}__" 
+            }
+            [super].concat(order_columns).join(', ')
         end
-        order_columns = order_columns.zip((0...order_columns.size).to_a).map do |c, i|
+      end 
+
+      def columns_for_distinct(columns, orders) #:nodoc:
+        # construct a valid columns name for DISTINCT clause, 
+        # ie. one that includes the ORDER BY columns, using FIRST_VALUE such that 
+        # the inclusion of these columns doesn't invalidate the DISTINCT
+        #
+        # It does not construct DISTINCT clause. Just return column names for distinct.
+        order_columns = orders.reject(&:blank?).map{ |s|
+          s = s.to_sql unless s.is_a?(String)
           # remove any ASC/DESC modifiers
-          value = c =~ /^(.+)\s+(ASC|DESC)\s*$/i ? $1 : c
-          "FIRST_VALUE(#{value}) OVER (PARTITION BY #{columns} ORDER BY #{c}) AS alias_#{i}__"
-        end
-        sql = "DISTINCT #{columns}, "
-        sql << order_columns * ", "
+          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}__"
+          }
+          [super, *order_columns].join(', ')
       end
 
       def temporary_table?(table_name) #:nodoc:
         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:
@@ -1280,7 +1466,7 @@ module ActiveRecord
 
       def select(sql, name = nil, binds = [])
         if ActiveRecord.const_defined?(:Result)
-          exec_query(sql, name, binds).to_a
+          exec_query(sql, name, binds)
         else
           log(sql, name) do
             @connection.select(sql, name, false)
@@ -1301,7 +1487,7 @@ module ActiveRecord
       #
       # PL/SQL in Oracle uses dbms_output for logging print statements
       # These methods stick that output into the Rails log so Ruby and PL/SQL
-      # code can can be debugged together in a single application 
+      # code can can be debugged together in a single application
 
       # Maximum DBMS_OUTPUT buffer size
       DBMS_OUTPUT_BUFFER_SIZE = 10000  # can be 1-1000000
@@ -1333,7 +1519,7 @@ module ActiveRecord
       ensure
         log_dbms_output if dbms_output_enabled?
       end
-      
+
       private
 
       def set_dbms_output_plsql_connection
@@ -1356,19 +1542,6 @@ module ActiveRecord
   end
 end
 
-# Added LOB writing callback for sessions stored in database
-# Otherwise it is not working as Session class is defined before OracleAdapter is loaded in Rails 2.0
-if defined?(CGI::Session::ActiveRecordStore::Session)
-  if !CGI::Session::ActiveRecordStore::Session.respond_to?(:after_save_callback_chain) ||
-      CGI::Session::ActiveRecordStore::Session.after_save_callback_chain.detect{|cb| cb.method == :enhanced_write_lobs}.nil?
-    #:stopdoc:
-    class CGI::Session::ActiveRecordStore::Session
-      after_save :enhanced_write_lobs
-    end
-    #:startdoc:
-  end
-end
-
 # Implementation of standard schema definition statements and extensions for schema definition
 require 'active_record/connection_adapters/oracle_enhanced_schema_statements'
 require 'active_record/connection_adapters/oracle_enhanced_schema_statements_ext'
@@ -1379,30 +1552,26 @@ require 'active_record/connection_adapters/oracle_enhanced_schema_definitions'
 # Extensions for context index definition
 require 'active_record/connection_adapters/oracle_enhanced_context_index'
 
-# Load custom create, update, delete methods functionality
-require 'active_record/connection_adapters/oracle_enhanced_procedures'
-
 # Load additional methods for composite_primary_keys support
 require 'active_record/connection_adapters/oracle_enhanced_cpk'
 
 # Load patch for dirty tracking methods
 require 'active_record/connection_adapters/oracle_enhanced_dirty'
 
-# Load rake tasks definitions
-begin
-  require 'active_record/connection_adapters/oracle_enhanced_tasks'
-rescue LoadError
-end if defined?(Rails) || defined?(RAILS_ROOT)
-
 # Patches and enhancements for schema dumper
 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'
 
-require 'active_record/connection_adapters/oracle_enhanced_activerecord_patches'
+module ActiveRecord
+  autoload :OracleEnhancedProcedures, 'active_record/connection_adapters/oracle_enhanced_procedures'
+end
 
-require 'active_record/connection_adapters/oracle_enhanced_version'
+# Patches and enhancements for column dumper
+require 'active_record/connection_adapters/oracle_enhanced_column_dumper'
+
+# Moved SchemaCreation class
+require 'active_record/connection_adapters/oracle_enhanced_schema_creation'