activerecord-oracle_enhanced-adapter 1.1.5 → 1.1.6

data/History.txt

@@ -1,3 +1,13 @@
+== 1.1.6 2008-08-19
+
+* Enhancements:
+  * Added support for set_date_columns and set_datetime_columns
+  * Added support for set_boolean_columns
+  * Added support for schema prefix in set_table_name (removed table name quoting)
+  * Added support for NVARCHAR2 column type
+* Bug fixes:
+  * Do not call write_lobs callback when custom create or update methods are defined
+    
 == 1.1.5 2008-07-27
 
 * Bug fixes:

data/README.txt

@@ -39,6 +39,15 @@ The following model class methods are available:
 * specify which table columns should be ignored by ActiveRecord
 ignore_table_columns :column1, :column2, :column3
 
+* specify which table columns should be with :date type (without time) or with :datetime type (with date and time) - this could be used
+if emulation by column names is not working because of different naming conventions
+set_date_columns :started_on, :finished_on
+set_datetime_columns :start_date_and_time, :end_date_and_time
+
+* specify which table columns should be with :boolean type  - this should be used together with boolean emulation from strings if
+there are other boolean columns with different naming convention
+set_boolean_columns :some_boolean_column
+
 * specify custom create, update and delete methods which should be used instead of Rails generated INSERT, UPDATE and DELETE statements
 # should return ID of new record
 set_create_method do

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -57,11 +57,27 @@ begin
         connection.ignore_table_columns(table_name,*args)
       end
 
+      # RSI: specify which table columns should be treated as date (without time)
+      def self.set_date_columns(*args)
+        connection.set_type_for_columns(table_name,:date,*args)
+      end
+
+      # RSI: specify which table columns should be treated as datetime
+      def self.set_datetime_columns(*args)
+        connection.set_type_for_columns(table_name,:datetime,*args)
+      end
+
+      # RSI: specify which table columns should be treated as booleans
+      def self.set_boolean_columns(*args)
+        connection.set_type_for_columns(table_name,:boolean,*args)
+      end
+
       # After setting large objects to empty, select the OCI8::LOB
       # and write back the data.
       after_save :enhanced_write_lobs
       def enhanced_write_lobs #:nodoc:
-        if connection.is_a?(ConnectionAdapters::OracleEnhancedAdapter)
+        if connection.is_a?(ConnectionAdapters::OracleEnhancedAdapter) &&
+            !(self.class.custom_create_method || self.class.custom_update_method)
           connection.write_lobs(self.class.table_name, self.class, attributes)
         end
       end
@@ -73,8 +89,15 @@ begin
     module ConnectionAdapters #:nodoc:
       class OracleEnhancedColumn < Column #:nodoc:
 
+        attr_reader :table_name, :forced_column_type
+        
+        def initialize(name, default, sql_type = nil, null = true, table_name = nil, forced_column_type = nil)
+          @table_name = table_name
+          @forced_column_type = forced_column_type
+          super(name, default, sql_type, null)
+        end
+
         def type_cast(value)
-          return value.to_date if type == :date && OracleEnhancedAdapter.emulate_dates_by_column_name && value.class == Time
           return guess_date_or_time(value) if type == :datetime && OracleEnhancedAdapter.emulate_dates
           super
         end
@@ -88,29 +111,44 @@ begin
             %w(true t 1 y +).include?(value.to_s.downcase)
           end
         end
+
+        # RSI: convert Time value to Date for :date columns
+        def self.string_to_date(string)
+          return string.to_date if string.is_a?(Time)
+          super
+        end
+
+        # RSI: convert Date value to Time for :datetime columns
+        def self.string_to_time(string)
+          return string.to_time if string.is_a?(Date) && !OracleEnhancedAdapter.emulate_dates
+          super
+        end
         
         private
         def simplified_type(field_type)
           return :boolean if OracleEnhancedAdapter.emulate_booleans && field_type == 'NUMBER(1)'
           return :boolean if OracleEnhancedAdapter.emulate_booleans_from_strings &&
-                            OracleEnhancedAdapter.is_boolean_column?(name, field_type)
+                            (forced_column_type == :boolean ||
+                            OracleEnhancedAdapter.is_boolean_column?(name, field_type, table_name))
+          
           case field_type
             when /date/i
-              return :date if OracleEnhancedAdapter.emulate_dates_by_column_name && OracleEnhancedAdapter.is_date_column?(name)
+              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
               # RSI: if column name is ID or ends with _ID
