oracle_enhanced 1.3.0.pre → 1.3.0.pre2

data/spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb

@@ -0,0 +1,292 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe "OracleEnhancedAdapter context index" do
+  include SchemaSpecHelper
+
+  before(:all) do
+    # database user should have CTXAPP role to be able to set CONTEXT index parameters
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    @conn = ActiveRecord::Base.connection
+  end
+
+  describe "on single table" do
+    before(:all) do
+      @title_words = %w{aaa bbb ccc}
+      @body_words = %w{foo bar baz}
+
+      schema_define do
+        create_table :posts, :force => true do |t|
+          t.string :title
+          t.text :body
+          t.timestamps
+          t.string :all_text, :limit => 1 # will be used for multi-column index
+        end
+      end
+      class ::Post < ActiveRecord::Base
+        has_context_index
+      end
+      @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(' '))
+    end
+
+    after(:all) do
+      schema_define { drop_table :posts }
+      Object.send(:remove_const, "Post")
+    end
+
+    after(:each) do
+      @post.destroy if @post
+    end
+
+    it "should create single VARCHAR2 column index" do
+      @conn.add_context_index :posts, :title
+      @title_words.each do |word|
+        Post.contains(:title, word).all.should == [@post2, @post1]
+      end
+      @conn.remove_context_index :posts, :title
+    end
+
+    it "should create single CLOB column index" do
+      @conn.add_context_index :posts, :body
+      @body_words.each do |word|
+        Post.contains(:body, word).all.should == [@post2, @post1]
+      end
+      @conn.remove_context_index :posts, :body
+    end
+
+    it "should not include text index secondary tables in user tables list" do
+      @conn.add_context_index :posts, :title
+      @conn.tables.any?{|t| t =~ /^dr\$/i}.should be_false
+      @conn.remove_context_index :posts, :title
+    end
+
+    it "should create multiple column index" do
+      @conn.add_context_index :posts, [:title, :body]
+      (@title_words+@body_words).each do |word|
+        Post.contains(:title, word).all.should == [@post2, @post1]
+      end
+      @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'
+      @post = Post.create(:title => "abc", :body => "def")
+      Post.contains(:all_text, "abc").all.should == [@post]
+      Post.contains(:all_text, "def").all.should == [@post]
+      @post.update_attributes!(:title => "ghi")
+      # index will not be updated as all_text column is not changed
+      Post.contains(:all_text, "ghi").all.should be_empty
+      @post.update_attributes!(:all_text => "1")
+      # index will be updated when all_text column is changed
+      Post.contains(:all_text, "ghi").all.should == [@post]
+      @conn.remove_context_index :posts, :index_column => :all_text
+    end
+
+    it "should create multiple column index with trigger updated main index column" do
+      @conn.add_context_index :posts, [:title, :body],
+        :index_column => :all_text, :index_column_trigger_on => [:created_at, :updated_at],
+        :sync => 'ON COMMIT'
+      @post = Post.create(:title => "abc", :body => "def")
+      Post.contains(:all_text, "abc").all.should == [@post]
+      Post.contains(:all_text, "def").all.should == [@post]
+      @post.update_attributes!(:title => "ghi")
+      # index should be updated as created_at column is changed
+      Post.contains(:all_text, "ghi").all.should == [@post]
+      @conn.remove_context_index :posts, :index_column => :all_text
+    end
+
+  end
+
+  describe "on multiple tables" do
+    before(:all) do
+      schema_define do
+        create_table :posts, :force => true do |t|
+          t.string :title
+          t.text :body
+          t.integer :comments_count
+          t.timestamps
+          t.string :all_text, :limit => 1 # will be used for multi-column index
+        end
+        create_table :comments, :force => true do |t|
+          t.integer :post_id
+          t.string :author
+          t.text :body
+          t.timestamps
+        end
+      end
+      class ::Post < ActiveRecord::Base
+        has_many :comments, :dependent => :destroy
+        has_context_index
+      end
+      class ::Comment < ActiveRecord::Base
+        belongs_to :post, :counter_cache => true
+      end
+    end
+
+    after(:all) do
+      schema_define { drop_table :comments; drop_table :posts }
+      Object.send(:remove_const, "Comment")
+      Object.send(:remove_const, "Post")
+    end
+
+    after(:each) do
+      Post.destroy_all
+    end
+
+    it "should create multiple table index with specified main index column" do
+      @conn.add_context_index :posts,
+        [:title, :body,
+        # specify aliases always with AS keyword
+        "SELECT comments.author AS comment_author, comments.body AS comment_body FROM comments WHERE comments.post_id = :id"
+        ],
+        :name => 'post_and_comments_index',
+        :index_column => :all_text, :index_column_trigger_on => [:updated_at, :comments_count],
+        :sync => 'ON COMMIT'
+      @post = Post.create!(:title => "aaa", :body => "bbb")
+      @post.comments.create!(:author => "ccc", :body => "ddd")
+      @post.comments.create!(:author => "eee", :body => "fff")
+      ["aaa", "bbb", "ccc", "ddd", "eee", "fff"].each do |word|
+        Post.contains(:all_text, word).all.should == [@post]
+      end
+      @conn.remove_context_index :posts, :name => 'post_and_comments_index'
+    end
+
+    it "should find by search term within specified field" do
+      @post = Post.create!(:title => "aaa", :body => "bbb")
+      @post.comments.create!(:author => "ccc", :body => "ddd")
+      @conn.add_context_index :posts,
+        [:title, :body,
+        # specify aliases always with AS keyword
+        "SELECT comments.author AS comment_author, comments.body AS comment_body FROM comments WHERE comments.post_id = :id"
+        ],
+        :index_column => :all_text
+      Post.contains(:all_text, "aaa within title").all.should == [@post]
+      Post.contains(:all_text, "aaa within body").all.should be_empty
+      Post.contains(:all_text, "bbb within body").all.should == [@post]
+      Post.contains(:all_text, "bbb within title").all.should be_empty
+      Post.contains(:all_text, "ccc within comment_author").all.should == [@post]
+      Post.contains(:all_text, "ccc within comment_body").all.should be_empty
+      Post.contains(:all_text, "ddd within comment_body").all.should == [@post]
+      Post.contains(:all_text, "ddd within comment_author").all.should be_empty
+      @conn.remove_context_index :posts, :index_column => :all_text
+    end
+
+  end
+
+  describe "schema dump" do
+
+    def standard_dump
+      stream = StringIO.new
+      ActiveRecord::SchemaDumper.ignore_tables = []
+      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
+      stream.string
+    end
+
+    def create_tables
+      schema_define do
+        create_table :posts, :force => true do |t|
+          t.string :title
+          t.text :body
+          t.integer :comments_count
+          t.timestamps
+          t.string :all_text, :limit => 1 # will be used for multi-column index
+        end
+        create_table :comments, :force => true do |t|
+          t.integer :post_id
+          t.string :author
+          t.text :body
+          t.timestamps
+        end
+      end
+    end
+
+    def drop_tables
+      schema_define { drop_table :comments; drop_table :posts }
+    end
+
+    describe "without table prefixe and suffix" do
+
+      before(:all) do
+        create_tables
+      end
+
+      after(:all) do
+        drop_tables
+      end
+
+      it "should dump definition of single column index" do
+        @conn.add_context_index :posts, :title
+        standard_dump.should =~ /add_context_index "posts", \["title"\], :name => \"index_posts_on_title\"$/
+        @conn.remove_context_index :posts, :title
+      end
+
+      it "should dump definition of multiple column index" do
+        @conn.add_context_index :posts, [:title, :body]
+        standard_dump.should =~ /add_context_index "posts", \[:title, :body\]$/
+        @conn.remove_context_index :posts, [:title, :body]
+      end
+
+      it "should dump definition of multiple table index with options" do
+        options = {
+          :name => 'post_and_comments_index',
+          :index_column => :all_text, :index_column_trigger_on => :updated_at,
+          :sync => 'ON COMMIT'
+        }
+        @conn.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
+        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]}$/
+        @conn.remove_context_index :posts, :name => 'post_and_comments_index'
+      end
+
+    end
+
+    describe "with table prefix and suffix" do
+      before(:all) do
+        ActiveRecord::Base.table_name_prefix = 'xxx_'
+        ActiveRecord::Base.table_name_suffix = '_xxx'
+        create_tables
+      end
+
+      after(:all) do
+        drop_tables
+        ActiveRecord::Base.table_name_prefix = ''
+        ActiveRecord::Base.table_name_suffix = ''
+      end
+
+      it "should dump definition of single column index" do
+        schema_define { add_context_index :posts, :title }
+        standard_dump.should =~ /add_context_index "posts", \["title"\], :name => "i_xxx_posts_xxx_title"$/
+        schema_define { remove_context_index :posts, :title }
+      end
+
+      it "should dump definition of multiple column index" do
+        schema_define { add_context_index :posts, [:title, :body] }
+        standard_dump.should =~ /add_context_index "posts", \[:title, :body\]$/
+        schema_define { remove_context_index :posts, [:title, :body] }
+      end
+
+      it "should dump definition of multiple table index with options" do
+        options = {
+          :name => 'xxx_post_and_comments_i',
+          :index_column => :all_text, :index_column_trigger_on => :updated_at,
+          :sync => 'ON COMMIT'
+        }
+        schema_define do
+          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
+        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]}$/
+        schema_define { remove_context_index :posts, :name => 'xxx_post_and_comments_i' }
+      end
+
+    end
+
+  end
+
+end

