activerecord-oracle_enhanced-adapter 1.3.1 → 1.3.2

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--backtrace

data/Gemfile

@@ -1,37 +1,42 @@
 source 'http://rubygems.org'
 
-gem 'jeweler'
-gem 'rspec', "~> 1.3.0"
+group :development do
+  gem 'jeweler', '~> 1.5.1'
+  gem 'rspec', '~> 2.4'
 
-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
-  # uses local copy of Rails 3 and Arel gems
-  ENV['RAILS_GEM_PATH'] ||= '../rails'
-  %w(activerecord activemodel activesupport actionpack railties).each do |gem_name|
-    gem gem_name, :path => File.join(ENV['RAILS_GEM_PATH'], gem_name)
+  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
+    # uses local copy of Rails 3 and Arel gems
+    ENV['RAILS_GEM_PATH'] ||= File.expand_path('../../rails', __FILE__)
+    %w(activerecord activemodel activesupport actionpack railties).each do |gem_name|
+      gem gem_name, :path => File.join(ENV['RAILS_GEM_PATH'], gem_name)
+    end
+
+    ENV['AREL_GEM_PATH'] ||= File.expand_path('../../arel', __FILE__)
+    gem 'arel', :path => ENV['AREL_GEM_PATH']
+
+    gem 'rack', :git => 'git://github.com/rack/rack.git'
   end
 
-  ENV['AREL_GEM_PATH'] ||= '../arel'
-  gem 'arel', :path => ENV['AREL_GEM_PATH']
-end
+  gem 'ruby-plsql', '>=0.4.4'
 
-if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby'
-  gem 'ruby-oci8', '>=2.0.4'
-end
+  platforms :ruby do
+    gem 'ruby-oci8', '~> 2.0.4'
+  end
 
-gem 'ruby-plsql', '>=0.4.3'
+end

data/History.txt

@@ -1,3 +1,17 @@
+== 1.3.2 2011-01-05
+
+* Enhancements:
+  * If no :host or :port is provided then connect with :database name (do not default :host to localhost)
+  * Database connection pool support for JRuby on Tomcat and JBoss application servers
+  * NLS connection parameters support via environment variables or database.yml
+  * Support for Arel 2.0 and latest Rails master branch
+  * Support for Rails 3.1 prepared statements (implemented in not yet released Rails master branch version)
+  * Eager loading of included association with more than 1000 records (implemented in not yet released Rails master branch version)
+* Bug fixes:
+  * Foreign keys are added after table definitions in schema dump to ensure correct order of schema statements
+  * Quote NCHAR and NVARCHAR2 type values with N'...'
+  * Numeric username and/or password in database.yml will be automatically converted to string
+
 == 1.3.1 2010-09-09
 
 * Enhancements:

data/License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2010 Graham Jenkins, Michael Schoen, Raimonds Simanovskis
+Copyright (c) 2008-2011 Graham Jenkins, Michael Schoen, Raimonds Simanovskis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -59,12 +59,15 @@ See RUNNING_TESTS.rdoc
 * Simon Chiang
 * Peter Nyberg
 * Dwayne Litzenberger
+* Aaron Patterson
+* Darcy Schultz
+* Alexi Rahman
 
 == LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2008-2010 Graham Jenkins, Michael Schoen, Raimonds Simanovskis
+Copyright (c) 2008-2011 Graham Jenkins, Michael Schoen, Raimonds Simanovskis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/RUNNING_TESTS.rdoc

@@ -21,7 +21,7 @@ It is recommended to use RVM (http://rvm.beginrescueend.com) to run tests with d
 * Install bundler with
     gem install bundler
 * Set RAILS_GEM_VERSION to Rails version that you would like to use in oracle_enhanced tests, e.g.
-    export RAILS_GEM_VERSION=3.0.0
+    export RAILS_GEM_VERSION=3.0.3
 * Install necessary gems with
     bundle install
 * Run tests with

data/Rakefile

@@ -1,40 +1,38 @@
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "activerecord-oracle_enhanced-adapter"
-    gem.summary = "Oracle enhanced adapter for ActiveRecord"
-    gem.description = <<-EOS
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  gem.name = "activerecord-oracle_enhanced-adapter"
+  gem.summary = "Oracle enhanced adapter for ActiveRecord"
+  gem.description = <<-EOS
 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.
 EOS
-    gem.email = "raimonds.simanovskis@gmail.com"
-    gem.homepage = "http://github.com/rsim/oracle-enhanced"
-    gem.authors = ["Raimonds Simanovskis"]
-    gem.add_development_dependency "rspec", ">= 1.3.0"
-    gem.extra_rdoc_files = ['README.rdoc']
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  gem.email = "raimonds.simanovskis@gmail.com"
+  gem.homepage = "http://github.com/rsim/oracle-enhanced"
+  gem.authors = ["Raimonds Simanovskis"]
+  gem.extra_rdoc_files = ['README.rdoc']
 end
+Jeweler::RubygemsDotOrgTasks.new
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+RSpec::Core::RakeTask.new(:rcov) do |t|
+  t.rcov = true
+  t.rcov_opts =  ['--exclude', '/Library,spec/']
 end
 
-task :spec => :check_dependencies
-
 task :default => :spec
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/activerecord-oracle_enhanced-adapter.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-oracle_enhanced-adapter}
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Raimonds Simanovskis"]
-  s.date = %q{2010-09-09}
+  s.date = %q{2011-01-05}
   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.
 }
