removed direct dependency on ruby-plsql in oracle_enhanced_procedures

NathanZook · Feb 23, 2010 · 0815362 · 0815362
1 parent e40dcfb
commit 0815362
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/History.txt b/History.txt
@@ -1,7 +1,7 @@
 == 1.2.4 2010-02-23
 
-* Enhancements
-  * added views, synonyms, packages, functions, procedures, indexes, triggers, types, primary, unique and foreign key contraints to structure dump
+* Enhancements:
+  * added views, synonyms, packages, functions, procedures, indexes, triggers, types, primary, unique and foreign key constraints to structure dump
   * added :temporary option for create_table to create temporary tables
   * added :tablespace option for add_index
   * support function based indexes in schema dump

diff --git a/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb b/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
@@ -1621,15 +1621,7 @@ class CGI::Session::ActiveRecordStore::Session
 end
 
 # Load custom create, update, delete methods functionality
-# rescue LoadError if ruby-plsql gem cannot be loaded
-begin
-  require 'active_record/connection_adapters/oracle_enhanced_procedures'
-rescue LoadError
-  if defined?(RAILS_DEFAULT_LOGGER)
-    RAILS_DEFAULT_LOGGER.info "INFO: ActiveRecord oracle_enhanced adapter could not load ruby-plsql gem. "+
-                              "Custom create, update and delete methods will not be available."
-  end
-end
+require 'active_record/connection_adapters/oracle_enhanced_procedures'
 
 # Load additional methods for composite_primary_keys support
 require 'active_record/connection_adapters/oracle_enhanced_cpk'

diff --git a/lib/active_record/connection_adapters/oracle_enhanced_procedures.rb b/lib/active_record/connection_adapters/oracle_enhanced_procedures.rb
@@ -4,7 +4,6 @@
   class_inheritable_accessor :custom_create_method, :custom_update_method, :custom_delete_method
 end
 
-require 'ruby_plsql'
 require 'active_support'
 
 module ActiveRecord #:nodoc:

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -52,6 +52,7 @@
 end
 
 require 'active_record/connection_adapters/oracle_enhanced_adapter'
+require 'ruby-plsql'
 
 module LoggerSpecHelper
   def log_to(stream)