rwc9u-activerecord-oracle_enhanced-adapter 1.1.9.5 → 1.2.0

data/lib/active_record/connection_adapters/oracle_enhanced_oci_connection.rb

@@ -0,0 +1,346 @@
+require 'delegate'
+
+begin
+  require 'oci8' unless self.class.const_defined? :OCI8
+
+  # RSI: added mapping for TIMESTAMP / WITH TIME ZONE / LOCAL TIME ZONE types
+  # currently Ruby-OCI8 does not support fractional seconds for timestamps
+  OCI8::BindType::Mapping[OCI8::SQLT_TIMESTAMP] = OCI8::BindType::OraDate
+  OCI8::BindType::Mapping[OCI8::SQLT_TIMESTAMP_TZ] = OCI8::BindType::OraDate
+  OCI8::BindType::Mapping[OCI8::SQLT_TIMESTAMP_LTZ] = OCI8::BindType::OraDate
+rescue LoadError
+  # OCI8 driver is unavailable.
+  error_message = "ERROR: ActiveRecord oracle_enhanced adapter could not load ruby-oci8 library. "+
+                  "Please install ruby-oci8 library or gem."
+  if defined?(RAILS_DEFAULT_LOGGER)
+    RAILS_DEFAULT_LOGGER.error error_message
+  else
+    STDERR.puts error_message
+  end
+  raise LoadError
+end
+
+module ActiveRecord
+  module ConnectionAdapters
+
+    # OCI database interface for MRI
+    class OracleEnhancedOCIConnection < OracleEnhancedConnection
+
+      def initialize(config)
+        @raw_connection = OCI8EnhancedAutoRecover.new(config, OracleEnhancedOCIFactory)
+      end
+
+      def auto_retry
+        @raw_connection.auto_retry if @raw_connection
+      end
+
+      def auto_retry=(value)
+        @raw_connection.auto_retry = value if @raw_connection
+      end
+
+      def logoff
+        @raw_connection.logoff
+        @raw_connection.active = false
+      end
+
+      def commit
+        @raw_connection.commit
+      end
+
+      def rollback
+        @raw_connection.rollback
+      end
+
+      def autocommit?
+        @raw_connection.autocommit?
+      end
+
+      def autocommit=(value)
+        @raw_connection.autocommit = value
+      end
+
+      # Checks connection, returns true if active. Note that ping actively
+      # checks the connection, while #active? simply returns the last
+      # known state.
+      def ping
+        @raw_connection.ping
+      rescue OCIException => e
+        raise OracleEnhancedConnectionException, e.message
+      end
+
+      def active?
+        @raw_connection.active?
+      end
+
+      def reset!
+        @raw_connection.reset!
+      rescue OCIException => e
+        raise OracleEnhancedConnectionException, e.message
+      end
+
+      def exec(sql, *bindvars, &block)
+        @raw_connection.exec(sql, *bindvars, &block)
+      end
+
+      def select(sql, name = nil, return_column_names = false)
+        cursor = @raw_connection.exec(sql)
+        cols = cursor.get_col_names.map { |x| oracle_downcase(x) }
+        rows = []
+
+        while row = cursor.fetch
+          hash = Hash.new
+
+          cols.each_with_index do |col, i|
+            hash[col] =
+              case row[i]
+              when OCI8::LOB
+                if name == 'Writable Large Object'
+                  row[i]
+                else
+                  data =  row[i].read
+                  # In Ruby 1.9.1 always change encoding to ASCII-8BIT for binaries
+                  data.force_encoding('ASCII-8BIT') if data.respond_to?(:force_encoding) && row[i].is_a?(OCI8::BLOB)
+                  data
+                end
+              # ruby-oci8 1.0 returns OraDate
+              when OraDate
+                d = row[i]
+                # RSI: added emulate_dates_by_column_name functionality
+                # if emulate_dates_by_column_name && self.class.is_date_column?(col)
+                #   d.to_date
+                # elsif
+                if OracleEnhancedAdapter.emulate_dates && (d.hour == 0 && d.minute == 0 && d.second == 0)
+                  d.to_date
+                else
+                  # code from Time.time_with_datetime_fallback
+                  begin
+                    Time.send(Base.default_timezone, d.year, d.month, d.day, d.hour, d.minute, d.second)
+                  rescue
+                    offset = Base.default_timezone.to_sym == :local ? ::DateTime.local_offset : 0
+                    ::DateTime.civil(d.year, d.month, d.day, d.hour, d.minute, d.second, offset)
+                  end
+                end
+              # ruby-oci8 2.0 returns Time or DateTime
+              when Time, DateTime
+                d = row[i]
+                if OracleEnhancedAdapter.emulate_dates && (d.hour == 0 && d.min == 0 && d.sec == 0)
+                  d.to_date
+                else
+                  # recreate Time or DateTime using Base.default_timezone
+                  begin
+                    Time.send(Base.default_timezone, d.year, d.month, d.day, d.hour, d.min, d.sec)
+                  rescue
+                    offset = Base.default_timezone.to_sym == :local ? ::DateTime.local_offset : 0
+                    ::DateTime.civil(d.year, d.month, d.day, d.hour, d.min, d.sec, offset)
+                  end
+                end
+              # RSI: added emulate_integers_by_column_name functionality
+              when Float
+                n = row[i]
+                if OracleEnhancedAdapter.emulate_integers_by_column_name && OracleEnhancedAdapter.is_integer_column?(col)
+                  n.to_i
+                else
+                  n
+                end
+              # ruby-oci8 2.0 returns OraNumber - convert it to Integer or BigDecimal
+              when OraNumber
+                n = row[i]
+                n == (n_to_i = n.to_i) ? n_to_i : BigDecimal.new(n.to_s)
+              else row[i]
+              end unless col == 'raw_rnum_'
+          end
+
+          rows << hash
+        end
+
+        return_column_names ? [rows, cols] : rows
+      ensure
+        cursor.close if cursor
+      end
+
+      def write_lob(lob, value, is_binary = false)
+        lob.write value
+      end
+      
+      def describe(name)
+        quoted_name = OracleEnhancedAdapter.valid_table_name?(name) ? name : "\"#{name}\""
+        @raw_connection.describe(quoted_name)
+      rescue OCIException => e
+        raise OracleEnhancedConnectionException, e.message
+      end
+      
+    end
+    
+    # The OracleEnhancedOCIFactory factors out the code necessary to connect and
+    # configure an Oracle/OCI connection.
+    class OracleEnhancedOCIFactory #:nodoc:
+      def self.new_connection(config)
+        username, password, database = config[:username].to_s, config[:password].to_s, config[:database].to_s
+        privilege = config[:privilege] && config[:privilege].to_sym
+        async = config[:allow_concurrency]
+        prefetch_rows = config[:prefetch_rows] || 100
+        cursor_sharing = config[:cursor_sharing] || 'similar'
+
+        conn = OCI8.new username, password, database, privilege
+        conn.exec %q{alter session set nls_date_format = 'YYYY-MM-DD HH24:MI:SS'}
+        conn.exec %q{alter session set nls_timestamp_format = 'YYYY-MM-DD HH24:MI:SS'} rescue nil
+        conn.autocommit = true
+        conn.non_blocking = true if async
+        conn.prefetch_rows = prefetch_rows
+        conn.exec "alter session set cursor_sharing = #{cursor_sharing}" rescue nil
+        conn
+      end
+    end
+    
+    
+  end
+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?
+      [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
+# reset functionality. If a call to #exec fails, and autocommit is turned on
+# (ie., we're not in the middle of a longer transaction), it will
+# automatically reconnect and try again. If autocommit is turned off,
+# this would be dangerous (as the earlier part of the implied transaction
+# may have failed silently if the connection died) -- so instead the
+# connection is marked as dead, to be reconnected on it's next use.
+class OCI8EnhancedAutoRecover < DelegateClass(OCI8) #:nodoc:
+  attr_accessor :active
+  alias :active? :active
+
+  cattr_accessor :auto_retry
+  class << self
+    alias :auto_retry? :auto_retry
+  end
+  @@auto_retry = false
+
+  def initialize(config, factory)
+    @active = true
+    @config = config
+    @factory = factory
+    @connection  = @factory.new_connection @config
+    super @connection
+  end
+
+  # Checks connection, returns true if active. Note that ping actively
+  # checks the connection, while #active? simply returns the last
+  # known state.
+  def ping
+    @connection.exec("select 1 from dual") { |r| nil }
+    @active = true
+  rescue
+    @active = false
+    raise
+  end
+
+  # Resets connection, by logging off and creating a new connection.
+  def reset!
+    logoff rescue nil
+    begin
+      @connection = @factory.new_connection @config
+      __setobj__ @connection
+      @active = true
+    rescue
+      @active = false
+      raise
+    end
+  end
+
+  # ORA-00028: your session has been killed
+  # ORA-01012: not logged on
+  # ORA-03113: end-of-file on communication channel
+  # ORA-03114: not connected to ORACLE
+  # ORA-03135: connection lost contact
+  LOST_CONNECTION_ERROR_CODES = [ 28, 1012, 3113, 3114, 3135 ]
+
+  # Adds auto-recovery functionality.
+  #
+  # See: http://www.jiubao.org/ruby-oci8/api.en.html#label-11
+  def exec(sql, *bindvars, &block)
+    should_retry = self.class.auto_retry? && autocommit?
+
+    begin
+      @connection.exec(sql, *bindvars, &block)
+    rescue OCIException => e
+      raise unless LOST_CONNECTION_ERROR_CODES.include?(e.code)
+      @active = false
+      raise unless should_retry
+      should_retry = false
+      reset! rescue nil
+      retry
+    end
+  end
+
+  # RSI: otherwise not working in Ruby 1.9.1
+  if RUBY_VERSION =~ /^1\.9/
+    def describe(name)
+      @connection.describe(name)
+    end
+  end
+
+end

data/lib/active_record/connection_adapters/oracle_enhanced_procedures.rb

@@ -40,7 +40,8 @@ module ActiveRecord #:nodoc:
           base.instance_eval do
             alias_method_chain :create, :custom_method
             # insert after dirty checking in Rails 2.1
-            if private_instance_methods.include?('update_without_dirty')
+            # in Ruby 1.9 methods names are returned as symbols
+            if private_instance_methods.include?('update_without_dirty') || private_instance_methods.include?(:update_without_dirty)
               alias_method :update_without_custom_method, :update_without_dirty
               alias_method :update_without_dirty, :update_with_custom_method
             else

data/lib/active_record/connection_adapters/oracle_enhanced_version.rb

@@ -2,8 +2,8 @@ module ActiveRecord #:nodoc:
   module ConnectionAdapters #:nodoc:
     module OracleEnhancedVersion #:nodoc:
       MAJOR = 1
-      MINOR = 1
-      TINY  = 9
+      MINOR = 2
+      TINY  = 0
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/oracle-enhanced.gemspec

@@ -1,16 +1,40 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-oracle_enhanced-adapter}
-  s.version = "1.1.9.5"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Raimonds Simanovskis (patched by Rob Christie"]
-  s.date = %q{2009-01-21}
-  s.description = %q{Oracle enhanced adapter for Active Record. Additional patches to support ActiveRecord unit tests}
-  s.email = ["robchristie@gmail.com"]
+  s.authors = ["Raimonds Simanovskis"]
+  s.date = %q{2009-03-22}
+  s.description = %q{Oracle enhanced adapter for ActiveRecord}
+  s.email = ["raimonds.simanovskis@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "README.txt"]
-  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "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_cpk.rb", "lib/active_record/connection_adapters/oracle_enhanced_dirty.rb", "lib/active_record/connection_adapters/oracle_enhanced_procedures.rb", "lib/active_record/connection_adapters/oracle_enhanced_reserved_words.rb", "lib/active_record/connection_adapters/oracle_enhanced_tasks.rb", "lib/active_record/connection_adapters/oracle_enhanced_version.rb", "oracle-enhanced.gemspec", "spec/active_record/connection_adapters/oracle_enhanced_adapter_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_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/spec.opts", "spec/spec_helper.rb"]
+  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.txt",
+    "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_connection.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_reserved_words.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced_tasks.rb",
+    "lib/active_record/connection_adapters/oracle_enhanced_version.rb",
+    "oracle-enhanced.gemspec",
+    "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_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_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/spec.opts",
+    "spec/spec_helper.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://oracle-enhanced.rubyforge.org}
   s.post_install_message = %q{}
@@ -18,7 +42,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{oracle-enhanced}
   s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Oracle enhanced adapter for Active Record}
