activerecord-oracle_enhanced-adapter 1.2.2 → 1.2.3

data/.gitignore

@@ -0,0 +1,10 @@
+.svn
+.DS_Store
+coverage
+doc
+pkg
+log
+tmp
+sqlnet.log
+activerecord-oracle_enhanced-adapter.gemspec
+

data/History.txt

@@ -1,3 +1,23 @@
+== 1.2.3 2009-12-09
+
+* Enhancements
+  * support fractional seconds in TIMESTAMP values
+  * support for ActiveRecord 2.3.5
+  * use ENV['TZ'] to set database session time zone
+    (as a result DATE and TIMESTAMP values are retrieved with correct time zone)
+  * added cache_columns adapter option
+  * added current_user adapter method
+  * added set_integer_columns and set_string_columns ActiveRecord model class methods
+* Bug fixes:
+  * do not raise exception if ENV['PATH'] is nil
+  * do not add change_table behavior for ActiveRecord 2.0 (to avoid exception during loading)
+  * move foreign key definitions after definition of all tables in schema.rb
+    (to avoid definition of foreign keys before all tables are created)
+  * changed timestamp format mask to use ':' before fractional seconds
+    (workaround to avoid table detection in tables_in_string method in ActiveRecord associations.rb file)
+  * fixed custom create/update/delete methods with ActiveRecord 2.3+ and timestamps
+  * do not call oracle_enhanced specific schema dump methods when using other database adapters
+
 == 1.2.2 2009-09-28
 
 * Enhancements

data/Manifest.txt

@@ -0,0 +1,32 @@
+History.txt
+License.txt
+README.rdoc
+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_schema_definitions.rb
+lib/active_record/connection_adapters/oracle_enhanced_schema_dumper.rb
+lib/active_record/connection_adapters/oracle_enhanced_schema_statements_ext.rb
+lib/active_record/connection_adapters/oracle_enhanced_tasks.rb
+lib/active_record/connection_adapters/oracle_enhanced_version.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_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_spec.rb
+spec/spec.opts
+spec/spec_helper.rb

data/README.rdoc

@@ -1,27 +1,23 @@
-= Activerecord Oracle enhanced adapter
+= activerecord-oracle_enhanced-adapter
 
-* http://github.com/rsim/oracle-enhanced
+Oracle enhanced adapter for ActiveRecord
 
 == DESCRIPTION:
 
 Oracle "enhanced" ActiveRecord adapter contains useful additional methods for working with new and legacy Oracle databases
 from Rails which are extracted from current real projects' monkey patches of original Oracle adapter.
 
-See http://github.com/rsim/oracle-enhanced/wikis for usage information.
-
-See http://oracle-enhanced.rubyforge.org/rdoc for detailed API documentation.
+See http://wiki.github.com/rsim/oracle-enhanced for usage information.
 
 For questions and feature discussion please use http://groups.google.com/group/oracle-enhanced
 
 Blog posts about oracle-enahnced can be found at http://blog.rayapps.com/category/oracle-enhanced
 
-Bugs and enhancement requests can be reported at http://rsim.lighthouseapp.com/projects/11468-oracle-enhanced
-
 == REQUIREMENTS:
 
 * Works (has been tested) with ActiveRecord version 2.0, 2.1, 2.2 and 2.3 (these are the same as Rails versions)
 * Can be used on the following Ruby platforms:
-  * MRI - requires ruby-oci8 1.x or 2.x library to connect to Oracle
+  * MRI - requires ruby-oci8 1.x or 2.x gem to connect to Oracle (2.0.3 or later recommended)
   * Ruby/YARV 1.9.1 - requires ruby-oci8 2.x library to connect to Oracle
     unicode_utils gem is recommended for Unicode aware string upcase and downcase
   * JRuby - uses JDBC driver ojdbc14.jar to connect to Oracle (should be in JRUBY_HOME/lib or in Java class path)
@@ -31,6 +27,14 @@ Bugs and enhancement requests can be reported at http://rsim.lighthouseapp.com/p
 
 * [sudo] gem install activerecord-oracle_enhanced-adapter
 
+In addition install either ruby-oci8 (for MRI/YARV) or copy Oracle JDBC driver to $JRUBY_HOME/lib (for JRuby).
+
+== LINKS
+
+* Source code: http://github.com/rsim/oracle-enhanced
+* Bug reports / Feature requests: http://github.com/rsim/oracle-enhanced/issues
+* Discuss at oracle_enhanced adapter group: http://groups.google.com/group/oracle-enhanced
+
 == CONTRIBUTORS:
 
 * Raimonds Simanovskis

data/Rakefile

@@ -0,0 +1,49 @@
+require 'rubygems'
+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
+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_dependency "activerecord", ">= 2.0.0"
+    gem.add_development_dependency "rspec", ">= 1.2.9"
+    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"
+end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :spec => :check_dependencies
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'doc'
+  rdoc.title = "activerecord-oracle_enhanced-adapter #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+1.2.3

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -78,6 +78,23 @@ module ActiveRecord
       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_integer_columns :active_flag
+    def self.set_string_columns(*args)
+      connection.set_type_for_columns(table_name,:string,*args)
+    end
+
     # After setting large objects to empty, select the OCI8::LOB
     # and write back the data.
     after_save :enhanced_write_lobs
@@ -170,23 +187,24 @@ module ActiveRecord
       
       private
       def simplified_type(field_type)
