activerecord-oracle_enhanced-adapter 1.3.0 → 1.3.1

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -35,6 +35,7 @@ end
 
 describe "OracleEnhancedAdapter" do
   include LoggerSpecHelper
+  include SchemaSpecHelper
 
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
@@ -187,12 +188,18 @@ describe "OracleEnhancedAdapter" do
         )
       SQL
       @column_names = ['id', 'first_name', 'last_name', 'hire_date']
+      @column_sql_types = ["NUMBER", "VARCHAR2(20)", "VARCHAR2(25)", "DATE"]
       class ::TestEmployee < ActiveRecord::Base
       end
+      # Another class using the same table
+      class ::TestEmployee2 < ActiveRecord::Base
+        set_table_name "test_employees"
+      end
     end
 
     after(:all) do
       Object.send(:remove_const, "TestEmployee")
+      Object.send(:remove_const, "TestEmployee2")
       @conn.execute "DROP TABLE test_employees"
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = nil
     end
@@ -237,6 +244,13 @@ describe "OracleEnhancedAdapter" do
         @logger.logged(:debug).last.should =~ /select .* from all_constraints/im
       end
 
+      it "should have correct sql types when 2 models are using the same table and AR query cache is enabled" do
+        @conn.cache do
+          TestEmployee.columns.map(&:sql_type).should == @column_sql_types
+          TestEmployee2.columns.map(&:sql_type).should == @column_sql_types
+        end
+      end
+
     end
 
     describe "with column caching" do
@@ -305,38 +319,54 @@ describe "OracleEnhancedAdapter" do
   end
 
 
-  describe "column quoting" do
+  describe "reserved words column quoting" do
 
-    def create_test_reserved_words_table
-      ActiveRecord::Schema.define do
-        suppress_messages do
-          create_table :test_reserved_words do |t|
-            t.string      :varchar2
-            t.integer     :integer
-          end
+    before(:all) do
+      schema_define do
+        create_table :test_reserved_words do |t|
+          t.string      :varchar2
+          t.integer     :integer
+          t.text        :comment
         end
       end
+      class ::TestReservedWord < ActiveRecord::Base; end
     end
 
-    after(:each) do
-      ActiveRecord::Schema.define do
-        suppress_messages do
-          drop_table :test_reserved_words
-        end
+    after(:all) do
+      schema_define do
+        drop_table :test_reserved_words
       end
       Object.send(:remove_const, "TestReservedWord")
       ActiveRecord::Base.table_name_prefix = nil
     end
 
-    it "should allow creation of a table with oracle reserved words as column names" do
-      create_test_reserved_words_table
-      class ::TestReservedWord < ActiveRecord::Base; end
+    before(:each) do
+      set_logger
+    end
 
-      [:varchar2, :integer].each do |attr|
+    after(:each) do
+      clear_logger
+    end
+
+    it "should create table" do
+      [:varchar2, :integer, :comment].each do |attr|
         TestReservedWord.columns_hash[attr.to_s].name.should == attr.to_s
       end
     end
 
+    it "should create record" do
+      attrs = {
+        :varchar2 => 'dummy',
+        :integer => 1,
+        :comment => 'dummy'
+      }
+      record = TestReservedWord.create!(attrs)
+      record.reload
+      attrs.each do |k, v|
+        record.send(k).should == v
+      end
+    end
+
   end
 
   describe "valid table names" do
@@ -508,11 +538,13 @@ describe "OracleEnhancedAdapter" do
 
   describe "session information" do
     it "should get current database name" do
-      @conn.current_database.should == CONNECTION_PARAMS[:database]
+      # get database name if using //host:port/database connection string
+      database_name = CONNECTION_PARAMS[:database].split('/').last
+      @conn.current_database.upcase.should == database_name.upcase
     end
 
     it "should get current database session user" do
-      @conn.current_user.should == CONNECTION_PARAMS[:username].upcase
+      @conn.current_user.upcase.should == CONNECTION_PARAMS[:username].upcase
     end
   end
 

