Title: [781] trunk/activerecord-jdbc/lib/active_record/connection_adapters/ jdbc_adapter.rb: Make sure to warn if the driver class isn't present.
Revision
781
Author
olabini
Date
2007-11-01 14:53:24 -0400 (Thu, 01 Nov 2007)

Log Message

Make sure to warn if the driver class isn't present. The error you get at this point otherwise is not really enlightening.

Modified Paths

Diff

Modified: trunk/activerecord-jdbc/lib/active_record/connection_adapters/jdbc_adapter.rb (780 => 781)


--- trunk/activerecord-jdbc/lib/active_record/connection_adapters/jdbc_adapter.rb	2007-10-29 21:25:33 UTC (rev 780)
+++ trunk/activerecord-jdbc/lib/active_record/connection_adapters/jdbc_adapter.rb	2007-11-01 18:53:24 UTC (rev 781)
@@ -203,17 +203,19 @@
 
       def driver_class
         @driver_class ||= begin
-          driver_class_const = (@name[0...1].capitalize + @[EMAIL PROTECTED]).gsub(/\./, '_')
-          Jdbc::Mutex.synchronized do
-            unless Jdbc.const_defined?(driver_class_const)
-              driver_class_name = @name
-              Jdbc.module_eval do
-                include_class(driver_class_name) { driver_class_const }
-              end
-            end
-          end
-          Jdbc.const_get(driver_class_const)
-        end
+                            driver_class_const = (@name[0...1].capitalize + @[EMAIL PROTECTED]).gsub(/\./, '_')
+                            Jdbc::Mutex.synchronized do
+                              unless Jdbc.const_defined?(driver_class_const)
+                                driver_class_name = @name
+                                Jdbc.module_eval do
+                                  include_class(driver_class_name) { driver_class_const }
+                                end
+                              end
+                            end
+                            driver_class = Jdbc.const_get(driver_class_const)
+                            raise "You specify a driver for your JDBC connection" unless driver_class
+                            driver_class
+                          end
       end
 
       def load
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel

Reply via email to