@@ -18,86 +18,113 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "Gemfile",
-     "History.txt",
-     "License.txt",
-     "README.rdoc",
-     "RUNNING_TESTS.rdoc",
-     "Rakefile",
-     "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_activerecord_patches.rb",
-     "lib/active_record/connection_adapters/oracle_enhanced_adapter.rb",
-     "lib/active_record/connection_adapters/oracle_enhanced_base_ext.rb",
-     "lib/active_record/connection_adapters/oracle_enhanced_column.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_definitions.rb",
-     "lib/active_record/connection_adapters/oracle_enhanced_schema_dumper.rb",
-     "lib/active_record/connection_adapters/oracle_enhanced_schema_statements.rb",
-     "lib/active_record/connection_adapters/oracle_enhanced_schema_statements_ext.rb",
-     "lib/active_record/connection_adapters/oracle_enhanced_structure_dump.rb",
-     "lib/active_record/connection_adapters/oracle_enhanced_tasks.rb",
-     "lib/active_record/connection_adapters/oracle_enhanced_version.rb",
-     "lib/activerecord-oracle_enhanced-adapter.rb",
-     "spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb",
-     "spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb",
-     "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_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",
-     "spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb",
-     "spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb",
-     "spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb",
-     "spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    ".rspec",
+    "Gemfile",
+    "History.txt",
+    "License.txt",
+    "README.rdoc",
+    "RUNNING_TESTS.rdoc",
+    "Rakefile",
+    "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_activerecord_patches.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced_adapter.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced_base_ext.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced_column.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_definitions.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced_schema_dumper.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced_schema_statements.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced_schema_statements_ext.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced_structure_dump.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced_tasks.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced_version.rb",
+    "lib/activerecord-oracle_enhanced-adapter.rb",
+    "spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb",
+    "spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb",
+    "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_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",
+    "spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb",
+    "spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb",
+    "spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb",
+    "spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/rsim/oracle-enhanced}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.1}
   s.summary = %q{Oracle enhanced adapter for ActiveRecord}
   s.test_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_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",
