oracle_enhanced 1.3.0.pre → 1.3.0.pre2

data/spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb

@@ -1,5 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
+require 'ruby-plsql'
+
 describe "OracleEnhancedAdapter custom methods for create, update and destroy" do
   include LoggerSpecHelper
   
@@ -10,7 +12,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     @conn.execute("DROP TABLE test_employees") rescue nil
     @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,
@@ -78,9 +80,10 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
         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,
+          SET first_name = p_first_name, last_name = p_last_name,
               hire_date = p_hire_date, salary = p_salary, description = p_description,
-              version = v_version + 1, update_time = SYSDATE;
+              version = v_version + 1, update_time = SYSDATE
+          WHERE employee_id = p_employee_id;
         END update_employee;
         
         PROCEDURE delete_employee(
@@ -93,7 +96,16 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     SQL
 
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
+  end
 
+  after(:all) do
+    @conn = ActiveRecord::Base.connection
+    @conn.execute "DROP TABLE test_employees"
+    @conn.execute "DROP SEQUENCE test_employees_s"
+    @conn.execute "DROP PACKAGE test_employees_pkg"
+  end
+
+  before(:each) do
     class ::TestEmployee < ActiveRecord::Base
       set_primary_key :employee_id
       
@@ -130,22 +142,21 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
         )
       end
 
+      private
+
+      def raise_make_transaction_rollback
+        raise "Make the transaction rollback"
+      end
     end
-  end
-  
-  after(:all) do
-    Object.send(:remove_const, "TestEmployee")
-    @conn = ActiveRecord::Base.connection    
-    @conn.execute "DROP TABLE test_employees"
-    @conn.execute "DROP SEQUENCE test_employees_s"
-    @conn.execute "DROP PACKAGE test_employees_pkg"
-  end
 
-  before(:each) do
     @today = Date.new(2008,6,28)
     @buffer = StringIO.new
   end
 
+  after(:each) do
+    Object.send(:remove_const, "TestEmployee")
+  end
+
   it "should create record" do
     @employee = TestEmployee.create(
       :first_name => "First",
@@ -162,22 +173,19 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
   end
 
   it "should rollback record when exception is raised in after_create callback" do
+    TestEmployee.after_create :raise_make_transaction_rollback
+
     @employee = TestEmployee.new(
       :first_name => "First",
       :last_name => "Last",
       :hire_date => @today
     )
-    TestEmployee.class_eval { def after_create() raise "Make the transaction rollback" end }
-    begin
-      employees_count = TestEmployee.count
-      lambda {
-        @employee.save
-      }.should raise_error("Make the transaction rollback")
-      @employee.id.should == nil
-      TestEmployee.count.should == employees_count
-    ensure
-      TestEmployee.class_eval { remove_method :after_create }
-    end
+    employees_count = TestEmployee.count
+    lambda {
+      @employee.save
+    }.should raise_error("Make the transaction rollback")
+    @employee.id.should == nil
+    TestEmployee.count.should == employees_count
   end
 
   it "should update record" do
@@ -195,25 +203,22 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
   end
 
   it "should rollback record when exception is raised in after_update callback" do
-    TestEmployee.class_eval { def after_update() raise "Make the transaction rollback" end }
-    begin
-      @employee = TestEmployee.create(
-        :first_name => "First",
-        :last_name => "Last",
-        :hire_date => @today,
-        :description => "description"
-      )
-      empl_id = @employee.id
-      @employee.reload
-      @employee.first_name = "Second"
-      lambda {
-        @employee.save
-      }.should raise_error("Make the transaction rollback")
-      @employee.reload
-      @employee.first_name.should == "First"
-    ensure
-      TestEmployee.class_eval { remove_method :after_update }
-    end
+    TestEmployee.after_update :raise_make_transaction_rollback
+
+    @employee = TestEmployee.create(
+      :first_name => "First",
+      :last_name => "Last",
+      :hire_date => @today,
+      :description => "description"
+    )
+    empl_id = @employee.id
+    @employee.reload
+    @employee.first_name = "Second"
+    lambda {
+      @employee.save
+    }.should raise_error("Make the transaction rollback")
+    @employee.reload
+    @employee.first_name.should == "First"
   end
 
   it "should not update record if nothing is changed and partial updates are enabled" do
@@ -270,23 +275,20 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
   end
 
   it "should rollback record when exception is raised in after_desotry callback" do
-    TestEmployee.class_eval { def after_destroy() raise "Make the transaction rollback" end }
-    begin
-      @employee = TestEmployee.create(
-        :first_name => "First",
-        :last_name => "Last",
-        :hire_date => @today
-      )
-      @employee.reload
-      empl_id = @employee.id
-      lambda {
-        @employee.destroy
-      }.should raise_error("Make the transaction rollback")
-      @employee.id.should == empl_id
-      TestEmployee.find_by_employee_id(empl_id).should_not be_nil
-    ensure
-      TestEmployee.class_eval { remove_method :after_destroy }
-    end
+    TestEmployee.after_destroy :raise_make_transaction_rollback
+
+    @employee = TestEmployee.create(
+      :first_name => "First",
+      :last_name => "Last",
+      :hire_date => @today
+    )
+    @employee.reload
+    empl_id = @employee.id
+    lambda {
+      @employee.destroy
+    }.should raise_error("Make the transaction rollback")
+    @employee.id.should == empl_id
+    TestEmployee.find_by_employee_id(empl_id).should_not be_nil
   end
 
   it "should set timestamps when creating record" do
@@ -315,13 +317,13 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
   end
 
   it "should log create record" do
-    log_to @buffer
+    set_logger
     @employee = TestEmployee.create(
       :first_name => "First",
       :last_name => "Last",
       :hire_date => @today
     )
-    @buffer.string.should match(/^TestEmployee Create \(\d+\.\d+(ms)?\)  custom create method$/)
+    @logger.logged(:debug).last.should match(/^TestEmployee Create \(\d+\.\d+(ms)?\)  custom create method$/)
   end
 
   it "should log update record" do
@@ -331,9 +333,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :last_name => "Last",
       :hire_date => @today
     )