data/spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb

@@ -47,7 +47,7 @@ if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
 
     it "should create new connection using :url" do
       params = CONNECTION_PARAMS.dup
-      params[:url] = "jdbc:oracle:thin:@#{DATABASE_HOST}:#{DATABASE_PORT}:#{DATABASE_NAME}"
+      params[:url] = "jdbc:oracle:thin:@#{DATABASE_HOST && "#{DATABASE_HOST}:"}#{DATABASE_PORT && "#{DATABASE_PORT}:"}#{DATABASE_NAME}"
       params[:host] = nil
       params[:database] = nil
       @conn = ActiveRecord::ConnectionAdapters::OracleEnhancedConnection.create(params)

data/spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe "OracleEnhancedAdapter context index" do
@@ -45,8 +47,16 @@ describe "OracleEnhancedAdapter context index" do
     drop_table_posts
   end
 
+  # Try to grant CTXAPP role to be able to set CONTEXT index parameters.
+  def grant_ctxapp
+    @sys_conn = ActiveRecord::ConnectionAdapters::OracleEnhancedConnection.create(SYS_CONNECTION_PARAMS)
+    @sys_conn.exec "GRANT CTXAPP TO #{DATABASE_USER}"
+  rescue
+    nil
+  end
+
   before(:all) do
-    # database user should have CTXAPP role to be able to set CONTEXT index parameters
+    grant_ctxapp
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
   end
@@ -62,6 +72,8 @@ describe "OracleEnhancedAdapter context index" do
       @post0 = Post.create(:title => "dummy title", :body => "dummy body")
       @post1 = Post.create(:title => @title_words.join(' '), :body => @body_words.join(' '))
       @post2 = Post.create(:title => (@title_words*2).join(' '), :body => (@body_words*2).join(' '))
+      @post_with_null_body = Post.create(:title => "withnull", :body => nil)
+      @post_with_null_title = Post.create(:title => nil, :body => "withnull")
     end
 
     after(:all) do
@@ -103,6 +115,12 @@ describe "OracleEnhancedAdapter context index" do
       @conn.remove_context_index :posts, [:title, :body]
     end
 
+    it "should index records with null values" do
+      @conn.add_context_index :posts, [:title, :body]
+      Post.contains(:title, "withnull").all.should == [@post_with_null_body, @post_with_null_title]
+      @conn.remove_context_index :posts, [:title, :body]
+    end
+
     it "should create multiple column index with specified main index column" do
       @conn.add_context_index :posts, [:title, :body],
         :index_column => :all_text, :sync => 'ON COMMIT'
@@ -131,6 +149,15 @@ describe "OracleEnhancedAdapter context index" do
       @conn.remove_context_index :posts, :index_column => :all_text
     end
 
+    it "should use base letter conversion with BASIC_LEXER" do
+      @post = Post.create!(:title => "āčē", :body => "dummy")
+      @conn.add_context_index :posts, :title,
+        :lexer => { :type => "BASIC_LEXER", :base_letter_type => 'GENERIC', :base_letter => true }
+      Post.contains(:title, "āčē").all.should == [@post]
+      Post.contains(:title, "ace").all.should == [@post]
+      Post.contains(:title, "ACE").all.should == [@post]
+      @conn.remove_context_index :posts, :title
+    end
   end
 
   describe "on multiple tables" do
@@ -315,6 +342,7 @@ describe "OracleEnhancedAdapter context index" do
         options = {
           :name => 'xxx_post_and_comments_i',
           :index_column => :all_text, :index_column_trigger_on => :updated_at,
+          :lexer => { :type => "BASIC_LEXER", :base_letter_type => 'GENERIC', :base_letter => true },
           :sync => 'ON COMMIT'
         }
         schema_define do
@@ -323,7 +351,8 @@ describe "OracleEnhancedAdapter context index" do
             "SELECT comments.author AS comment_author, comments.body AS comment_body FROM comments WHERE comments.post_id = :id"
             ], options
         end