+  s.summary = %q{Oracle enhanced adapter for ActiveRecord}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -3,61 +3,75 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 describe "OracleEnhancedAdapter establish connection" do
 
   it "should connect to database" do
-    ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
-                                            :database => "xe",
-                                            :username => "hr",
-                                            :password => "hr")
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     ActiveRecord::Base.connection.should_not be_nil
     ActiveRecord::Base.connection.class.should == ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter
   end
 
   it "should connect to database as SYSDBA" do
-    ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
-                                            :database => "xe",
-                                            :username => "sys",
-                                            :password => "manager",
-                                            :privilege => :SYSDBA)
+    ActiveRecord::Base.establish_connection(SYS_CONNECTION_PARAMS)
     ActiveRecord::Base.connection.should_not be_nil
     ActiveRecord::Base.connection.class.should == ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter
   end
 
+  it "should be active after connection to database" do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    ActiveRecord::Base.connection.should be_active
+  end
+
+  it "should not be active after disconnection to database" do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    ActiveRecord::Base.connection.disconnect!
+    ActiveRecord::Base.connection.should_not be_active
+  end
+
+  it "should be active after reconnection to database" do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    ActiveRecord::Base.connection.reconnect!
+    ActiveRecord::Base.connection.should be_active
+  end
+
 end
 
 describe "OracleEnhancedAdapter schema dump" do
 
   before(:all) do