-        return :boolean if OracleEnhancedAdapter.emulate_booleans && field_type == 'NUMBER(1)'
-        return :boolean if OracleEnhancedAdapter.emulate_booleans_from_strings &&
-                          (forced_column_type == :boolean ||
-                          OracleEnhancedAdapter.is_boolean_column?(name, field_type, table_name))
-        
+        forced_column_type ||
         case field_type
+          when /decimal|numeric|number/i
+            return :boolean if OracleEnhancedAdapter.emulate_booleans && field_type == 'NUMBER(1)'
+            return :integer if extract_scale(field_type) == 0
+            # if column name is ID or ends with _ID
+            return :integer if OracleEnhancedAdapter.emulate_integers_by_column_name && OracleEnhancedAdapter.is_integer_column?(name, table_name)
+            :decimal
+          when /char/i
+            return :boolean if OracleEnhancedAdapter.emulate_booleans_from_strings &&
+                               OracleEnhancedAdapter.is_boolean_column?(name, field_type, table_name)
+            :string
           when /date/i
             forced_column_type ||
             (:date if OracleEnhancedAdapter.emulate_dates_by_column_name && OracleEnhancedAdapter.is_date_column?(name, table_name)) ||
             :datetime
           when /timestamp/i then :timestamp
           when /time/i then :datetime
-          when /decimal|numeric|number/i
-            return :integer if extract_scale(field_type) == 0
-            # if column name is ID or ends with _ID
-            return :integer if OracleEnhancedAdapter.emulate_integers_by_column_name && OracleEnhancedAdapter.is_integer_column?(name, table_name)
-            :decimal
           else super
         end
       end
@@ -263,6 +281,8 @@ module ActiveRecord
     # * <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)
     class OracleEnhancedAdapter < AbstractAdapter
 
       ##
@@ -363,12 +383,16 @@ module ActiveRecord
         bool ? "Y" : "N"
       end
 
+      ##
+      # :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”
@@ -490,8 +514,8 @@ module ActiveRecord
 
       def quote_timestamp_with_to_timestamp(value) #:nodoc:
         # add up to 9 digits of fractional seconds to inserted time
-        value = "#{quoted_date(value)}.#{("%.6f"%value.to_f).split('.')[1]}" if value.acts_like?(:time)
-        "TO_TIMESTAMP('#{value}','YYYY-MM-DD HH24:MI:SS.FF6')"
+        value = "#{quoted_date(value)}:#{("%.6f"%value.to_f).split('.')[1]}" if value.acts_like?(:time)
+        "TO_TIMESTAMP('#{value}','YYYY-MM-DD HH24:MI:SS:FF6')"
       end
 
       # CONNECTION MANAGEMENT ====================================
@@ -689,10 +713,16 @@ module ActiveRecord
       #
       # see: abstract/schema_statements.rb
 
-      def current_database #:nodoc:
+      # current database name
+      def current_database
         select_one("select sys_context('userenv','db_name') db from dual")["db"]
       end
 
+      # current database session user
+      def current_user
+        select_one("select sys_context('userenv','session_user') u from dual")['u']
+      end
+
       def tables(name = nil) #:nodoc:
         # changed select from user_tables to all_tables - much faster in large data dictionaries
         select_all("select decode(table_name,upper(table_name),lower(table_name),table_name) name from all_tables where owner = sys_context('userenv','session_user')").map {|t| t['name']}
@@ -793,7 +823,27 @@ module ActiveRecord
         select_value(pkt_sql) ? true : false
       end
 
+      ##
+      # :singleton-method:
+      # Cache column description between requests.
+      # Could be used in development environment to avoid selecting table columns from data dictionary tables for each request.
+      # This can speed up request processing in development mode if development database is not on local computer.
+      #
+      #   ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = true
+      cattr_accessor :cache_columns
+      self.cache_columns = false
+
       def columns(table_name, name = nil) #:nodoc:
+        # Don't double cache if config.cache_classes is turned on
+        if @@cache_columns && !(defined?(Rails) && Rails.configuration.cache_classes)
+          @@columns_cache ||= {}
+          @@columns_cache[table_name] ||= columns_without_cache(table_name, name)
+        else
+          columns_without_cache(table_name, name)
+        end
+      end
+
+      def columns_without_cache(table_name, name = nil) #:nodoc:
         # get ignored_columns by original table name
         ignored_columns = ignored_table_columns(table_name)
 
@@ -844,6 +894,11 @@ module ActiveRecord
         end
       end
 
+      # used just in tests to clear column cache
+      def clear_columns_cache #:nodoc:
+        @@columns_cache = nil
+      end
+
       ##
       # :singleton-method:
       # Specify default sequence start with value (by default 10000 if not explicitly set), e.g.:
@@ -1379,3 +1434,4 @@ require 'active_record/connection_adapters/oracle_enhanced_schema_definitions'
 # 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'

data/lib/active_record/connection_adapters/oracle_enhanced_jdbc_connection.rb

@@ -7,11 +7,9 @@ begin
   ojdbc_jar = "ojdbc14.jar"
 
   unless ENV_JAVA['java.class.path'] =~ Regexp.new(ojdbc_jar)