-              return :integer if OracleEnhancedAdapter.emulate_integers_by_column_name && OracleEnhancedAdapter.is_integer_column?(name)
+              return :integer if OracleEnhancedAdapter.emulate_integers_by_column_name && OracleEnhancedAdapter.is_integer_column?(name, table_name)
               :decimal
             else super
           end
         end
 
         def guess_date_or_time(value)
-          (value.hour == 0 and value.min == 0 and value.sec == 0) ?
+          value.respond_to?(:hour) && (value.hour == 0 and value.min == 0 and value.sec == 0) ?
             Date.new(value.year, value.month, value.day) : value
         end
         
@@ -185,14 +223,25 @@ begin
         # RSI: set to true if columns with DATE in their name should be emulated as date
         @@emulate_dates_by_column_name = false
         cattr_accessor :emulate_dates_by_column_name
-        def self.is_date_column?(name)
+        def self.is_date_column?(name, table_name = nil)
           name =~ /(^|_)date(_|$)/i
         end
+        # RSI: instance method uses at first check if column type defined at class level
+        def is_date_column?(name, table_name = nil)
+          case get_type_for_column(table_name, name)
+          when nil
+            self.class.is_date_column?(name, table_name)
+          when :date
+            true
+          else
+            false
+          end
+        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)
+        def self.is_integer_column?(name, table_name = nil)
           name =~ /(^|_)id$/i
         end
 
@@ -200,7 +249,7 @@ begin
         # should be emulated as booleans
         @@emulate_booleans_from_strings = false
         cattr_accessor :emulate_booleans_from_strings
-        def self.is_boolean_column?(name, field_type)
+        def self.is_boolean_column?(name, field_type, table_name = nil)
           return true if ["CHAR(1)","VARCHAR2(1)"].include?(field_type)
           field_type =~ /^VARCHAR2/ && (name =~ /_flag$/i || name =~ /_yn$/i)
         end
@@ -260,6 +309,11 @@ begin
           name.to_s =~ /[A-Z]/ ? "\"#{name}\"" : name
         end
 
+        # abstract_adapter calls quote_column_name from quote_table_name, so prevent that
+        def quote_table_name(name)
+          name
+        end
+        
         def quote_string(s) #:nodoc:
           s.gsub(/'/, "''")
         end
@@ -471,11 +525,29 @@ begin
           @ignore_table_columns[table_name]
         end
         
+        # RSI: set explicit type for specified table columns
+        def set_type_for_columns(table_name, column_type, *args)
+          @table_column_type ||= {}
+          @table_column_type[table_name] ||= {}
+          args.each do |col|
+            @table_column_type[table_name][col.to_s.downcase] = column_type
+          end
+        end
+        
+        def get_type_for_column(table_name, column_name)
+          result = @table_column_type && @table_column_type[table_name] && @table_column_type[table_name][column_name.to_s.downcase]
+          result
+        end
+
+        def clear_types_for_columns
+          @table_column_type = nil
+        end
+
         def columns(table_name, name = nil) #:nodoc:
           # RSI: get ignored_columns by original table name
           ignored_columns = ignored_table_columns(table_name)
 
-          (owner, table_name) = @connection.describe(table_name)
+          (owner, desc_table_name) = @connection.describe(table_name)
 
           table_cols = <<-SQL
             select column_name as name, data_type as sql_type, data_default, nullable,
@@ -487,7 +559,7 @@ begin
                    decode(data_type, 'NUMBER', data_scale, null) as scale
               from all_tab_columns
              where owner      = '#{owner}'
-               and table_name = '#{table_name}'
+               and table_name = '#{desc_table_name}'
              order by column_id
           SQL
 
@@ -510,7 +582,11 @@ begin
             OracleEnhancedColumn.new(oracle_downcase(row['name']),
                              row['data_default'],
                              row['sql_type'],
-                             row['nullable'] == 'Y')
+                             row['nullable'] == 'Y',
+                             # RSI: pass table name for table specific column definitions
+                             table_name,
+                             # RSI: pass column type if specified in class definition
+                             get_type_for_column(table_name, oracle_downcase(row['name'])))
           end
         end
 