-    @old_conn = ActiveRecord::Base.oracle_connection(
-                                            :database => "xe",
-                                            :username => "hr",
-                                            :password => "hr")
-    @old_conn.class.should == ActiveRecord::ConnectionAdapters::OracleAdapter
-    @new_conn = ActiveRecord::Base.oracle_enhanced_connection(
-                                            :database => "xe",
-                                            :username => "hr",
-                                            :password => "hr")
+    if !defined?(RUBY_ENGINE)
+      @old_conn = ActiveRecord::Base.oracle_connection(CONNECTION_PARAMS)
+      @old_conn.class.should == ActiveRecord::ConnectionAdapters::OracleAdapter
+    elsif RUBY_ENGINE == 'jruby'
+      @old_conn = ActiveRecord::Base.jdbc_connection(JDBC_CONNECTION_PARAMS)
+      @old_conn.class.should == ActiveRecord::ConnectionAdapters::JdbcAdapter
+    end
+
+    @new_conn = ActiveRecord::Base.oracle_enhanced_connection(CONNECTION_PARAMS)
     @new_conn.class.should == ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter
   end
 
-  it "should return the same tables list as original oracle adapter" do
-    @new_conn.tables.should == @old_conn.tables
-  end
+  unless defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby" && RUBY_VERSION =~ /^1\.9/
+    it "should return the same tables list as original oracle adapter" do
+      @new_conn.tables.sort.should == @old_conn.tables.sort
+    end
 
-  it "should return the same index list as original oracle adapter" do
-    @new_conn.indexes('employees').should == @old_conn.indexes('employees')
-  end
+    it "should return the same index list as original oracle adapter" do
+      @new_conn.indexes('employees').sort_by(&:name).should == @old_conn.indexes('employees').sort_by(&:name)
+    end
 
-  it "should return the same pk_and_sequence_for as original oracle adapter" do
-    @new_conn.tables.each do |t|
-      @new_conn.pk_and_sequence_for(t).should == @old_conn.pk_and_sequence_for(t)
+    it "should return the same pk_and_sequence_for as original oracle adapter" do
+      if @old_conn.respond_to?(:pk_and_sequence_for)
+        @new_conn.tables.each do |t|
+          @new_conn.pk_and_sequence_for(t).should == @old_conn.pk_and_sequence_for(t)
+        end
+      end
     end
-  end
 
-  it "should return the same structure dump as original oracle adapter" do
-    @new_conn.structure_dump.should == @old_conn.structure_dump
-  end
+    it "should return the same structure dump as original oracle adapter" do
+      @new_conn.structure_dump.should == @old_conn.structure_dump
+    end
 
-  it "should return the same structure drop as original oracle adapter" do
-    @new_conn.structure_drop.should == @old_conn.structure_drop
+    it "should return the same structure drop as original oracle adapter" do
+      @new_conn.structure_drop.should == @old_conn.structure_drop
+    end
   end
 
   it "should return the character size of nvarchar fields" do
@@ -75,10 +89,7 @@ end
 
 describe "OracleEnhancedAdapter database stucture dump extentions" do
   before(:all) do
-    ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
-                                            :database => "xe",
-                                            :username => "hr",
-                                            :password => "hr")
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE nvarchartable (
@@ -100,10 +111,7 @@ end
 
 describe "OracleEnhancedAdapter database session store" do
   before(:all) do
-    ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
-                                            :database => "xe",
-                                            :username => "hr",
-                                            :password => "hr")
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE sessions (
@@ -119,6 +127,11 @@ describe "OracleEnhancedAdapter database session store" do
       CREATE SEQUENCE sessions_seq  MINVALUE 1 MAXVALUE 999999999999999999999999999
         INCREMENT BY 1 START WITH 10040 CACHE 20 NOORDER NOCYCLE
     SQL
+    if ENV['RAILS_GEM_VERSION'] >= '2.3'
+      @session_class = ActiveRecord::SessionStore::Session
+    else
+      @session_class = CGI::Session::ActiveRecordStore::Session
+    end
   end
 
   after(:all) do
@@ -131,29 +144,29 @@ describe "OracleEnhancedAdapter database session store" do
   end
 
   it "should save session data" do
-    @session = CGI::Session::ActiveRecordStore::Session.new :session_id => "111111", :data  => "something" #, :updated_at => Time.now
+    @session = @session_class.new :session_id => "111111", :data  => "something" #, :updated_at => Time.now
     @session.save!
-    @session = CGI::Session::ActiveRecordStore::Session.find_by_session_id("111111")
+    @session = @session_class.find_by_session_id("111111")
     @session.data.should == "something"
   end
 
   it "should change session data when partial updates enabled" do
-    return pending("Not in this ActiveRecord version") unless CGI::Session::ActiveRecordStore::Session.respond_to?(:partial_updates=)
-    CGI::Session::ActiveRecordStore::Session.partial_updates = true
-    @session = CGI::Session::ActiveRecordStore::Session.new :session_id => "222222", :data  => "something" #, :updated_at => Time.now
+    return pending("Not in this ActiveRecord version") unless @session_class.respond_to?(:partial_updates=)
+    @session_class.partial_updates = true
+    @session = @session_class.new :session_id => "222222", :data  => "something" #, :updated_at => Time.now
     @session.save!
-    @session = CGI::Session::ActiveRecordStore::Session.find_by_session_id("222222")
+    @session = @session_class.find_by_session_id("222222")
     @session.data = "other thing"
     @session.save!
     # second save should call again blob writing callback
     @session.save!
-    @session = CGI::Session::ActiveRecordStore::Session.find_by_session_id("222222")
+    @session = @session_class.find_by_session_id("222222")
     @session.data.should == "other thing"
   end
 
   it "should have one enhanced_write_lobs callback" do
-    return pending("Not in this ActiveRecord version") unless CGI::Session::ActiveRecordStore::Session.respond_to?(:after_save_callback_chain)
-    CGI::Session::ActiveRecordStore::Session.after_save_callback_chain.select{|cb| cb.method == :enhanced_write_lobs}.should have(1).record
+    return pending("Not in this ActiveRecord version") unless @session_class.respond_to?(:after_save_callback_chain)
+    @session_class.after_save_callback_chain.select{|cb| cb.method == :enhanced_write_lobs}.should have(1).record
   end
 
   it "should not set sessions table session_id column type as integer if emulate_integers_by_column_name is true" do
@@ -167,10 +180,7 @@ end
 
 describe "OracleEnhancedAdapter ignore specified table columns" do
   before(:all) do
-    ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
-                                            :database => "xe",
-                                            :username => "hr",
-                                            :password => "hr")
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE test_employees (
@@ -204,14 +214,14 @@ describe "OracleEnhancedAdapter ignore specified table columns" do
   end
 
   it "should ignore specified table columns" do
-    class TestEmployee < ActiveRecord::Base
+    class ::TestEmployee < ActiveRecord::Base
       ignore_table_columns  :phone_number, :hire_date
     end
     TestEmployee.connection.columns('test_employees').select{|c| ['phone_number','hire_date'].include?(c.name) }.should be_empty
   end
 
   it "should ignore specified table columns specified in several lines" do
-    class TestEmployee < ActiveRecord::Base
+    class ::TestEmployee < ActiveRecord::Base
       ignore_table_columns  :phone_number
       ignore_table_columns  :hire_date
     end
@@ -219,7 +229,7 @@ describe "OracleEnhancedAdapter ignore specified table columns" do
   end
 
   it "should not ignore unspecified table columns" do
-    class TestEmployee < ActiveRecord::Base
+    class ::TestEmployee < ActiveRecord::Base
       ignore_table_columns  :phone_number, :hire_date
     end
     TestEmployee.connection.columns('test_employees').select{|c| c.name == 'email' }.should_not be_empty
@@ -231,10 +241,7 @@ end
 describe "OracleEnhancedAdapter table and sequence creation with non-default primary key" do
 
   before(:all) do
-    ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
-                                            :database => "xe",
-                                            :username => "hr",
-                                            :password => "hr")
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     ActiveRecord::Schema.define do
       suppress_messages do
         create_table :keyboards, :force => true, :id  => false do |t|