data/spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb

@@ -6,7 +6,7 @@ describe "OracleEnhancedAdapter date type detection based on column names" do
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE test_employees (
-        employee_id   NUMBER(6,0),
+        employee_id   NUMBER(6,0) PRIMARY KEY,
         first_name    VARCHAR2(20),
         last_name     VARCHAR2(25),
         email         VARCHAR2(25),
@@ -192,7 +192,7 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE test2_employees (
-        id   NUMBER,
+        id            NUMBER PRIMARY KEY,
         first_name    VARCHAR2(20),
         last_name     VARCHAR2(25),
         email         VARCHAR2(25),
@@ -338,7 +338,7 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE test3_employees (
-        id            NUMBER,
+        id            NUMBER PRIMARY KEY,
         first_name    VARCHAR2(20),
         last_name     VARCHAR2(25),
         email         VARCHAR2(25),
@@ -521,7 +521,7 @@ describe "OracleEnhancedAdapter timestamp with timezone support" do
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE test_employees (
-        employee_id   NUMBER(6,0),
+        employee_id   NUMBER(6,0) PRIMARY KEY,
         first_name    VARCHAR2(20),
         last_name     VARCHAR2(25),
         email         VARCHAR2(25),
@@ -604,7 +604,7 @@ describe "OracleEnhancedAdapter date and timestamp with different NLS date forma
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE test_employees (
-        employee_id   NUMBER(6,0),
+        employee_id   NUMBER(6,0) PRIMARY KEY,
         first_name    VARCHAR2(20),
         last_name     VARCHAR2(25),
         email         VARCHAR2(25),
@@ -709,7 +709,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE test_employees (
-        employee_id   NUMBER(6,0),
+        employee_id   NUMBER(6,0) PRIMARY KEY,
         first_name    VARCHAR2(20),
         last_name     VARCHAR2(25),
         hire_date     DATE,
@@ -750,6 +750,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
       :last_name => "Last",
       :hire_date => @today_iso
     )
+    @employee.hire_date.should == @today
     @employee.reload
     @employee.hire_date.should == @today
   end
@@ -761,6 +762,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
       :last_name => "Last",
       :hire_date => @today_nls
     )
+    @employee.hire_date.should == @today
     @employee.reload
     @employee.hire_date.should == @today
   end
@@ -771,6 +773,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
       :last_name => "Last",
       :hire_date => @now_iso
     )
+    @employee.hire_date.should == @today
     @employee.reload
     @employee.hire_date.should == @today
   end
@@ -783,6 +786,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
       :last_name => "Last",
       :hire_date => @now_nls
     )
+    @employee.hire_date.should == @today
     @employee.reload
     @employee.hire_date.should == @today
   end
@@ -793,6 +797,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
       :last_name => "Last",
       :last_login_at => @now_iso
     )
+    @employee.last_login_at.should == @now
     @employee.reload
     @employee.last_login_at.should == @now
   end
@@ -805,6 +810,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
       :last_name => "Last",
       :last_login_at => @now_nls
     )