@@ -582,7 +658,7 @@ begin
           select_all("select table_name from all_tables where owner = sys_context('userenv','session_user')").inject(s) do |structure, table|
             ddl = "create table #{table.to_a.first.last} (\n "
             cols = select_all(%Q{
-              select column_name, data_type, data_length, data_precision, data_scale, data_default, nullable
+              select column_name, data_type, data_length, char_used, char_length, data_precision, data_scale, data_default, nullable
               from user_tab_columns
               where table_name = '#{table.to_a.first.last}'
               order by column_id
@@ -593,7 +669,8 @@ begin
                 col << ",#{row['data_scale'].to_i}" if !row['data_scale'].nil?
                 col << ')'
               elsif row['data_type'].include?('CHAR')
-                col << "(#{row['data_length'].to_i})"
+                length = row['char_used'] == 'C' ? row['char_length'].to_i : row['data_length'].to_i
+                col <<  "(#{length})"
               end
               col << " default #{row['data_default']}" if !row['data_default'].nil?
               col << ' not null' if row['nullable'] == 'N'
@@ -678,9 +755,10 @@ begin
                 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 emulate_dates && (d.hour == 0 && d.minute == 0 && d.second == 0)
+                  # if emulate_dates_by_column_name && self.class.is_date_column?(col)
+                  #   d.to_date
+                  # elsif
+                  if emulate_dates && (d.hour == 0 && d.minute == 0 && d.second == 0)
                     d.to_date
                   else
                     # see string_to_time; Time overflowing to DateTime, respecting the default timezone

data/lib/active_record/connection_adapters/oracle_enhanced_procedures.rb

@@ -24,7 +24,6 @@ module ActiveRecord #:nodoc:
         private
         def include_with_custom_methods
           unless included_modules.include? InstanceMethods
-            class_inheritable_accessor :custom_create_method, :custom_update_method, :custom_delete_method
             include InstanceMethods
           end
         end
@@ -96,6 +95,7 @@ end
 
 ActiveRecord::Base.class_eval do
   extend ActiveRecord::ConnectionAdapters::OracleEnhancedProcedures::ClassMethods
+  class_inheritable_accessor :custom_create_method, :custom_update_method, :custom_delete_method
 end
 
 ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.class_eval do

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

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -52,7 +52,43 @@ describe "OracleEnhancedAdapter schema dump" do
   it "should return the same structure drop as original oracle adapter" do
     @new_conn.structure_drop.should == @old_conn.structure_drop
   end
+  
+  it "should return the character size of nvarchar fields" do
+    @new_conn.execute <<-SQL
+      CREATE TABLE nvarchartable (
+        session_id  NVARCHAR2(255) DEFAULT NULL
+      )
+    SQL
+    if /.*session_id nvarchar2\((\d+)\).*/ =~ @new_conn.structure_dump
+       "#$1".should == "255"
+    end
+    @new_conn.execute "DROP TABLE nvarchartable"
+  end
+end
 
+describe "OracleEnhancedAdapter database stucture dump extentions" 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 nvarchartable (
+        unq_nvarchar  NVARCHAR2(255) DEFAULT NULL
+      )
+    SQL
+  end
+  
+  after(:all) do
+    @conn.execute "DROP TABLE nvarchartable"
+  end
+  
+  it "should return the character size of nvarchar fields" do
+    if /.*unq_nvarchar nvarchar2\((\d+)\).*/ =~ @conn.structure_dump
+       "#$1".should == "255"
+    end
+  end
 end
 
 describe "OracleEnhancedAdapter database session store" do
@@ -200,36 +236,79 @@ describe "OracleEnhancedAdapter date type detection based on column names" do
   end
 
   describe "/ DATE values from ActiveRecord model" do
-    before(:all) do
+    before(:each) do
+      ActiveRecord::Base.connection.clear_types_for_columns
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = false
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates = false
       class TestEmployee < ActiveRecord::Base
+        set_table_name "hr.test_employees"
         set_primary_key :employee_id
       end
     end
-
-    before(:each) do
+    
+    def create_test_employee
+      @today = Date.new(2008,8,19)
+      @now = Time.local(2008,8,19,17,03,59)
       @employee = TestEmployee.create(
         :first_name => "First",
         :last_name => "Last",
-        :hire_date => Date.today,
-        :created_at => Time.now
+        :hire_date => @today,
+        :created_at => @now
       )
+      @employee.reload
+    end
+
+    after(:each) do
+      # @employee.destroy if @employee
+      Object.send(:remove_const, "TestEmployee")
     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
-      @employee.reload
+      create_test_employee
       @employee.hire_date.class.should == Time
     end
 
     it "should return Date value from DATE column if column name contains 'date' and emulate_dates_by_column_name is true" do
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
-      @employee.reload
+      create_test_employee
       @employee.hire_date.class.should == Date
     end
 
     it "should return Time value from DATE column 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
+      create_test_employee
+      @employee.created_at.class.should == Time
+    end
+
+    it "should return Date value from DATE column if emulate_dates_by_column_name is false but column is defined as date" do
+      class TestEmployee < ActiveRecord::Base
+        set_date_columns :hire_date
+      end
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = false
+      create_test_employee
+      @employee.hire_date.class.should == Date
+    end
+
+    it "should return Time value from DATE column if emulate_dates_by_column_name is true but column is defined as datetime" do
+      class TestEmployee < ActiveRecord::Base
+        set_datetime_columns :hire_date
+      end
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
+      create_test_employee
+      @employee.hire_date.class.should == Time
+      # change to current time with hours, minutes and seconds
+      @employee.hire_date = @now
+      @employee.save!
       @employee.reload
+      @employee.hire_date.class.should == Time
+      @employee.hire_date.should == @now
+    end
+
+    it "should guess Date or Time value if emulate_dates is true" do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates = true
+      create_test_employee
+      @employee.hire_date.class.should == Date
       @employee.created_at.class.should == Time
     end
 
@@ -374,7 +453,8 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
         has_email     CHAR(1),
         has_phone     VARCHAR2(1),
         active_flag   VARCHAR2(2),
-        manager_yn    VARCHAR2(3)
+        manager_yn    VARCHAR2(3),
+        test_boolean  VARCHAR2(3)
       )
     SQL
     @conn.execute <<-SQL
@@ -436,6 +516,7 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
   
   describe "/ VARCHAR2 boolean values from ActiveRecord model" do
     before(:each) do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans_from_strings = false
       class Test3Employee < ActiveRecord::Base
       end
     end
@@ -444,14 +525,16 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
       Object.send(:remove_const, "Test3Employee")
     end
     
-    def create_employee3
+    def create_employee3(params={})
       @employee3 = Test3Employee.create(
+        {
         :first_name => "First",
         :last_name => "Last",
         :has_email => true,
         :has_phone => false,
         :active_flag => true,
         :manager_yn => false
+        }.merge(params)
       )
       @employee3.reload
     end
@@ -482,6 +565,19 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
       create_employee3
       @employee3.first_name.class.should == String
     end
+
+    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
+      create_employee3(:test_boolean => true)
+      @employee3.test_boolean.class.should == TrueClass
+      @employee3.test_boolean_before_type_cast.should == "Y"
+      create_employee3(:test_boolean => false)
+      @employee3.test_boolean.class.should == FalseClass
+      @employee3.test_boolean_before_type_cast.should == "N"
+    end
   
   end
 
@@ -668,9 +764,6 @@ describe "OracleEnhancedAdapter date and timestamp with different NLS date forma
       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
     # @conn.execute %q{alter session set nls_date_format = 'YYYY-MM-DD HH24:MI:SS'}
     @conn.execute %q{alter session set nls_date_format = 'DD-MON-YYYY HH24:MI:SS'}
     # @conn.execute %q{alter session set nls_timestamp_format = 'YYYY-MM-DD HH24:MI:SS'}
@@ -678,14 +771,25 @@ describe "OracleEnhancedAdapter date and timestamp with different NLS date forma
   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
+    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates = false
+    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = false
+    class TestEmployee < ActiveRecord::Base
+      set_primary_key :employee_id
+    end
     @today = Date.new(2008,6,28)
     @now = Time.local(2008,6,28,13,34,33)
+  end
+
+  after(:each) do
+    Object.send(:remove_const, "TestEmployee")    
+  end
+  
+  def create_test_employee
     @employee = TestEmployee.create(
       :first_name => "First",
       :last_name => "Last",
@@ -693,31 +797,32 @@ describe "OracleEnhancedAdapter date and timestamp with different NLS date forma
       :created_at => @now,
       :created_at_ts => @now
     )
+    @employee.reload    
   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
-    @employee.reload
+    create_test_employee
     @employee.hire_date.class.should == Time
     @employee.hire_date.should == @today.to_time
   end
 
   it "should return Date value from DATE column if column name contains 'date' and emulate_dates_by_column_name is true" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
-    @employee.reload
+    create_test_employee
     @employee.hire_date.class.should == Date
     @employee.hire_date.should == @today
   end
 
   it "should return Time value from DATE column 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
-    @employee.reload
+    create_test_employee
     @employee.created_at.class.should == Time
     @employee.created_at.should == @now
   end
 
   it "should return Time value from TIMESTAMP columns" do
-    @employee.reload
+    create_test_employee
     @employee.created_at_ts.class.should == Time
     @employee.created_at_ts.should == @now
   end
@@ -870,4 +975,4 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
     @employee.last_login_at.should == @today.to_time
   end
   
-end
+end

data/spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb

@@ -23,6 +23,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
         last_name     VARCHAR2(25),
         hire_date     DATE,
         salary        NUMBER(8,2),
+        description   CLOB,
         version       NUMBER(15,0),
         create_time   DATE,
         update_time   DATE
@@ -40,13 +41,15 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
             p_last_name     VARCHAR2,
             p_hire_date     DATE,
             p_salary        NUMBER,
+            p_description   VARCHAR2,
             p_employee_id   OUT NUMBER);
         PROCEDURE update_employee(
             p_employee_id   NUMBER,
             p_first_name    VARCHAR2,
             p_last_name     VARCHAR2,
             p_hire_date     DATE,
-            p_salary        NUMBER);
+            p_salary        NUMBER,
+            p_description   VARCHAR2);
         PROCEDURE delete_employee(
             p_employee_id   NUMBER);
       END;