@@ -246,10 +253,10 @@ describe "OracleEnhancedAdapter table and sequence creation with non-default pri
         end
       end
     end
-    class Keyboard < ActiveRecord::Base
+    class ::Keyboard < ActiveRecord::Base
       set_primary_key :key_number
     end
-    class IdKeyboard < ActiveRecord::Base
+    class ::IdKeyboard < ActiveRecord::Base
     end
   end
 
@@ -276,12 +283,9 @@ end
 describe "OracleEnhancedAdapter without composite_primary_keys" do
 
   before(:all) do
-    ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
-                                            :database => "xe",
-                                            :username => "hr",
-                                            :password => "hr")
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     Object.send(:remove_const, 'CompositePrimaryKeys') if defined?(CompositePrimaryKeys)
-    class Employee < ActiveRecord::Base
+    class ::Employee < ActiveRecord::Base
       set_primary_key :employee_id
     end
   end
@@ -299,10 +303,7 @@ end
 describe "OracleEnhancedAdapter sequence creation parameters" do
 
   before(:all) do
-    ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
-                                            :database => "xe",
-                                            :username => "hr",
-                                            :password => "hr")
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
   end
 
   def create_test_employees_table(sequence_start_value = nil)
@@ -341,7 +342,7 @@ describe "OracleEnhancedAdapter sequence creation parameters" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_sequence_start_value.should == 10000
 
     create_test_employees_table
-    class TestEmployee < ActiveRecord::Base; end
+    class ::TestEmployee < ActiveRecord::Base; end
 
     employee = TestEmployee.create!
     employee.id.should == 10000
@@ -351,7 +352,7 @@ describe "OracleEnhancedAdapter sequence creation parameters" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_sequence_start_value = 1
 
     create_test_employees_table
-    class TestEmployee < ActiveRecord::Base; end
+    class ::TestEmployee < ActiveRecord::Base; end
 
     employee = TestEmployee.create!
     employee.id.should == 1
@@ -359,7 +360,7 @@ describe "OracleEnhancedAdapter sequence creation parameters" do
 
   it "should use sequence start value from table definition" do
     create_test_employees_table(10)
-    class TestEmployee < ActiveRecord::Base; end
+    class ::TestEmployee < ActiveRecord::Base; end
 
     employee = TestEmployee.create!
     employee.id.should == 10
@@ -367,7 +368,7 @@ describe "OracleEnhancedAdapter sequence creation parameters" do
 
   it "should use sequence start value and other options from table definition" do
     create_test_employees_table("100 NOCACHE INCREMENT BY 10")