-     "spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb",
-     "spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb",
-     "spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb",
-     "spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb",
-     "spec/spec_helper.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_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",
+    "spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb",
+    "spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb",
+    "spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb",
+    "spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.4"])
+      s.add_development_dependency(%q<activerecord>, [">= 0"])
+      s.add_development_dependency(%q<activemodel>, [">= 0"])
+      s.add_development_dependency(%q<activesupport>, [">= 0"])
+      s.add_development_dependency(%q<actionpack>, [">= 0"])
+      s.add_development_dependency(%q<railties>, [">= 0"])
+      s.add_development_dependency(%q<arel>, [">= 0"])
+      s.add_development_dependency(%q<rack>, [">= 0"])
+      s.add_development_dependency(%q<ruby-plsql>, [">= 0.4.4"])
+      s.add_development_dependency(%q<ruby-oci8>, ["~> 2.0.4"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_dependency(%q<rspec>, ["~> 2.4"])
+      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<activemodel>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<actionpack>, [">= 0"])
+      s.add_dependency(%q<railties>, [">= 0"])
+      s.add_dependency(%q<arel>, [">= 0"])
+      s.add_dependency(%q<rack>, [">= 0"])
+      s.add_dependency(%q<ruby-plsql>, [">= 0.4.4"])
+      s.add_dependency(%q<ruby-oci8>, ["~> 2.0.4"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+    s.add_dependency(%q<rspec>, ["~> 2.4"])
+    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<activemodel>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<actionpack>, [">= 0"])
+    s.add_dependency(%q<railties>, [">= 0"])
+    s.add_dependency(%q<arel>, [">= 0"])
+    s.add_dependency(%q<rack>, [">= 0"])
+    s.add_dependency(%q<ruby-plsql>, [">= 0.4.4"])
+    s.add_dependency(%q<ruby-oci8>, ["~> 2.0.4"])
   end
 end
 

data/lib/active_record/connection_adapters/oracle_enhanced_activerecord_patches.rb

@@ -6,9 +6,13 @@ if ActiveRecord::VERSION::MAJOR == 2 && ActiveRecord::VERSION::MINOR == 3
     private
     def tables_in_string(string)
       return [] if string.blank?
-      # always convert table names to downcase as in Oracle quoted table names are in uppercase
-      # ignore raw_sql_ that is used by Oracle adapter as alias for limit/offset subqueries
-      string.scan(/([a-zA-Z_][\.\w]+).?\./).flatten.map(&:downcase).uniq - ['raw_sql_']
+      if self.connection.adapter_name == "OracleEnhanced"
+        # always convert table names to downcase as in Oracle quoted table names are in uppercase
+        # ignore raw_sql_ that is used by Oracle adapter as alias for limit/offset subqueries
+        string.scan(/([a-zA-Z_][\.\w]+).?\./).flatten.map(&:downcase).uniq - ['raw_sql_']
+      else
+        string.scan(/([\.a-zA-Z_]+).?\./).flatten
+      end
     end
   end
 

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -80,10 +80,32 @@ module ActiveRecord
     # * <tt>:allow_concurrency</tt> - set to "true" if non-blocking mode should be enabled (just for OCI client)
     # * <tt>:prefetch_rows</tt> - how many rows should be fetched at one time to increase performance, defaults to 100
     # * <tt>:cursor_sharing</tt> - cursor sharing mode to minimize amount of unique statements, defaults to "force"
-    # * <tt>:nls_length_semantics</tt> - semantics of size of VARCHAR2 and CHAR columns, defaults to "CHAR"
-    #   (meaning that size specifies number of characters and not bytes)
     # * <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>
+    # * <tt>:nls_date_language</tt>
+    # * <tt>:nls_dual_currency</tt>
+    # * <tt>:nls_iso_currency</tt>
+    # * <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>
+    # * <tt>:nls_territory</tt>
+    # * <tt>:nls_timestamp_format</tt> - format for :timestamp columns, defaults to <tt>YYYY-MM-DD HH24:MI:SS:FF6</tt>
+    # * <tt>:nls_timestamp_tz_format</tt>
+    # * <tt>:nls_time_format</tt>
+    # * <tt>:nls_time_tz_format</tt>
+    # 
     class OracleEnhancedAdapter < AbstractAdapter
 
       ##
@@ -203,6 +225,7 @@ module ActiveRecord
       def initialize(connection, logger = nil) #:nodoc:
         super
         @quoted_column_names, @quoted_table_names = {}, {}
+        @statements = {}
         @enable_dbms_output = false
       end
 
@@ -224,6 +247,29 @@ module ActiveRecord
         true
       end
 
+      #: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',
+        :nls_date_language       => nil,
+        :nls_dual_currency       => nil,
+        :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,
+        :nls_territory           => nil,
+        :nls_timestamp_format    => 'YYYY-MM-DD HH24:MI:SS:FF6',
+        :nls_timestamp_tz_format => nil,
+        :nls_time_format         => nil,
+        :nls_time_tz_format      => nil
+      }
+
       #:stopdoc:
       NATIVE_DATABASE_TYPES = {
         :primary_key => "NUMBER(38) NOT NULL PRIMARY KEY",
@@ -273,6 +319,12 @@ module ActiveRecord
         IDENTIFIER_MAX_LENGTH
       end
 
+      # To avoid ORA-01795: maximum number of expressions in a list is 1000
+      # tell ActiveRecord to limit us to 1000 ids at a time
+      def in_clause_length
+        1000
+      end
+
       # QUOTING ==================================================
       #
       # see: abstract/quoting.rb
@@ -343,6 +395,12 @@ module ActiveRecord
           # NLS_DATE_FORMAT independent DATE support
           when :date, :time, :datetime
             quote_date_with_to_date(value)
+          when :string
+            # NCHAR and NVARCHAR2 literals should be quoted with N'...'.
+            # Read directly instance variable as otherwise migrations with table column default values are failing
+            # as migrations pass ColumnDefinition object to this method.
+            # Check if instance variable is defined to avoid warnings about accessing undefined instance variable.
+            column.instance_variable_defined?('@nchar') && column.instance_variable_get('@nchar') ? 'N' << super : super
           else
             super
           end
@@ -409,13 +467,20 @@ module ActiveRecord
 
       # Reconnects to the database.
       def reconnect! #:nodoc:
+        clear_cache!
         @connection.reset!
       rescue OracleEnhancedConnectionException => e
         @logger.warn "#{adapter_name} automatic reconnection failed: #{e.message}" if @logger
       end
 
+      def reset!
+        clear_cache!
+        super
+      end
+
       # Disconnects from the database.
       def disconnect! #:nodoc:
+        clear_cache!
         @connection.logoff rescue nil
       end
 
@@ -425,16 +490,67 @@ module ActiveRecord
 
       # Executes a SQL statement
       def execute(sql, name = nil)
-        # hack to pass additional "with_returning" option without changing argument list
-        log(sql, name) { sql.instance_variable_defined?(:@with_returning) && sql.instance_variable_get(:@with_returning) ?
-          @connection.exec_with_returning(sql) : @connection.exec(sql) }
+        log(sql, name) { @connection.exec(sql) }
+      end
+
+      def substitute_for(column, current_values)
+        Arel.sql(":a#{current_values.length + 1}")
+      end
+
+      def clear_cache!
+        @statements.each_value do |cursor|
+          cursor.close
+        end
+        @statements.clear
+      end
+
+      def exec_query(sql, name = 'SQL', binds = [])
+        log(sql, name) do
+          cursor = nil
+          cached = false
+          if binds.empty?
+            cursor = @connection.prepare(sql)
+          else
+            unless @statements.key? sql
+              @statements[sql] = @connection.prepare(sql)
+            end
+
+            cursor = @statements[sql]
+
+            binds = binds.map do |col, val|
+              col ? col.type_cast(val) : val
+            end
+            binds.each_with_index { |val, i| cursor.bind_param(i + 1, val) }
+            cached = true
+          end
+
+          cursor.exec
+          columns = cursor.get_col_names.map do |col_name|
+            @connection.oracle_downcase(col_name)
+          end
+          rows = []
+          fetch_options = {:get_lob_value => (name != 'Writable Large Object')}
+          while row = cursor.fetch(fetch_options)
+            rows << row
+          end
+          res = ActiveRecord::Result.new(columns, rows)
+          cursor.close unless cached
+          res
+        end
+      end
+
+      def supports_statement_cache?
+        true
       end
 
       # 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 = select(sql, name, true)
+        result = columns = nil
+        log(sql, name) do
+          result, columns = @connection.select(sql, name, true)
+        end
         result.map{ |v| columns.map{|c| v[c]} }
       end
 
@@ -447,10 +563,10 @@ module ActiveRecord
           return id_value
         end
 
-        sql_with_returning = sql.dup << @connection.returning_clause(quote_column_name(pk))
-        # hack to pass additional "with_returning" option without changing argument list
-        sql_with_returning.instance_variable_set(:@with_returning, true)
-        execute(sql_with_returning, name)
+        sql_with_returning = sql + @connection.returning_clause(quote_column_name(pk))
+        log(sql, name) do
+          @connection.exec_with_returning(sql_with_returning)
+        end
       end
       protected :insert_sql
 
@@ -463,7 +579,8 @@ module ActiveRecord
       def next_sequence_value(sequence_name)
         # if sequence_name is set to :autogenerated then it means that primary key will be populated by trigger
         return nil if sequence_name == AUTOGENERATED_SEQUENCE_NAME
-        select_one("SELECT #{quote_table_name(sequence_name)}.NEXTVAL id FROM dual")['id']
+        # call directly connection method to avoid prepared statement which causes fetching of next sequence value twice
+        @connection.select_value("SELECT #{quote_table_name(sequence_name)}.NEXTVAL FROM dual")
       end
 
       def begin_db_transaction #:nodoc:
@@ -862,9 +979,15 @@ module ActiveRecord
 
         # 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 = order_by.split(',').map { |s| s.strip }.reject(&:blank?)
+        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
+        end
         order_columns = order_columns.zip((0...order_columns.size).to_a).map do |c, i|
-          "FIRST_VALUE(#{c.split.first}) OVER (PARTITION BY #{columns} ORDER BY #{c}) AS alias_#{i}__"
+          # 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 * ", "
@@ -873,10 +996,12 @@ module ActiveRecord
       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?
 
@@ -902,9 +1027,13 @@ module ActiveRecord
 
       private
 
-      def select(sql, name = nil, return_column_names = false)
-        log(sql, name) do
-          @connection.select(sql, name, return_column_names)
+      def select(sql, name = nil, binds = [])
+        if ActiveRecord.const_defined?(:Result)
+          exec_query(sql, name, binds).to_a
+        else
+          log(sql, name) do
+            @connection.select(sql, name, false)
+          end
         end
       end