-    # Adds JRuby classloader to current thread classloader - as a result ojdbc14.jar should not be in $JRUBY_HOME/lib
-    # not necessary anymore for JRuby 1.3
-    # java.lang.Thread.currentThread.setContextClassLoader(JRuby.runtime.jruby_class_loader)
-
-    if ojdbc_jar_path = ENV["PATH"].split(/[:;]/).concat($LOAD_PATH).find{|d| File.exists?(File.join(d,ojdbc_jar))}
+    # On Unix environment variable should be PATH, on Windows it is sometimes Path
+    env_path = ENV["PATH"] || ENV["Path"] || ''
+    if ojdbc_jar_path = env_path.split(/[:;]/).concat($LOAD_PATH).find{|d| File.exists?(File.join(d,ojdbc_jar))}
       require File.join(ojdbc_jar_path,ojdbc_jar)
     end
   end
@@ -71,6 +69,8 @@ module ActiveRecord
         cursor_sharing = config[:cursor_sharing] || 'force'
         # by default VARCHAR2 column size will be interpreted as max number of characters (and not bytes)
         nls_length_semantics = config[:nls_length_semantics] || 'CHAR'
+        # get session time_zone from configuration or from TZ environment variable
+        time_zone = config[:time_zone] || ENV['TZ'] || java.util.TimeZone.default.getID
 
         properties = java.util.Properties.new
         properties.put("user", username)
@@ -80,13 +80,13 @@ module ActiveRecord
 
         @raw_connection = java.sql.DriverManager.getConnection(url, properties)
         exec %q{alter session set nls_date_format = 'YYYY-MM-DD HH24:MI:SS'}
-        exec %q{alter session set nls_timestamp_format = 'YYYY-MM-DD HH24:MI:SS'}
+        exec %q{alter session set nls_timestamp_format = 'YYYY-MM-DD HH24:MI:SS:FF6'}
         exec "alter session set cursor_sharing = #{cursor_sharing}"
         exec "alter session set nls_length_semantics = '#{nls_length_semantics}'"
         self.autocommit = true
         
         # Set session time zone to current time zone
-        @raw_connection.setSessionTimeZone(java.util.TimeZone.default.getID)
+        @raw_connection.setSessionTimeZone(time_zone)
         
         # Set default number of rows to prefetch
         # @raw_connection.setDefaultRowPrefetch(prefetch_rows) if prefetch_rows

data/lib/active_record/connection_adapters/oracle_enhanced_oci_connection.rb

@@ -4,10 +4,11 @@ begin
   require 'oci8' unless self.class.const_defined? :OCI8
 
   # 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
+  # latest version of Ruby-OCI8 supports fractional seconds for timestamps
+  # therefore default binding to Time class should be used
+  # 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. "+
@@ -192,15 +193,17 @@ module ActiveRecord
       end
       
       def create_time_with_default_timezone(value)
-        year, month, day, hour, min, sec = case value
+        year, month, day, hour, min, sec, usec = case value
+        when Time
+          [value.year, value.month, value.day, value.hour, value.min, value.sec, value.usec]
         when OraDate
-          [value.year, value.month, value.day, value.hour, value.minute, value.second]
+          [value.year, value.month, value.day, value.hour, value.minute, value.second, 0]
         else
-          [value.year, value.month, value.day, value.hour, value.min, value.sec]
+          [value.year, value.month, value.day, value.hour, value.min, value.sec, 0]
         end
         # code from Time.time_with_datetime_fallback
         begin
-          Time.send(Base.default_timezone, year, month, day, hour, min, sec)
+          Time.send(Base.default_timezone, year, month, day, hour, min, sec, usec)
         rescue
           offset = Base.default_timezone.to_sym == :local ? ::DateTime.local_offset : 0
           ::DateTime.civil(year, month, day, hour, min, sec, offset)
@@ -219,15 +222,18 @@ module ActiveRecord
         cursor_sharing = config[:cursor_sharing] || 'force'
         # by default VARCHAR2 column size will be interpreted as max number of characters (and not bytes)
         nls_length_semantics = config[:nls_length_semantics] || 'CHAR'
+        # get session time_zone from configuration or from TZ environment variable
+        time_zone = config[:time_zone] || ENV['TZ']
 
         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.exec %q{alter session set nls_timestamp_format = 'YYYY-MM-DD HH24:MI:SS:FF6'} 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.exec "alter session set nls_length_semantics = '#{nls_length_semantics}'"
+        conn.exec "alter session set time_zone = '#{time_zone}'" unless time_zone.blank?
         conn
       end
     end

data/lib/active_record/connection_adapters/oracle_enhanced_procedures.rb

@@ -5,7 +5,7 @@ ActiveRecord::Base.class_eval do
 end
 
 require 'ruby_plsql'
-require 'activesupport'
+require 'active_support'
 
 module ActiveRecord #:nodoc:
   module ConnectionAdapters #:nodoc:
@@ -53,6 +53,36 @@ module ActiveRecord #:nodoc:
           self.custom_delete_method = block
         end
         