@@ -58,13 +61,14 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
             p_last_name     VARCHAR2,
             p_hire_date     DATE,
             p_salary        NUMBER,
+            p_description   VARCHAR2,
             p_employee_id   OUT NUMBER)
         IS
         BEGIN
           SELECT test_employees_s.NEXTVAL INTO p_employee_id FROM dual;
-          INSERT INTO test_employees (employee_id, first_name, last_name, hire_date, salary,
+          INSERT INTO test_employees (employee_id, first_name, last_name, hire_date, salary, description,
                                       version, create_time, update_time)
-          VALUES (p_employee_id, p_first_name, p_last_name, p_hire_date, p_salary,
+          VALUES (p_employee_id, p_first_name, p_last_name, p_hire_date, p_salary, p_description,
                                       1, SYSDATE, SYSDATE);
         END create_employee;
         
@@ -73,14 +77,15 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
             p_first_name    VARCHAR2,
             p_last_name     VARCHAR2,
             p_hire_date     DATE,
-            p_salary        NUMBER)
+            p_salary        NUMBER,
+            p_description   VARCHAR2)
         IS
             v_version       NUMBER;
         BEGIN
           SELECT version INTO v_version FROM test_employees WHERE employee_id = p_employee_id FOR UPDATE;
           UPDATE test_employees
           SET employee_id = p_employee_id, first_name = p_first_name, last_name = p_last_name,
