activerecord-oracle_enhanced-adapter 1.1.4 → 1.1.5

data/History.txt

@@ -1,3 +1,11 @@
+== 1.1.5 2008-07-27
+
+* Bug fixes:
+  * Fixed that write_lobs callback works with partial_updates enabled (added additional record lock before writing BLOB data to database)
+* Enhancements:
+  * Changed SQL SELECT in indexes method so that it will execute faster on some large data dictionaries
+  * Support for other date and time formats when assigning string to :date or :datetime column
+
 == 1.1.4 2008-07-14
 
 * Enhancements:

data/README.txt

@@ -7,7 +7,7 @@
 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://blog.rayapps.com for more information.
+See http://blog.rayapps.com/category/oracle-enhanced for more information.
 
 Look ar RSpec tests under spec directory for usage examples.
 
@@ -31,6 +31,10 @@ ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_colu
   should be emulated as booleans (and do not use NUMBER(1) as type for booleans which is default)
 ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans_from_strings = true
 
+* specify other date and time formats that should be used when assigning string values to :date and :datetime columns, e.g.:
+ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.string_to_date_format = "%d.%m.%Y"
+ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.string_to_time_format = "%d.%m.%Y %H:%M:%S"
+
 The following model class methods are available:
 * specify which table columns should be ignored by ActiveRecord
 ignore_table_columns :column1, :column2, :column3
@@ -57,6 +61,8 @@ set_delete_method do
   )
 end
 
+Oracle enhanced adapter is also compatible with composite_primary_keys gem.
+
 See History.txt for other enhancements to original Oracle adapter.
 
 == REQUIREMENTS:

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -113,6 +113,32 @@ begin
           (value.hour == 0 and value.min == 0 and value.sec == 0) ?
             Date.new(value.year, value.month, value.day) : value
         end
+        
+        class <<self
+          protected
+
+          def fallback_string_to_date(string)
+            if OracleEnhancedAdapter.string_to_date_format || OracleEnhancedAdapter.string_to_time_format
+              return (string_to_date_or_time_using_format(string).to_date rescue super)
+            end
+            super
+          end
+
+          def fallback_string_to_time(string)
+            if OracleEnhancedAdapter.string_to_time_format || OracleEnhancedAdapter.string_to_date_format
+              return (string_to_date_or_time_using_format(string).to_time rescue super)
+            end
+            super
+          end
+
+          def string_to_date_or_time_using_format(string)
+            if OracleEnhancedAdapter.string_to_time_format && dt=Date._strptime(string, OracleEnhancedAdapter.string_to_time_format)
+              return Time.mktime(*dt.values_at(:year, :mon, :mday, :hour, :min, :sec, :zone, :wday))
+            end
+            DateTime.strptime(string, OracleEnhancedAdapter.string_to_date_format)
+          end
+          
+        end
       end
 
 
@@ -182,6 +208,10 @@ begin
           bool ? "Y" : "N"
         end
 
+        # RSI: use to set NLS specific date formats which will be used when assigning string to :date and :datetime columns
+        @@string_to_date_format = @@string_to_time_format = nil
+        cattr_accessor :string_to_date_format, :string_to_time_format
+
         def adapter_name #:nodoc:
           'OracleEnhanced'
         end
@@ -378,9 +408,11 @@ begin
             value = attributes[col.name]
             value = value.to_yaml if col.text? && klass.serialized_attributes[col.name]
             next if value.nil?  || (value == '')
-            lob = select_one("SELECT #{col.name} FROM #{table_name} WHERE #{klass.primary_key} = #{id}",
-                             'Writable Large Object')[col.name]
-            lob.write value
+            uncached do
+              lob = select_one("SELECT #{col.name} FROM #{table_name} WHERE #{klass.primary_key} = #{id} FOR UPDATE",
+                               'Writable Large Object')[col.name]
+              lob.write value
+            end
           end
         end
 
@@ -403,10 +435,11 @@ begin
         def indexes(table_name, name = nil) #:nodoc:
           result = select_all(<<-SQL, name)
             SELECT lower(i.index_name) as index_name, i.uniqueness, lower(c.column_name) as column_name
-              FROM user_indexes i, user_ind_columns c
+              FROM all_indexes i, user_ind_columns c
              WHERE i.table_name = '#{table_name.to_s.upcase}'
                AND c.index_name = i.index_name
                AND i.index_name NOT IN (SELECT uc.index_name FROM user_constraints uc WHERE uc.constraint_type = 'P')
+               AND i.owner = sys_context('userenv','session_user')
               ORDER BY i.index_name, c.column_position
           SQL
 

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  = 4
+      TINY  = 5
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -35,6 +35,10 @@ describe "OracleEnhancedAdapter schema dump" do
     @new_conn.tables.should == @old_conn.tables
   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 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)