+        def create_method_name_before_custom_methods
+          if private_method_defined?(:create_without_timestamps) && defined?(ActiveRecord::VERSION) && ActiveRecord::VERSION::STRING.to_f >= 2.3
+            :create_without_timestamps
+          elsif private_method_defined?(:create_without_callbacks)
+            :create_without_callbacks
+          else
+            :create
+          end
+        end
+        
+        def update_method_name_before_custom_methods
+          if private_method_defined?(:update_without_dirty)
+            :update_without_dirty
+          elsif private_method_defined?(:update_without_timestamps) && defined?(ActiveRecord::VERSION) && ActiveRecord::VERSION::STRING.to_f >= 2.3
+            :update_without_timestamps
+          elsif private_method_defined?(:update_without_callbacks)
+            :update_without_callbacks
+          else
+            :update
+          end
+        end
+        
+        def destroy_method_name_before_custom_methods
+          if public_method_defined?(:destroy_without_callbacks)
+            :destroy_without_callbacks
+          else
+            :destroy
+          end
+        end
+        
         private
         def include_with_custom_methods
           unless included_modules.include? InstanceMethods
@@ -64,30 +94,13 @@ module ActiveRecord #:nodoc:
       module InstanceMethods #:nodoc:
         def self.included(base)
           base.instance_eval do
-            if private_instance_methods.include?('create_without_callbacks') || private_instance_methods.include?(:create_without_callbacks)
-              alias_method :create_without_custom_method, :create_without_callbacks
-              alias_method :create_without_callbacks, :create_with_custom_method
-            else
-              alias_method_chain :create, :custom_method
-            end
-            # insert after dirty checking in Rails 2.1
-            # 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
-            elsif private_instance_methods.include?('update_without_callbacks') || private_instance_methods.include?(:update_without_callbacks)
-              alias_method :update_without_custom_method, :update_without_callbacks
-              alias_method :update_without_callbacks, :update_with_custom_method
-            else
-              alias_method_chain :update, :custom_method
-            end
+            alias_method :create_without_custom_method, create_method_name_before_custom_methods
+            alias_method create_method_name_before_custom_methods, :create_with_custom_method
+            alias_method :update_without_custom_method, update_method_name_before_custom_methods
+            alias_method update_method_name_before_custom_methods, :update_with_custom_method
+            alias_method :destroy_without_custom_method, destroy_method_name_before_custom_methods
+            alias_method destroy_method_name_before_custom_methods, :destroy_with_custom_method
             private :create, :update
-            if public_instance_methods.include?('destroy_without_callbacks') || public_instance_methods.include?(:destroy_without_callbacks)
-              alias_method :destroy_without_custom_method, :destroy_without_callbacks
-              alias_method :destroy_without_callbacks, :destroy_with_custom_method
-            else
-              alias_method_chain :destroy, :custom_method
-            end
             public :destroy
           end
         end
@@ -130,6 +143,7 @@ module ActiveRecord #:nodoc:
             end
           end
 
+          @destroyed = true
           freeze
         end
 

data/lib/active_record/connection_adapters/oracle_enhanced_schema_definitions.rb

@@ -12,9 +12,10 @@ module ActiveRecord
           include OracleEnhancedTableDefinition
         end
         
+        # Available starting from ActiveRecord 2.1
         base::Table.class_eval do
           include OracleEnhancedTable
-        end
+        end if defined?(base::Table)
       end
     end
   
@@ -80,7 +81,7 @@ module ActiveRecord
     
       def to_sql_with_foreign_keys #:nodoc:
         sql = to_sql_without_foreign_keys
-        sql << ', ' << (foreign_keys * ', ') if foreign_keys.present?
+        sql << ', ' << (foreign_keys * ', ') unless foreign_keys.blank?
         sql
       end
     

data/lib/active_record/connection_adapters/oracle_enhanced_schema_dumper.rb

@@ -13,7 +13,8 @@ module ActiveRecord #:nodoc:
       private
       
       def tables_with_oracle_enhanced(stream)
-        @connection.tables.sort.each do |tbl|
+        sorted_tables = @connection.tables.sort
+        sorted_tables.each do |tbl|
           # add table prefix or suffix for schema_migrations
           next if [ActiveRecord::Migrator.proper_table_name('schema_migrations'), ignore_tables].flatten.any? do |ignored|
             case ignored
@@ -28,9 +29,12 @@ module ActiveRecord #:nodoc:
           table(tbl, stream)
           # add primary key trigger if table has it
           primary_key_trigger(tbl, stream)
+        end
+        sorted_tables.each do |tbl|
           # add foreign keys if table has them
           foreign_keys(tbl, stream)
         end
+        # add synonyms in local schema
         synonyms(stream)
       end
 
@@ -44,7 +48,7 @@ module ActiveRecord #:nodoc:
       end
 
       def foreign_keys(table_name, stream)
-        if (foreign_keys = @connection.foreign_keys(table_name)).any?
+        if @connection.respond_to?(:foreign_keys) && (foreign_keys = @connection.foreign_keys(table_name)).any?
           add_foreign_key_statements = foreign_keys.map do |foreign_key|
             statement_parts = [ ('add_foreign_key ' + foreign_key.from_table.inspect) ]
             statement_parts << foreign_key.to_table.inspect
@@ -56,7 +60,7 @@ module ActiveRecord #:nodoc:
             if foreign_key.options[:primary_key] != 'id'
               statement_parts << (':primary_key => ' + foreign_key.options[:primary_key].inspect)
             end
-            if foreign_key.options[:dependent].present?
+            unless foreign_key.options[:dependent].blank?
               statement_parts << (':dependent => ' + foreign_key.options[:dependent].inspect)
             end
 
@@ -69,15 +73,17 @@ module ActiveRecord #:nodoc:
       end
 
       def synonyms(stream)