+    @employee.last_login_at.should == @now
     @employee.reload
     @employee.last_login_at.should == @now
   end
@@ -815,6 +821,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
       :last_name => "Last",
       :last_login_at => @today_iso
     )
+    @employee.last_login_at.should == @today.to_time
     @employee.reload
     @employee.last_login_at.should == @today.to_time
   end
@@ -827,6 +834,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
       :last_name => "Last",
       :last_login_at => @today_nls
     )
+    @employee.last_login_at.should == @today.to_time
     @employee.reload
     @employee.last_login_at.should == @today.to_time
   end
@@ -839,7 +847,7 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE test_employees (
-        employee_id   NUMBER(6,0),
+        employee_id   NUMBER(6,0) PRIMARY KEY,
         first_name    VARCHAR2(20),
         last_name     VARCHAR2(25),
         comments      CLOB
@@ -849,20 +857,23 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
       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
+    class ::TestEmployee < ActiveRecord::Base
+      set_primary_key :employee_id
+    end
   end
-  
+
+  after(:each) do
+    Object.send(:remove_const, "TestEmployee")
+  end
+
   it "should create record without CLOB data when attribute is serialized" do
     TestEmployee.serialize :comments
     @employee = TestEmployee.create!(
@@ -870,21 +881,6 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
       :last_name => "Last"
     )
     @employee.should be_valid
-    TestEmployee.serialized_attributes.delete('comments')
-  end
-
-  it "should order by CLOB column" do
-    @employee = TestEmployee.create!(
-      :first_name => "First",
-      :last_name => "Last",
-      :comments => "comments"
-    )
-    TestEmployee.find(:all, :order => "comments ASC").should_not be_empty
-    TestEmployee.find(:all, :order => " comments ASC ").should_not be_empty
-    TestEmployee.find(:all, :order => "comments").should_not be_empty
-    TestEmployee.find(:all, :order => " comments ").should_not be_empty
-    TestEmployee.find(:all, :order => :comments).should_not be_empty
-    TestEmployee.find(:all, :order => "  first_name DESC,  last_name   ASC   ").should_not be_empty
   end
 
   it "should accept Symbol value for CLOB column" do
@@ -902,7 +898,7 @@ describe "OracleEnhancedAdapter handling of BLOB columns" do
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE test_employees (
-        employee_id   NUMBER(6,0),
+        employee_id   NUMBER(6,0) PRIMARY KEY,
         first_name    VARCHAR2(20),
         last_name     VARCHAR2(25),
         binary_data   BLOB

data/spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb

@@ -4,7 +4,6 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
   include LoggerSpecHelper
 
   before(:all) do
-    @buffer = StringIO.new
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     ActiveRecord::Base.connection.execute <<-SQL
     CREATE or REPLACE
@@ -31,18 +30,21 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
   end
 
   before(:each) do
-    @buffer = StringIO.new
-    log_to @buffer
+    set_logger
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
   end
 
+  after(:each) do
+    clear_logger
+  end
+
   it "should NOT log dbms output when dbms output is disabled" do
     @conn.disable_dbms_output
 
     @conn.select_all("select more_than_five_characters_long('hi there') is_it_long from dual").should == [{'is_it_long'=>1}]
-    
-    @buffer.string.should_not match(/^DBMS_OUTPUT/)
+
+    @logger.output(:debug).should_not match(/^DBMS_OUTPUT/)
   end
 
   it "should log dbms output lines to the rails log" do
@@ -50,9 +52,9 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
 
     @conn.select_all("select more_than_five_characters_long('hi there') is_it_long from dual").should == [{'is_it_long'=>1}]
     
-    @buffer.string.should match(/^DBMS_OUTPUT: before the if -hi there-$/)
-    @buffer.string.should match(/^DBMS_OUTPUT: it is longer than 5$/)
-    @buffer.string.should match(/^DBMS_OUTPUT: about to return: 1$/)
+    @logger.output(:debug).should match(/^DBMS_OUTPUT: before the if -hi there-$/)
+    @logger.output(:debug).should match(/^DBMS_OUTPUT: it is longer than 5$/)
+    @logger.output(:debug).should match(/^DBMS_OUTPUT: about to return: 1$/)
   end
 
   it "should log dbms output lines to the rails log" do
@@ -60,8 +62,8 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
 
     @conn.select_all("select more_than_five_characters_long('short') is_it_long from dual").should == [{'is_it_long'=>0}]
     
-    @buffer.string.should match(/^DBMS_OUTPUT: before the if -short-$/)
-    @buffer.string.should match(/^DBMS_OUTPUT: it is 5 or shorter$/)
-    @buffer.string.should match(/^DBMS_OUTPUT: about to return: 0$/)
+    @logger.output(:debug).should match(/^DBMS_OUTPUT: before the if -short-$/)
+    @logger.output(:debug).should match(/^DBMS_OUTPUT: it is 5 or shorter$/)
+    @logger.output(:debug).should match(/^DBMS_OUTPUT: about to return: 0$/)
   end
 end

data/spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb

@@ -9,7 +9,7 @@ if ActiveRecord::Base.instance_methods.include?('changed?')
       @conn = ActiveRecord::Base.connection
       @conn.execute <<-SQL
         CREATE TABLE test_employees (
-          id            NUMBER,
+          id            NUMBER PRIMARY KEY,
           first_name    VARCHAR2(20),
           last_name     VARCHAR2(25),
           job_id        NUMBER(6,0) NULL,