-    class TestEmployee < ActiveRecord::Base; end
+    class ::TestEmployee < ActiveRecord::Base; end
 
     employee = TestEmployee.create!
     employee.id.should == 100
@@ -380,10 +381,7 @@ end
 describe "OracleEnhancedAdapter table and column comments" do
 
   before(:all) do
-    ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
-                                            :database => "xe",
-                                            :username => "hr",
-                                            :password => "hr")
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
   end
 
@@ -411,7 +409,7 @@ describe "OracleEnhancedAdapter table and column comments" do
   it "should create table with table comment" do
     table_comment = "Test Employees"
     create_test_employees_table(table_comment)
-    class TestEmployee < ActiveRecord::Base; end
+    class ::TestEmployee < ActiveRecord::Base; end
 
     @conn.table_comment("test_employees").should == table_comment
     TestEmployee.table_comment.should == table_comment
@@ -420,7 +418,7 @@ describe "OracleEnhancedAdapter table and column comments" do
   it "should create table with columns comment" do
     column_comments = {:first_name => "Given Name", :last_name => "Surname"}
     create_test_employees_table(nil, column_comments)
-    class TestEmployee < ActiveRecord::Base; end
+    class ::TestEmployee < ActiveRecord::Base; end
 
     [:first_name, :last_name].each do |attr|
       @conn.column_comment("test_employees", attr.to_s).should == column_comments[attr]
@@ -435,7 +433,7 @@ describe "OracleEnhancedAdapter table and column comments" do
     table_comment = "Test Employees"
     column_comments = {:first_name => "Given Name", :last_name => "Surname"}
     create_test_employees_table(table_comment, column_comments)
-    class TestEmployee < ActiveRecord::Base; end
+    class ::TestEmployee < ActiveRecord::Base; end
 
     @conn.table_comment(TestEmployee.table_name).should == table_comment
     TestEmployee.table_comment.should == table_comment
@@ -452,10 +450,7 @@ end
 describe "OracleEnhancedAdapter column quoting" do
 
   before(:all) do
-    ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
-                                            :database => "xe",
-                                            :username => "hr",
-                                            :password => "hr")
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
   end
 
@@ -482,7 +477,7 @@ describe "OracleEnhancedAdapter column quoting" do
 
   it "should allow creation of a table with oracle reserved words as column names" do
     create_test_reserved_words_table
-    class TestReservedWord < ActiveRecord::Base; end
+    class ::TestReservedWord < ActiveRecord::Base; end
 
     [:varchar2, :integer].each do |attr|
       TestReservedWord.columns_hash[attr.to_s].name.should == attr.to_s
@@ -491,13 +486,36 @@ describe "OracleEnhancedAdapter column quoting" do
 
 end
 
+describe "OracleEnhancedAdapter valid table names" do
+  before(:all) do
+    @adapter = ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter
+  end
+  it "should be valid with letters and digits" do
+    @adapter.valid_table_name?("abc_123").should be_true
+  end
+
+  it "should be valid with schema name" do
+    @adapter.valid_table_name?("abc_123.def_456").should be_true
+  end
+
+  it "should be valid with $ in name" do
+    @adapter.valid_table_name?("sys.v$session").should be_true
+  end
+
+  it "should not be valid with two dots in name" do
+    @adapter.valid_table_name?("abc_123.def_456.ghi_789").should be_false
+  end
+
+  it "should not be valid with invalid characters" do
+    @adapter.valid_table_name?("warehouse-things").should be_false
+  end
+
+end
+
 describe "OracleEnhancedAdapter table quoting" do
 
   before(:all) do
-    ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
-                                            :database => "xe",
-                                            :username => "hr",
-                                            :password => "hr")
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
   end
 
@@ -524,7 +542,7 @@ describe "OracleEnhancedAdapter table quoting" do
 
   it "should allow creation of a table with non alphanumeric characters" do
     create_warehouse_things_table
-    class WarehouseThing < ActiveRecord::Base
+    class ::WarehouseThing < ActiveRecord::Base
       set_table_name "warehouse-things"
     end