-        syns = @connection.synonyms
-        syns.each do |syn|
-          table_name = syn.table_name
-          table_name = "#{syn.table_owner}.#{table_name}" if syn.table_owner
-          table_name = "#{table_name}@#{syn.db_link}" if syn.db_link
-          stream.print "  add_synonym #{syn.name.inspect}, #{table_name.inspect}, :force => true"
-          stream.puts
+        if @connection.respond_to?(:synonyms)
+          syns = @connection.synonyms
+          syns.each do |syn|
+            table_name = syn.table_name
+            table_name = "#{syn.table_owner}.#{table_name}" if syn.table_owner
+            table_name = "#{table_name}@#{syn.db_link}" if syn.db_link
+            stream.print "  add_synonym #{syn.name.inspect}, #{table_name.inspect}, :force => true"
+            stream.puts
+          end
+          stream.puts unless syns.empty?
         end
-        stream.puts unless syns.empty?
       end
 
       def indexes_with_oracle_enhanced(table, stream)

data/lib/active_record/connection_adapters/oracle_enhanced_version.rb

@@ -1,7 +1 @@
-module ActiveRecord #:nodoc:
-  module ConnectionAdapters #:nodoc:
-    module OracleEnhancedVersion #:nodoc:
-      VERSION = '1.2.2'
-    end
-  end
-end
+ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter::VERSION = '1.2.3'

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -34,6 +34,8 @@ describe "OracleEnhancedAdapter establish connection" do
 end
 
 describe "OracleEnhancedAdapter" do
+  include LoggerSpecHelper
+
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
@@ -173,6 +175,77 @@ describe "OracleEnhancedAdapter" do
 
   end
 
+  describe "cache table columns" do
+    before(:all) do
+      @conn.execute "DROP TABLE test_employees" rescue nil
+      @conn.execute <<-SQL
+        CREATE TABLE test_employees (
+          id            NUMBER,
+          first_name    VARCHAR2(20),
+          last_name     VARCHAR2(25),
+          hire_date     DATE
+        )
+      SQL
+      @column_names = ['id', 'first_name', 'last_name', 'hire_date']
+      class ::TestEmployee < ActiveRecord::Base
+      end
+    end
+
+    after(:all) do
+      Object.send(:remove_const, "TestEmployee")
+      @conn.execute "DROP TABLE test_employees"
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = nil
+    end
+
+    before(:each) do
+      @buffer = StringIO.new
+      log_to @buffer
+      @conn = ActiveRecord::Base.connection
+      @conn.clear_columns_cache
+    end
+
+    describe "without column caching" do
+
+      before(:each) do
+        ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = false
+      end
+
+      it "should get columns from database at first time" do
+        TestEmployee.connection.columns('test_employees').map(&:name).should == @column_names
+        @buffer.string.should =~ /select .* from all_tab_columns/im
+      end
+
+      it "should get columns from database at second time" do
+        TestEmployee.connection.columns('test_employees')
+        @buffer.truncate(0)
+        TestEmployee.connection.columns('test_employees').map(&:name).should == @column_names
+        @buffer.string.should =~ /select .* from all_tab_columns/im
+      end
+
+    end
+
+    describe "with column caching" do
+
+      before(:each) do
+        ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = true
+      end
+
+      it "should get columns from database at first time" do
+        TestEmployee.connection.columns('test_employees').map(&:name).should == @column_names
+        @buffer.string.should =~ /select .* from all_tab_columns/im
+      end
+
+      it "should get columns from cache at second time" do
+        TestEmployee.connection.columns('test_employees')
+        @buffer.truncate(0)
+        TestEmployee.connection.columns('test_employees').map(&:name).should == @column_names
+        @buffer.string.should be_blank
+      end
+
+    end
+
+  end
+
   describe "without composite_primary_keys" do
 
     before(:all) do
@@ -362,4 +435,14 @@ describe "OracleEnhancedAdapter" do
 
   end
 
+  describe "session information" do
+    it "should get current database name" do
+      @conn.current_database.should == CONNECTION_PARAMS[:database]
+    end
+
+    it "should get current database session user" do
+      @conn.current_user.should == CONNECTION_PARAMS[:username].upcase
+    end
+  end
+
 end

data/spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb

@@ -105,7 +105,7 @@ describe "OracleEnhancedAdapter date type detection based on column names" do
     after(:each) do
       # @employee.destroy if @employee
       Object.send(:remove_const, "TestEmployee")
-      ActiveRecord::Base.connection.clear_types_for_columns
+      @conn.clear_types_for_columns
     end
 
     it "should return Time value from DATE column if emulate_dates_by_column_name is false" do
@@ -202,6 +202,7 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
         salary        NUMBER,
         commission_pct  NUMBER(2,2),
         manager_id    NUMBER(6),
+        is_manager    NUMBER(1),
         department_id NUMBER(4,0),
         created_at    DATE
       )
@@ -262,6 +263,8 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
     
     after(:each) do
       Object.send(:remove_const, "Test2Employee")
+      @conn.clear_types_for_columns
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans = true
     end
     
     def create_employee2
@@ -269,6 +272,7 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
         :first_name => "First",
         :last_name => "Last",
         :job_id => 1,
+        :is_manager => 1,
         :salary => 1000
       )
       @employee2.reload
@@ -292,6 +296,32 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
       @employee2.salary.class.should == BigDecimal
     end
 
