activerecord-oracle_enhanced-adapter 1.1.1 → 1.1.2

data/History.txt

@@ -1,3 +1,10 @@
+== 1.1.2 2008-07-08
+
+* Bug fixes:
+  * Fixed after_save callback addition for session store in ActiveRecord version 2.0.2
+  * Changed date column name recognition - now should match regex /(^|_)date(_|$)/i
+    (previously "updated_at" was recognized as :date column and not as :datetime)
+
 == 1.1.1 2008-06-28
 
 * Enhancements:

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -160,14 +160,14 @@ begin
         @@emulate_dates_by_column_name = false
         cattr_accessor :emulate_dates_by_column_name
         def self.is_date_column?(name)
-          name =~ /date/i
+          name =~ /(^|_)date(_|$)/i
         end
 
         # RSI: set to true if NUMBER columns with ID at the end of their name should be emulated as integers
         @@emulate_integers_by_column_name = false
         cattr_accessor :emulate_integers_by_column_name
         def self.is_integer_column?(name)
-          name =~ /^id$/i || name =~ /_id$/i
+          name =~ /(^|_)id$/i
         end
 
         # RSI: set to true if CHAR(1), VARCHAR2(1) columns or VARCHAR2 columns with FLAG or YN at the end of their name
@@ -839,9 +839,11 @@ end
 
 # RSI: Added LOB writing callback for sessions stored in database
 # Otherwise it is not working as Session class is defined before OracleAdapter is loaded in Rails 2.0
-if defined?(CGI::Session::ActiveRecordStore::Session) &&
-            CGI::Session::ActiveRecordStore::Session.after_save_callback_chain.detect{|cb| cb.method == :enhanced_write_lobs}.nil?
-  class CGI::Session::ActiveRecordStore::Session
-    after_save :enhanced_write_lobs
+if defined?(CGI::Session::ActiveRecordStore::Session)
+  if !CGI::Session::ActiveRecordStore::Session.respond_to?(:after_save_callback_chain) ||
+      CGI::Session::ActiveRecordStore::Session.after_save_callback_chain.detect{|cb| cb.method == :enhanced_write_lobs}.nil?
+    class CGI::Session::ActiveRecordStore::Session
+      after_save :enhanced_write_lobs
+    end
   end
 end

data/lib/active_record/connection_adapters/oracle_enhanced_version.rb

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

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -105,6 +105,13 @@ describe "OracleEnhancedAdapter database session store" do
     CGI::Session::ActiveRecordStore::Session.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
+    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
+    columns = @conn.columns('sessions')
+    column = columns.detect{|c| c.name == "session_id"}
+    column.type.should == :string
+  end
+
 end
 
 describe "OracleEnhancedAdapter date type detection based on column names" do
@@ -127,7 +134,8 @@ describe "OracleEnhancedAdapter date type detection based on column names" do
         commission_pct  NUMBER(2,2),
         manager_id    NUMBER(6,0),
         department_id NUMBER(4,0),
-        created_at    DATE
+        created_at    DATE,
+        updated_at    DATE
       )
     SQL
     @conn.execute <<-SQL
@@ -148,20 +156,27 @@ describe "OracleEnhancedAdapter date type detection based on column names" do
     column.type.should == :datetime
   end
 
-  it "should set DATE column type as date if column name contains 'date' and emulate_dates_by_column_name is true" do
+  it "should set DATE column type as date if column name contains '_date_' and emulate_dates_by_column_name is true" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
     columns = @conn.columns('test_employees')
     column = columns.detect{|c| c.name == "hire_date"}
     column.type.should == :date
   end
 
-  it "should set DATE column type as datetime if column name does not contain 'date' and emulate_dates_by_column_name is true" do
+  it "should set DATE column type as datetime if column name does not contain '_date_' and emulate_dates_by_column_name is true" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
     columns = @conn.columns('test_employees')
     column = columns.detect{|c| c.name == "created_at"}
     column.type.should == :datetime
   end
 
+  it "should set DATE column type as datetime if column name contains 'date' as part of other word and emulate_dates_by_column_name is true" do
+    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
+    columns = @conn.columns('test_employees')
+    column = columns.detect{|c| c.name == "updated_at"}
+    column.type.should == :datetime
+  end
+
   it "should return Time value from DATE column if emulate_dates_by_column_name is false" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = false
     columns = @conn.columns('test_employees')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-28 00:00:00 +03:00
+date: 2008-07-08 00:00:00 +03:00
 default_executable: 
 dependencies: []