-        standard_dump.should =~ /add_context_index "posts", \[:title, :body, "SELECT comments.author AS comment_author, comments.body AS comment_body FROM comments WHERE comments.post_id = :id"\], #{options.inspect[1..-2]}$/
+        standard_dump.should =~ /add_context_index "posts", \[:title, :body, "SELECT comments.author AS comment_author, comments.body AS comment_body FROM comments WHERE comments.post_id = :id"\], #{
+          options.inspect[1..-2].gsub(/[{}]/){|s| '\\'<<s }}$/
         schema_define { remove_context_index :posts, :name => 'xxx_post_and_comments_i' }
       end
 

data/spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb

@@ -724,6 +724,17 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
     class ::TestEmployee < ActiveRecord::Base
       set_primary_key :employee_id
     end
+    @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"
+    @now_nls_with_tz = "28.06.2008 13:34:33+05:00"
+    @nls_with_tz_time_format = "%d.%m.%Y %H:%M:%S%Z"
+    @now_with_tz = Time.parse @now_nls_with_tz
   end
   
   after(:all) do
@@ -733,14 +744,6 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
   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
   
@@ -803,7 +806,6 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
   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",
@@ -814,7 +816,19 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
     @employee.reload
     @employee.last_login_at.should == @now
   end
-  
+
+  it "should assign NLS time string with time zone to datetime column" do
+    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.string_to_time_format = @nls_with_tz_time_format
+    @employee = TestEmployee.create(
+      :first_name => "First",
+      :last_name => "Last",
+      :last_login_at => @now_nls_with_tz
+    )
+    @employee.last_login_at.should == @now_with_tz
+    @employee.reload
+    @employee.last_login_at.should == @now_with_tz
+  end
+
   it "should assign ISO date string to datetime column" do
     @employee = TestEmployee.create(
       :first_name => "First",
@@ -857,6 +871,8 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
       CREATE SEQUENCE test_employees_seq  MINVALUE 1
         INCREMENT BY 1 CACHE 20 NOORDER NOCYCLE
     SQL
+    @char_data = (0..127).to_a.pack("C*") * 800
+    @char_data2 = ((1..127).to_a.pack("C*") + "\0") * 800
   end
   
   after(:all) do
@@ -890,6 +906,93 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
     @employee.should be_valid
   end
 
+  it "should create record with CLOB data" do
+    @employee = TestEmployee.create!(
+      :first_name => "First",
+      :last_name => "Last",
+      :comments => @char_data
+    )
+    @employee.reload
+    @employee.comments.should == @char_data
+  end
+
+  it "should update record with CLOB data" do
+    @employee = TestEmployee.create!(
+      :first_name => "First",
+      :last_name => "Last"
+    )
+    @employee.reload
+    @employee.comments.should be_nil
+    @employee.comments = @char_data
+    @employee.save!
+    @employee.reload
+    @employee.comments.should == @char_data
+  end
+
+  it "should update record with zero-length CLOB data" do
+    @employee = TestEmployee.create!(
+      :first_name => "First",
+      :last_name => "Last"
+    )
+    @employee.reload
+    @employee.comments.should be_nil
+    @employee.comments = ''
+    @employee.save!
+    @employee.reload
+    @employee.comments.should == ''
+  end
+
+  it "should update record that has existing CLOB data with different CLOB data" do
+    @employee = TestEmployee.create!(
+      :first_name => "First",
+      :last_name => "Last",
+      :comments => @char_data
+    )
+    @employee.reload
+    @employee.comments = @char_data2
+    @employee.save!
+    @employee.reload
+    @employee.comments.should == @char_data2
+  end
+
+  it "should update record that has existing CLOB data with nil" do
+    @employee = TestEmployee.create!(
+      :first_name => "First",
+      :last_name => "Last",
+      :comments => @char_data
+    )
+    @employee.reload
+    @employee.comments = nil
+    @employee.save!
+    @employee.reload
+    @employee.comments.should be_nil
+  end
+
+  it "should update record that has existing CLOB data with zero-length CLOB data" do
+    @employee = TestEmployee.create!(
+      :first_name => "First",
+      :last_name => "Last",
+      :comments => @char_data
+    )
+    @employee.reload
+    @employee.comments = ''
+    @employee.save!
+    @employee.reload
+    @employee.comments.should == ''
+  end
+
+  it "should update record that has zero-length CLOB data with non-empty CLOB data" do
+    @employee = TestEmployee.create!(
+      :first_name => "First",
+      :last_name => "Last",
+      :comments => ''
+    )
+    @employee.reload
+    @employee.comments = @char_data
+    @employee.save!
+    @employee.reload
+    @employee.comments.should == @char_data
+  end
 end
 
 describe "OracleEnhancedAdapter handling of BLOB columns" do
@@ -950,6 +1053,19 @@ describe "OracleEnhancedAdapter handling of BLOB columns" do
     @employee.binary_data.should == @binary_data
   end
 
+  it "should update record with zero-length BLOB data" do
+    @employee = TestEmployee.create!(
+      :first_name => "First",
+      :last_name => "Last"
+    )
+    @employee.reload
+    @employee.binary_data.should be_nil
+    @employee.binary_data = ''
+    @employee.save!
+    @employee.reload
+    @employee.binary_data.should == ''
+  end
+
   it "should update record that has existing BLOB data with different BLOB data" do
     @employee = TestEmployee.create!(
       :first_name => "First",
@@ -975,6 +1091,31 @@ describe "OracleEnhancedAdapter handling of BLOB columns" do
     @employee.reload
     @employee.binary_data.should be_nil
   end
-  
+
+  it "should update record that has existing BLOB data with zero-length BLOB data" do
+    @employee = TestEmployee.create!(
+      :first_name => "First",
+      :last_name => "Last",
+      :binary_data => @binary_data
+    )
+    @employee.reload
+    @employee.binary_data = ''
+    @employee.save!
+    @employee.reload
+    @employee.binary_data.should == ''
+  end
+
+  it "should update record that has zero-length BLOB data with non-empty BLOB data" do
+    @employee = TestEmployee.create!(
+      :first_name => "First",
+      :last_name => "Last",
+      :binary_data => ''
+    )
+    @employee.reload
+    @employee.binary_data = @binary_data
+    @employee.save!
+    @employee.reload
+    @employee.binary_data.should == @binary_data
+  end
 end
 

data/spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb

@@ -60,6 +60,15 @@ if ActiveRecord::Base.instance_methods.include?('changed?')
     end
 
     it "should not mark empty text (stored as NULL) as changed when reassigning it" do
+      @employee = TestEmployee.create!(:comments => nil)
+      @employee.comments = nil
+      @employee.should_not be_changed
+      @employee.reload
+      @employee.comments = nil
+      @employee.should_not be_changed
+    end
+
+    it "should not mark empty text (stored as empty_clob()) as changed when reassigning it" do
       @employee = TestEmployee.create!(:comments => '')
       @employee.comments = ''
       @employee.should_not be_changed
@@ -68,6 +77,24 @@ if ActiveRecord::Base.instance_methods.include?('changed?')
       @employee.should_not be_changed
     end
 
+    it "should mark empty text (stored as empty_clob()) as changed when assigning nil to it" do
+      @employee = TestEmployee.create!(:comments => '')
+      @employee.comments = nil
+      @employee.should be_changed
+      @employee.reload
+      @employee.comments = nil
+      @employee.should be_changed
+    end
+
+    it "should mark empty text (stored as NULL) as changed when assigning '' to it" do
+      @employee = TestEmployee.create!(:comments => nil)
+      @employee.comments = ''
+      @employee.should be_changed
+      @employee.reload
+      @employee.comments = ''
+      @employee.should be_changed
+    end
+
     it "should not mark empty date (stored as NULL) as changed when reassigning it" do
       @employee = TestEmployee.create!(:hire_date => '')
       @employee.hire_date = ''