+    it "should return Fixnum value from NUMBER column if column specified in set_integer_columns" do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = false
+      Test2Employee.set_integer_columns :job_id
+      create_employee2
+      @employee2.job_id.class.should == Fixnum
+    end
+
+    it "should return Boolean value from NUMBER(1) column if emulate booleans is used" do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans = true
+      create_employee2
+      @employee2.is_manager.class.should == TrueClass
+    end
+
+    it "should return Fixnum value from NUMBER(1) column if emulate booleans is not used" do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans = false
+      create_employee2
+      @employee2.is_manager.class.should == Fixnum
+    end
+
+    it "should return Fixnum value from NUMBER(1) column if column specified in set_integer_columns" do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans = true
+      Test2Employee.set_integer_columns :is_manager
+      create_employee2
+      @employee2.is_manager.class.should == Fixnum
+    end
+
   end
 
 end
@@ -330,6 +360,7 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
   after(:all) do
     @conn.execute "DROP TABLE test3_employees"
     @conn.execute "DROP SEQUENCE test3_employees_seq"
+    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans_from_strings = false
   end
 
   it "should set CHAR/VARCHAR2 column type as string if emulate_booleans_from_strings is false" do
@@ -384,7 +415,7 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
       :boolean, nil, nil, nil).should == "VARCHAR2(1)"
   end
 
-  it "should translate boolean type to NUMBER(1) if emulate_booleans_from_strings is true" do
+  it "should translate boolean type to NUMBER(1) if emulate_booleans_from_strings is false" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans_from_strings = false
     ActiveRecord::Base.connection.type_to_sql(
       :boolean, nil, nil, nil).should == "NUMBER(1)"
@@ -406,6 +437,7 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
     
     after(:each) do
       Object.send(:remove_const, "Test3Employee")
+      @conn.clear_types_for_columns
     end
     
     def create_employee3(params={})
@@ -451,9 +483,7 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
 
     it "should return boolean value from VARCHAR2 boolean column if column specified in set_boolean_columns" do
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans_from_strings = true
-      class ::Test3Employee < ActiveRecord::Base
-        set_boolean_columns :test_boolean
-      end
+      Test3Employee.set_boolean_columns :test_boolean
       create_employee3(:test_boolean => true)
       @employee3.test_boolean.class.should == TrueClass
       @employee3.test_boolean_before_type_cast.should == "Y"
@@ -467,7 +497,14 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
       @employee3.test_boolean.class.should == NilClass
       @employee3.test_boolean_before_type_cast.should == nil
     end
-  
+
+    it "should return string value from VARCHAR2 column with boolean column name but is specified in set_string_columns" do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans_from_strings = true
+      Test3Employee.set_string_columns :active_flag
+      create_employee3
+      @employee3.active_flag.class.should == String
+    end
+
   end
 
 end
@@ -523,7 +560,6 @@ describe "OracleEnhancedAdapter timestamp with timezone support" do
     end
 
     it "should return Time value from TIMESTAMP columns" do