-              hire_date = p_hire_date, salary = p_salary,
+              hire_date = p_hire_date, salary = p_salary, description = p_description,
               version = v_version + 1, update_time = SYSDATE;
         END update_employee;
         
@@ -107,6 +112,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
           :p_last_name => last_name,
           :p_hire_date => hire_date,
           :p_salary => salary,
+          :p_description => "#{first_name} #{last_name}",
           :p_employee_id => nil
         )[:p_employee_id]
       end
@@ -118,7 +124,8 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
           :p_first_name => first_name,
           :p_last_name => last_name,
           :p_hire_date => hire_date,
-          :p_salary => salary
+          :p_salary => salary,
+          :p_description => "#{first_name} #{last_name}"
         )
       end
 
@@ -154,6 +161,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     @employee.first_name.should == "First"
     @employee.last_name.should == "Last"
     @employee.hire_date.should == @today
+    @employee.description.should == "First Last"
     @employee.create_time.should_not be_nil
     @employee.update_time.should_not be_nil
   end
@@ -162,13 +170,14 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     @employee = TestEmployee.create(
       :first_name => "First",
       :last_name => "Last",
-      :hire_date => @today
+      :hire_date => @today,
+      :description => "description"
     )
     @employee.reload
     @employee.first_name = "Second"
     @employee.save!
     @employee.reload
-    @employee.first_name.should == "Second"
+    @employee.description.should == "Second Last"
   end
 
   it "should not update record if nothing is changed and partial updates are enabled" do

metadata

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