@@ -98,6 +102,8 @@ describe "OracleEnhancedAdapter database session store" do
     @session = CGI::Session::ActiveRecordStore::Session.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.data.should == "other thing"
   end
@@ -732,3 +738,136 @@ describe "OracleEnhancedAdapter date and timestamp with different NLS date forma
   end
 
 end
+
+describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
+  before(:all) do
+    ActiveRecord::Base.establish_connection(:adapter => "oracle_enhanced",
+                                            :database => "xe",
+                                            :username => "hr",
+                                            :password => "hr")
+    @conn = ActiveRecord::Base.connection
+    @conn.execute <<-SQL
+      CREATE TABLE test_employees (
+        employee_id   NUMBER(6,0),
+        first_name    VARCHAR2(20),
+        last_name     VARCHAR2(25),
+        hire_date     DATE,
+        last_login_at    DATE,
+        last_login_at_ts   TIMESTAMP
+      )
+    SQL
+    @conn.execute <<-SQL
+      CREATE SEQUENCE test_employees_seq  MINVALUE 1
+        INCREMENT BY 1 CACHE 20 NOORDER NOCYCLE
+    SQL
+    class TestEmployee < ActiveRecord::Base
+      set_primary_key :employee_id
+    end
+  end
+  
+  after(:all) do
+    Object.send(:remove_const, "TestEmployee")
+    @conn.execute "DROP TABLE test_employees"
+    @conn.execute "DROP SEQUENCE test_employees_seq"
+  end
+
+  before(:each) do
+    @today = Date.new(2008,6,28)
+    @today_iso = "2008-06-28"
+    @today_nls = "28.06.2008"
+    @nls_date_format = "%d.%m.%Y"
+    @now = Time.local(2008,6,28,13,34,33)
+    @now_iso = "2008-06-28 13:34:33"
+    @now_nls = "28.06.2008 13:34:33"
+    @nls_time_format = "%d.%m.%Y %H:%M:%S"
+    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
+  end
+  
+  it "should assign ISO string to date column" do
+    @employee = TestEmployee.create(
+      :first_name => "First",
+      :last_name => "Last",
+      :hire_date => @today_iso
+    )
+    @employee.reload
+    @employee.hire_date.should == @today
+  end
+
+  it "should assign NLS string to date column" do
+    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.string_to_date_format = @nls_date_format
+    @employee = TestEmployee.create(
+      :first_name => "First",
+      :last_name => "Last",
+      :hire_date => @today_nls
+    )
+    @employee.reload
+    @employee.hire_date.should == @today
+  end
+
+  it "should assign ISO time string to date column" do
+    @employee = TestEmployee.create(
+      :first_name => "First",
+      :last_name => "Last",
+      :hire_date => @now_iso
+    )
+    @employee.reload
+    @employee.hire_date.should == @today
+  end
+
+  it "should assign NLS time string to date column" do
+    # ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.string_to_date_format = @nls_date_format
+    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.string_to_time_format = @nls_time_format
+    @employee = TestEmployee.create(
+      :first_name => "First",
+      :last_name => "Last",
+      :hire_date => @now_nls
+    )
+    @employee.reload
+    @employee.hire_date.should == @today
+  end
+
+  it "should assign ISO time string to datetime column" do
+    @employee = TestEmployee.create(
+      :first_name => "First",
+      :last_name => "Last",
+      :last_login_at => @now_iso
+    )
+    @employee.reload
+    @employee.last_login_at.should == @now
+  end
+
+  it "should assign NLS time string to datetime column" do
+    # ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.string_to_date_format = @nls_date_format
+    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.string_to_time_format = @nls_time_format
+    @employee = TestEmployee.create(
+      :first_name => "First",
+      :last_name => "Last",
+      :last_login_at => @now_nls
+    )
+    @employee.reload
+    @employee.last_login_at.should == @now
+  end
+  
+  it "should assign ISO date string to datetime column" do
+    @employee = TestEmployee.create(
+      :first_name => "First",
+      :last_name => "Last",
+      :last_login_at => @today_iso
+    )
+    @employee.reload
+    @employee.last_login_at.should == @today.to_time
+  end
+
+  it "should assign NLS date string to datetime column" do
+    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.string_to_date_format = @nls_date_format
+    # ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.string_to_time_format = @nls_time_format
+    @employee = TestEmployee.create(
+      :first_name => "First",
+      :last_name => "Last",
+      :last_login_at => @today_nls
+    )
+    @employee.reload
+    @employee.last_login_at.should == @today.to_time
+  end
+  
+end

metadata

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