-      # currently fractional seconds are not retrieved from database
       @now = Time.local(2008,5,26,23,11,11,0)
       @employee = TestEmployee.create(
         :created_at => @now,
@@ -537,35 +573,17 @@ describe "OracleEnhancedAdapter timestamp with timezone support" do
       end
     end
 
-    if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-      it "should return Time value with fractional seconds from TIMESTAMP columns" do
-        # currently fractional seconds are not retrieved from database
-        @now = Time.local(2008,5,26,23,11,11,10)
-        @employee = TestEmployee.create(
-          :created_at => @now,
-          :created_at_tz => @now,
-          :created_at_ltz => @now
-        )
-        @employee.reload
-        [:created_at, :created_at_tz, :created_at_ltz].each do |c|
-          @employee.send(c).class.should == Time
-          @employee.send(c).to_f.should == @now.to_f
-        end
-      end
-    else
-      it "should return Time value without fractional seconds from TIMESTAMP columns" do
-        # currently fractional seconds are not retrieved from database
-        @now = Time.local(2008,5,26,23,11,11,10)
-        @employee = TestEmployee.create(
-          :created_at => @now,
-          :created_at_tz => @now,
-          :created_at_ltz => @now
-        )
-        @employee.reload
-        [:created_at, :created_at_tz, :created_at_ltz].each do |c|
-          @employee.send(c).class.should == Time
-          @employee.send(c).to_f.should == @now.to_f.to_i.to_f # remove fractional seconds
-        end
+    it "should return Time value with fractional seconds from TIMESTAMP columns" do
+      @now = Time.local(2008,5,26,23,11,11,10)
+      @employee = TestEmployee.create(
+        :created_at => @now,
+        :created_at_tz => @now,
+        :created_at_ltz => @now
+      )
+      @employee.reload
+      [:created_at, :created_at_tz, :created_at_ltz].each do |c|
+        @employee.send(c).class.should == Time
+        @employee.send(c).to_f.should == @now.to_f
       end
     end
 
@@ -674,7 +692,7 @@ describe "OracleEnhancedAdapter date and timestamp with different NLS date forma
   it "should quote Time values with TO_TIMESTAMP" do
     @ts = @now + 0.1
     @conn.quote(@ts).should == "TO_TIMESTAMP('#{@ts.year}-#{"%02d" % @ts.month}-#{"%02d" % @ts.day} "+
-                                "#{"%02d" % @ts.hour}:#{"%02d" % @ts.min}:#{"%02d" % @ts.sec}.100000','YYYY-MM-DD HH24:MI:SS.FF6')"
+                                "#{"%02d" % @ts.hour}:#{"%02d" % @ts.min}:#{"%02d" % @ts.sec}:100000','YYYY-MM-DD HH24:MI:SS:FF6')"
   end
 
 end

data/spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb

@@ -26,6 +26,10 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
     SQL
   end
 
+  after(:all) do
+    ActiveRecord::Base.connection.execute "DROP FUNCTION MORE_THAN_FIVE_CHARACTERS_LONG"
+  end
+
   before(:each) do
     @buffer = StringIO.new
     log_to @buffer

data/spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb

@@ -6,7 +6,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
-    plsql.connection = ActiveRecord::Base.connection.raw_connection
+    plsql.activerecord_class = ActiveRecord::Base
     @conn.execute("DROP TABLE test_employees") rescue nil
     @conn.execute <<-SQL
       CREATE TABLE test_employees (
@@ -18,7 +18,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
         description   CLOB,
         version       NUMBER(15,0),
         create_time   DATE,
-        update_time   DATE
+        update_time   DATE,
+        created_at    DATE,
+        updated_at    DATE
       )
     SQL
     @conn.execute("DROP SEQUENCE test_employees_s") rescue nil
@@ -168,10 +170,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     TestEmployee.class_eval { def after_create() raise "Make the transaction rollback" end }
     begin
       employees_count = TestEmployee.count
-      @employee.save
-      fail "Did not raise exception"
-    rescue => e
-      e.message.should == "Make the transaction rollback"
+      lambda {
+        @employee.save
+      }.should raise_error("Make the transaction rollback")
       @employee.id.should == nil
       TestEmployee.count.should == employees_count
     ensure
@@ -205,10 +206,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       empl_id = @employee.id
       @employee.reload
       @employee.first_name = "Second"
-      @employee.save!
-      fail "Did not raise exception"
-    rescue => e
-      e.message.should == "Make the transaction rollback"
+      lambda {
+        @employee.save
+      }.should raise_error("Make the transaction rollback")
       @employee.reload
       @employee.first_name.should == "First"
     ensure
@@ -257,20 +257,31 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     TestEmployee.find_by_employee_id(empl_id).should be_nil
   end
 
-  it "should rollback record when exception is raised in after_desotry callback" do
-    TestEmployee.class_eval { def after_destroy() raise "Make the transaction rollback" end }
+  it "should delete record and set destroyed flag" do
+    return pending("Not in this ActiveRecord version (requires >= 2.3.5)") unless TestEmployee.method_defined?(:destroyed?)
     @employee = TestEmployee.create(
       :first_name => "First",
       :last_name => "Last",
       :hire_date => @today
     )
     @employee.reload
-    empl_id = @employee.id
+    @employee.destroy
+    @employee.should be_destroyed
+  end
+
+  it "should rollback record when exception is raised in after_desotry callback" do
+    TestEmployee.class_eval { def after_destroy() raise "Make the transaction rollback" end }
     begin
-      @employee.destroy
-      fail "Did not raise exception"
-    rescue => e
-      e.message.should == "Make the transaction rollback"
+      @employee = TestEmployee.create(
+        :first_name => "First",
+        :last_name => "Last",
+        :hire_date => @today
+      )
+      @employee.reload
+      empl_id = @employee.id
+      lambda {
+        @employee.destroy
+      }.should raise_error("Make the transaction rollback")
       @employee.id.should == empl_id
       TestEmployee.find_by_employee_id(empl_id).should_not be_nil
     ensure
@@ -278,10 +289,33 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     end
   end
 
+  it "should set timestamps when creating record" do
+    @employee = TestEmployee.create(
+      :first_name => "First",
+      :last_name => "Last",
+      :hire_date => @today
+    )
+    @employee.created_at.should_not be_nil
+    @employee.updated_at.should_not be_nil
+  end
+
+  it "should set timestamps when updating record" do
+    @employee = TestEmployee.create(
+      :first_name => "First",
+      :last_name => "Last",
+      :hire_date => @today
+    )
+    @employee.reload
+    @employee.created_at.should be_nil
+    @employee.updated_at.should be_nil
+    @employee.first_name = "Second"
+    @employee.save!
+    @employee.created_at.should be_nil
+    @employee.updated_at.should_not be_nil
+  end
+
   it "should log create record" do
     log_to @buffer
-    # reestablish plsql.connection as log_to might reset existing connection
-    plsql.connection = ActiveRecord::Base.connection.raw_connection
     @employee = TestEmployee.create(
       :first_name => "First",
       :last_name => "Last",
@@ -298,8 +332,6 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :hire_date => @today
     )
     log_to @buffer
-    # reestablish plsql.connection as log_to might reset existing connection
-    plsql.connection = ActiveRecord::Base.connection.raw_connection
     @employee.save!
     @buffer.string.should match(/^TestEmployee Update \(\d+\.\d+(ms)?\)  custom update method with employee_id=#{@employee.id}$/)
   end
@@ -311,8 +343,6 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :hire_date => @today
     )
     log_to @buffer
-    # reestablish plsql.connection as log_to might reset existing connection
-    plsql.connection = ActiveRecord::Base.connection.raw_connection
     @employee.destroy
     @buffer.string.should match(/^TestEmployee Destroy \(\d+\.\d+(ms)?\)  custom delete method with employee_id=#{@employee.id}$/)
   end

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -139,6 +139,7 @@ describe "OracleEnhancedAdapter schema dump" do
 
     after(:each) do
       drop_test_posts_table
+      @conn.clear_prefetch_primary_key
     end
 
     it "should include primary key trigger in schema dump" do

data/spec/active_record/connection_adapters/oracle_enhanced_schema_spec.rb

@@ -572,6 +572,7 @@ describe "OracleEnhancedAdapter schema definition" do
     end
 
     it "should add foreign key in change_table" do
+      return pending("Not in this ActiveRecord version") unless ENV['RAILS_GEM_VERSION'] >= '2.1'
       schema_define do
         create_table :test_comments, :force => true do |t|
           t.string :body, :limit => 4000
@@ -587,6 +588,7 @@ describe "OracleEnhancedAdapter schema definition" do
     end
 
     it "should add foreign key in change_table references" do
+      return pending("Not in this ActiveRecord version") unless ENV['RAILS_GEM_VERSION'] >= '2.1'
       schema_define do
         create_table :test_comments, :force => true do |t|
           t.string :body, :limit => 4000
@@ -601,6 +603,7 @@ describe "OracleEnhancedAdapter schema definition" do
     end
 
     it "should remove foreign key by table name" do
+      return pending("Not in this ActiveRecord version") unless ENV['RAILS_GEM_VERSION'] >= '2.1'
       schema_define do
         create_table :test_comments, :force => true do |t|
           t.string :body, :limit => 4000

data/spec/spec_helper.rb

@@ -25,15 +25,15 @@ elsif ENV['RAILS_GEM_VERSION'] =~ /^2.3.3/
   gem 'activesupport', '=2.3.3'
   gem 'composite_primary_keys', '=2.3.2'
 else
-  ENV['RAILS_GEM_VERSION'] ||= '2.3.4'
-  gem 'activerecord', '=2.3.4'
-  gem 'actionpack', '=2.3.4'
-  gem 'activesupport', '=2.3.4'
+  ENV['RAILS_GEM_VERSION'] ||= '2.3.5'
+  gem 'activerecord', '=2.3.5'
+  gem 'actionpack', '=2.3.5'
+  gem 'activesupport', '=2.3.5'
   NO_COMPOSITE_PRIMARY_KEYS = true
 end
 
-require 'activerecord'
-require 'actionpack'
+require 'active_record'
+require 'action_pack'
 if ENV['RAILS_GEM_VERSION'] >= '2.3'
   require 'action_controller/session/abstract_store'
   require 'active_record/session_store'
@@ -42,14 +42,14 @@ else
 end
 if !defined?(RUBY_ENGINE)
   # change version to 1.0.6 to test with old oracle_adapter
-  gem 'ruby-oci8', '>=2.0.2'
+  gem 'ruby-oci8', '=2.0.3'
   require 'oci8'
   if OCI8::VERSION =~ /^1\./
     gem "activerecord-oracle-adapter"
     require 'active_record/connection_adapters/oracle_adapter'
   end
 elsif RUBY_ENGINE == 'ruby'
-  gem 'ruby-oci8', '>=2.0.2'
+  gem 'ruby-oci8', '=2.0.3'
   require 'oci8'
 elsif RUBY_ENGINE == 'jruby'
   gem "activerecord-jdbc-adapter"
@@ -123,3 +123,7 @@ SYSTEM_CONNECTION_PARAMS = {
 
 # For JRuby Set default $KCODE to UTF8
 $KCODE = "UTF8" if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+
+# set default time zone in TZ environment variable
+# which will be used to set session time zone
+ENV['TZ'] ||= 'Europe/Riga'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-28 00:00:00 +03:00
+date: 2009-12-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,42 +23,34 @@ dependencies:
         version: 2.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rspec
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 1.2.9
     version: 
-description: |-
-  Oracle "enhanced" ActiveRecord adapter contains useful additional methods for working with new and legacy Oracle databases
-  from Rails which are extracted from current real projects' monkey patches of original Oracle adapter.
-  
-  See http://github.com/rsim/oracle-enhanced/wikis for usage information.
-  
-  See http://oracle-enhanced.rubyforge.org/rdoc for detailed API documentation.
-  
-  For questions and feature discussion please use http://groups.google.com/group/oracle-enhanced
-  
-  Blog posts about oracle-enahnced can be found at http://blog.rayapps.com/category/oracle-enhanced
-  
-  Bugs and enhancement requests can be reported at http://rsim.lighthouseapp.com/projects/11468-oracle-enhanced
-email: 
-- raimonds.simanovskis@gmail.com
+description: |
+  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.
+
+email: raimonds.simanovskis@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- License.txt
 - README.rdoc
 files: 
+- .gitignore
 - History.txt
 - License.txt
+- Manifest.txt
 - README.rdoc
+- Rakefile
+- VERSION
 - 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
@@ -94,8 +86,7 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -112,10 +103,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: oracle-enhanced
-rubygems_version: 1.3.3
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Oracle enhaced adapter for Active Record
-test_files: []
-
+summary: Oracle enhanced adapter for ActiveRecord
+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_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_spec.rb
+- spec/spec_helper.rb