-    log_to @buffer
+    set_logger
     @employee.save!
-    @buffer.string.should match(/^TestEmployee Update \(\d+\.\d+(ms)?\)  custom update method with employee_id=#{@employee.id}$/)
+    @logger.logged(:debug).last.should match(/^TestEmployee Update \(\d+\.\d+(ms)?\)  custom update method with employee_id=#{@employee.id}$/)
   end
 
   it "should log delete record" do
@@ -342,9 +344,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :last_name => "Last",
       :hire_date => @today
     )
-    log_to @buffer
+    set_logger
     @employee.destroy
-    @buffer.string.should match(/^TestEmployee Destroy \(\d+\.\d+(ms)?\)  custom delete method with employee_id=#{@employee.id}$/)
+    @logger.logged(:debug).last.should match(/^TestEmployee Destroy \(\d+\.\d+(ms)?\)  custom delete method with employee_id=#{@employee.id}$/)
   end
 
   it "should validate new record before creation" do
@@ -353,7 +355,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       :hire_date => @today
     )
     @employee.save.should be_false
-    @employee.errors.on(:first_name).should_not be_nil
+    @employee.errors[:first_name].should_not be_blank
   end
 
   it "should validate existing record before update" do
@@ -364,7 +366,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     )
     @employee.first_name = nil
     @employee.save.should be_false
-    @employee.errors.on(:first_name).should_not be_nil
+    @employee.errors[:first_name].should_not be_blank
   end
   
 end

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -190,7 +190,7 @@ describe "OracleEnhancedAdapter schema dump" do
       standard_dump.should =~ /add_index \"test_posts\", \[\"title\"\], :name => \"index_test_posts_on_title\"$/
     end
 
-    it "should not specify default tablespace in add index" do
+    it "should specify non-default tablespace in add index" do
       tablespace_name = @conn.default_tablespace
       @conn.stub!(:default_tablespace).and_return('dummy')
       create_test_posts_table
@@ -199,5 +199,18 @@ describe "OracleEnhancedAdapter schema dump" do
 
   end
 
+  describe "materialized views" do
+    after(:each) do
+      @conn.execute "DROP MATERIALIZED VIEW test_posts_mv" rescue nil
+      drop_test_posts_table
+    end
+
+    it "should not include materialized views in schema dump" do
+      create_test_posts_table
+      @conn.execute "CREATE MATERIALIZED VIEW test_posts_mv AS SELECT * FROM test_posts"
+      standard_dump.should_not =~ /create_table "test_posts_mv"/
+    end
+  end
+
 end
 

data/spec/spec_helper.rb

@@ -24,30 +24,41 @@ elsif ENV['RAILS_GEM_VERSION'] =~ /^2.3.3/
   gem 'actionpack', '=2.3.3'
   gem 'activesupport', '=2.3.3'
   gem 'composite_primary_keys', '=2.3.2'
-else
-  ENV['RAILS_GEM_VERSION'] ||= '2.3.5'
+elsif ENV['RAILS_GEM_VERSION'] =~ /^2.3/
   gem 'activerecord', '=2.3.5'
   gem 'actionpack', '=2.3.5'
   gem 'activesupport', '=2.3.5'
   NO_COMPOSITE_PRIMARY_KEYS = true
+else
+  # uses local copy of Rails 3 gems
+  ['rails/activerecord', 'rails/activemodel', 'rails/activesupport', 'arel', 'rails/actionpack', 'rails/railties'].each do |library|
+    $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../' + library + '/lib'))
+  end
+  ENV['RAILS_GEM_VERSION'] ||= '3.0'
+  NO_COMPOSITE_PRIMARY_KEYS = true
 end
 
 require 'active_record'
-require 'action_pack'
-if ENV['RAILS_GEM_VERSION'] >= '2.3'
+
+if ENV['RAILS_GEM_VERSION'] >= '3.0'
+  require 'action_dispatch'
+  require 'active_support/core_ext/module/attribute_accessors'
+  require "rails/log_subscriber"
+  require 'active_record/railties/log_subscriber'
+  require 'logger'
+elsif ENV['RAILS_GEM_VERSION'] =~ /^2.3/
+  require 'action_pack'
   require 'action_controller/session/abstract_store'
   require 'active_record/session_store'
-else
+elsif ENV['RAILS_GEM_VERSION'] <= '2.3'
+  require 'action_pack'
   require 'action_controller/session/active_record_store'
 end
-if !defined?(RUBY_ENGINE)
-  gem 'ruby-oci8', '=2.0.3'
-  require 'oci8'
-elsif RUBY_ENGINE == 'ruby'
-  gem 'ruby-oci8', '=2.0.3'
+if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby'
+  gem 'ruby-oci8', '>=2.0.4'
   require 'oci8'
 elsif RUBY_ENGINE == 'jruby'
-  gem "activerecord-jdbc-adapter"
+  gem 'activerecord-jdbc-adapter'
   require 'active_record/connection_adapters/jdbc_adapter'
 end
 
@@ -55,16 +66,78 @@ require 'active_record/connection_adapters/oracle_enhanced_adapter'
 require 'ruby-plsql'
 
 module LoggerSpecHelper
-  def log_to(stream)
-    ActiveRecord::Base.logger = Logger.new(stream)
-    if ActiveRecord::Base.respond_to?(:connection_pool)
-      ActiveRecord::Base.connection_pool.clear_reloadable_connections!
-    else
-      ActiveRecord::Base.clear_active_connections!
+  def set_logger
+    @logger = MockLogger.new
+
+    if ENV['RAILS_GEM_VERSION'] >= '3.0'
+      queue = ActiveSupport::Notifications::Fanout.new
+      @notifier = ActiveSupport::Notifications::Notifier.new(queue)
+
+      Rails::LogSubscriber.colorize_logging = false
+
+      ActiveRecord::Base.logger = @logger
+      ActiveSupport::Notifications.notifier = @notifier
+
+      Rails::LogSubscriber.add(:active_record, ActiveRecord::Railties::LogSubscriber.new)
+
+    else # ActiveRecord 2.x
+      if ActiveRecord::Base.respond_to?(:connection_pool)
+        ActiveRecord::Base.connection_pool.clear_reloadable_connections!
+      else
+        ActiveRecord::Base.clear_active_connections!
+      end
+      ActiveRecord::Base.logger = @logger
+      ActiveRecord::Base.colorize_logging = false
+      # ActiveRecord::Base.logger.level = Logger::DEBUG
+    end
+
+  end
+
+  class MockLogger
+    attr_reader :flush_count
+
+    def initialize
+      @flush_count = 0
+      @logged = Hash.new { |h,k| h[k] = [] }
     end
-    ActiveRecord::Base.colorize_logging = false
-    ActiveRecord::Base.logger.level = Logger::DEBUG
+
+    # used in AtiveRecord 2.x
+    def debug?
+      true
+    end
+
+    def method_missing(level, message)
+      @logged[level] << message
+    end
+
+    def logged(level)
+      @logged[level].compact.map { |l| l.to_s.strip }
+    end
+
+    def output(level)
+      logged(level).join("\n")
+    end
+
+    def flush
+      @flush_count += 1
+    end
+
+    def clear(level)
+      @logged[level] = []
+    end
+  end
+
+  def clear_logger
+    ActiveRecord::Base.logger = @logger = nil
+    ActiveSupport::Notifications.notifier = @notifier = nil if @notifier
   end
+
+  # Wait notifications to be published (for Rails 3.0)
+  # should not be currently used with sync queues in tests
+  def wait
+    @notifier.wait if @notifier
+  end
+
 end
 
 module SchemaSpecHelper
@@ -77,17 +150,17 @@ module SchemaSpecHelper
   end
 end
 
-DATABASE_NAME = ENV['DATABASE_NAME'] || 'orcl'
-DATABASE_HOST = ENV['DATABASE_HOST'] || 'localhost'
+DATABASE_NAME = ENV['DATABASE_NAME'] || '//ptvlhesdev1-vip.HARGRAY.ORG/dev'
+DATABASE_HOST = ENV['DATABASE_HOST'] || ''
 DATABASE_PORT = ENV['DATABASE_PORT'] || 1521
-DATABASE_USER = ENV['DATABASE_USER'] || 'oracle_enhanced'
-DATABASE_PASSWORD = ENV['DATABASE_PASSWORD'] || 'oracle_enhanced'
+DATABASE_USER = ENV['DATABASE_USER'] || 'luke_v'
+DATABASE_PASSWORD = ENV['DATABASE_PASSWORD'] || 'rock#ROLE'
 DATABASE_SYS_PASSWORD = ENV['DATABASE_SYS_PASSWORD'] || 'admin'
 
 CONNECTION_PARAMS = {
   :adapter => "oracle_enhanced",
   :database => DATABASE_NAME,
-  :host => DATABASE_HOST,
+#  :host => DATABASE_HOST,
   :username => DATABASE_USER,
   :password => DATABASE_PASSWORD
 }

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 3
   - 0
-  - pre
-  version: 1.3.0.pre
+  - pre2
+  version: 1.3.0.pre2
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 -05:00
+date: 2010-03-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,7 @@ files:
 - lib/active_record/connection_adapters/oracle_enhanced.rake
 - lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
 - lib/active_record/connection_adapters/oracle_enhanced_connection.rb
+- lib/active_record/connection_adapters/oracle_enhanced_context_index.rb
 - lib/active_record/connection_adapters/oracle_enhanced_core_ext.rb
 - lib/active_record/connection_adapters/oracle_enhanced_cpk.rb
 - lib/active_record/connection_adapters/oracle_enhanced_dirty.rb
@@ -81,11 +82,12 @@ files:
 - lib/active_record/connection_adapters/oracle_enhanced_schema_statements_ext.rb
 - lib/active_record/connection_adapters/oracle_enhanced_tasks.rb
 - lib/active_record/connection_adapters/oracle_enhanced_version.rb
-- lib/oracle_enhanced.rb
+- lib/active_record/oracle_enhanced.rb
 - oracle_enhanced.gemspec
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_structure_dumper_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb
@@ -98,7 +100,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/rsim/oracle-enhanced
+homepage: http://github.com/plukevdh/oracle-enhanced
 licenses: []
 
 post_install_message: 
@@ -133,6 +135,7 @@ test_files:
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_structure_dumper_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb