DRY-out config detection for a jndi connection + add some connection tests

kares · kares · commit 8a2d97784cd8 · 2014-01-09T12:48:25.000+01:00
diff --git a/lib/arjdbc/db2/connection_methods.rb b/lib/arjdbc/db2/connection_methods.rb
@@ -3,7 +3,7 @@
   def db2_connection(config)
     config[:adapter_spec] ||= ::ArJdbc::DB2
 
-    return jndi_connection(config) if config[:jndi]
+    return jndi_connection(config) if jndi_config?(config)
 
     config[:url] ||= begin
       if config[:host] # Type 4 URL: jdbc:db2://server:port/database
diff --git a/lib/arjdbc/derby/connection_methods.rb b/lib/arjdbc/derby/connection_methods.rb
@@ -2,7 +2,7 @@
   def derby_connection(config)
     config[:adapter_spec] ||= ::ArJdbc::Derby
 
-    return jndi_connection(config) if config[:jndi]
+    return jndi_connection(config) if jndi_config?(config)
 
     begin
       require 'jdbc/derby'
diff --git a/lib/arjdbc/firebird/connection_methods.rb b/lib/arjdbc/firebird/connection_methods.rb
@@ -2,7 +2,7 @@
   def firebird_connection(config)
     config[:adapter_spec] ||= ::ArJdbc::Firebird
 
-    return jndi_connection(config) if config[:jndi]
+    return jndi_connection(config) if jndi_config?(config)
 
     begin
       require 'jdbc/firebird'
diff --git a/lib/arjdbc/h2/connection_methods.rb b/lib/arjdbc/h2/connection_methods.rb
@@ -3,7 +3,7 @@ def h2_connection(config)
     config[:adapter_spec] ||= ::ArJdbc::H2
     config[:adapter_class] = ActiveRecord::ConnectionAdapters::H2Adapter unless config.key?(:adapter_class)
 
-    return jndi_connection(config) if config[:jndi]
+    return jndi_connection(config) if jndi_config?(config)
 
     begin
       require 'jdbc/h2'
diff --git a/lib/arjdbc/hsqldb/connection_methods.rb b/lib/arjdbc/hsqldb/connection_methods.rb
@@ -3,7 +3,7 @@ def hsqldb_connection(config)
     config[:adapter_spec] ||= ::ArJdbc::HSQLDB
     config[:adapter_class] = ActiveRecord::ConnectionAdapters::HsqldbAdapter unless config.key?(:adapter_class)
 
-    return jndi_connection(config) if config[:jndi]
+    return jndi_connection(config) if jndi_config?(config)
 
     begin
       require 'jdbc/hsqldb'
diff --git a/lib/arjdbc/jdbc/connection.rb b/lib/arjdbc/jdbc/connection.rb
@@ -36,6 +36,10 @@ def native_database_types
       # @deprecated no longer used - only kept for compatibility
       def set_native_database_types; end
 
+      def self.jndi_config?(config)
+        config[:jndi] || config[:data_source]
+      end
+
       def jndi?; @jndi; end
       alias_method :jndi_connection?, :jndi?
 
@@ -46,7 +50,7 @@ def jndi?; @jndi; end
       # @note this has nothing to do with the configure_connection implemented
       # on some of the concrete adapters (e.g. {#ArJdbc::Postgres})
       def setup_connection_factory
-        if config[:jndi] || config[:data_source]
+        if self.class.jndi_config?(config)
           begin
             setup_jndi_factory
           rescue => e
diff --git a/lib/arjdbc/jdbc/connection_methods.rb b/lib/arjdbc/jdbc/connection_methods.rb
@@ -5,19 +5,26 @@ module ArJdbc
     ConnectionMethods = (class << ActiveRecord::Base; self; end)
   end
   ConnectionMethods.module_eval do
-    
+
     def jdbc_connection(config)
       adapter_class = config[:adapter_class]
       adapter_class ||= ::ActiveRecord::ConnectionAdapters::JdbcAdapter
       adapter_class.new(nil, logger, config)
     end
-    alias jndi_connection jdbc_connection
+
+    def jndi_connection(config); jdbc_connection(config) end
 
     def embedded_driver(config)
       config[:username] ||= "sa"
       config[:password] ||= ""
       jdbc_connection(config)
     end
-    
+
+    private
+
+    def jndi_config?(config)
+      ::ActiveRecord::ConnectionAdapters::JdbcConnection.jndi_config?(config)
+    end
+
   end
 end
diff --git a/lib/arjdbc/mssql/connection_methods.rb b/lib/arjdbc/mssql/connection_methods.rb
@@ -10,11 +10,11 @@ def mssql_connection(config)
     if config[:driver] =~ /SQLServerDriver$/ || config[:url] =~ /^jdbc:sqlserver:/
       return sqlserver_connection(config)
     end
-    
+
     config[:adapter_spec] ||= ::ArJdbc::MSSQL
     config[:adapter_class] = ActiveRecord::ConnectionAdapters::MSSQLAdapter unless config.key?(:adapter_class)
 
-    return jndi_connection(config) if config[:jndi]
+    return jndi_connection(config) if jndi_config?(config)
 
     begin
       require 'jdbc/jtds'
@@ -55,7 +55,7 @@ def sqlserver_connection(config)
     config[:adapter_spec] ||= ::ArJdbc::MSSQL
     config[:adapter_class] = ActiveRecord::ConnectionAdapters::MSSQLAdapter unless config.key?(:adapter_class)
 
-    return jndi_connection(config) if config[:jndi]
+    return jndi_connection(config) if jndi_config?(config)
 
     config[:host] ||= 'localhost'
     config[:driver] ||= 'com.microsoft.sqlserver.jdbc.SQLServerDriver'
diff --git a/lib/arjdbc/mysql/connection_methods.rb b/lib/arjdbc/mysql/connection_methods.rb
@@ -3,7 +3,7 @@ def mysql_connection(config)
     config[:adapter_spec] ||= ::ArJdbc::MySQL
     config[:adapter_class] = ActiveRecord::ConnectionAdapters::MysqlAdapter unless config.key?(:adapter_class)
 
-    return jndi_connection(config) if config[:jndi]
+    return jndi_connection(config) if jndi_config?(config)
 
     begin
       require 'jdbc/mysql'
diff --git a/lib/arjdbc/oracle/connection_methods.rb b/lib/arjdbc/oracle/connection_methods.rb
@@ -6,8 +6,8 @@ def oracle_connection(config)
     config[:adapter_spec] ||= ::ArJdbc::Oracle
     config[:adapter_class] = ActiveRecord::ConnectionAdapters::OracleAdapter unless config.key?(:adapter_class)
 
-    return jndi_connection(config) if config[:jndi]
-    
+    return jndi_connection(config) if jndi_config?(config)
+
     config[:port] ||= 1521
     config[:url] ||= "jdbc:oracle:thin:@#{config[:host]}:#{config[:port]}:#{config[:database]}"
     config[:driver] ||= "oracle.jdbc.driver.OracleDriver"
diff --git a/lib/arjdbc/postgresql/connection_methods.rb b/lib/arjdbc/postgresql/connection_methods.rb
@@ -3,7 +3,7 @@ def postgresql_connection(config)
     config[:adapter_spec] ||= ::ArJdbc::PostgreSQL
     config[:adapter_class] = ActiveRecord::ConnectionAdapters::PostgreSQLAdapter unless config.key?(:adapter_class)
 
-    return jndi_connection(config) if config[:jndi]
+    return jndi_connection(config) if jndi_config?(config)
 
     begin
       require 'jdbc/postgres'
diff --git a/lib/arjdbc/sqlite3/connection_methods.rb b/lib/arjdbc/sqlite3/connection_methods.rb
@@ -3,7 +3,7 @@ def sqlite3_connection(config)
     config[:adapter_spec] ||= ::ArJdbc::SQLite3
     config[:adapter_class] = ActiveRecord::ConnectionAdapters::SQLite3Adapter unless config.key?(:adapter_class)
 
-    return jndi_connection(config) if config[:jndi]
+    return jndi_connection(config) if jndi_config?(config)
 
     begin
       require 'jdbc/sqlite3'
diff --git a/test/db/mysql/unit_test.rb b/test/db/mysql/unit_test.rb
@@ -90,4 +90,25 @@ def initialize; end
     assert_equal s, mySQL.quote_string(s)
   end
 
+  context 'connection' do
+
+    test 'jndi configuration' do
+      connection_handler = connection_handler_stub
+
+      config = { :jndi => 'jdbc/TestDS' }
+      connection_handler.expects(:jndi_connection)
+      connection_handler.mysql_connection config
+
+      # we do not complete username/database etc :
+      assert_nil config[:username]
+      assert_nil config[:database]
+      assert ! config.key?(:database)
+      assert ! config.key?(:url)
+      assert ! config.key?(:port)
+
+      assert config[:adapter_class]
+    end
+
+  end
+
 end if defined? JRUBY_VERSION
diff --git a/test/db/postgresql/unit_test.rb b/test/db/postgresql/unit_test.rb
@@ -53,16 +53,29 @@ def order.to_sql
 
   end
 
+  context 'connection' do
+
+    test 'jndi configuration' do
+      connection_handler = connection_handler_stub
+
+      config = { :jndi => 'jdbc/TestDS' }
+      connection_handler.expects(:jndi_connection)
+      connection_handler.postgresql_connection config
+
+      # we do not complete username/database etc :
+      assert_nil config[:username]
+      assert_nil config[:database]
+      assert ! config.key?(:database)
+
+      assert_equal ActiveRecord::ConnectionAdapters::PostgreSQLAdapter, config[:adapter_class]
+    end
+
+  end
+
   private
 
   def connection_stub
-    connection = mock('connection')
-    (class << connection; self; end).class_eval do
-      def self.alias_chained_method(*args); args; end
-    end
-    def connection.configure_connection; nil; end
-    connection.extend ArJdbc::PostgreSQL
-    connection
+    super ArJdbc::PostgreSQL
   end
 
 end if defined? JRUBY_VERSION
diff --git a/test/stub_helper.rb b/test/stub_helper.rb
@@ -0,0 +1,25 @@
+
+module StubHelper
+
+  def connection_stub(spec)
+    connection = mock('connection')
+    (class << connection; self; end).class_eval do
+      def self.alias_chained_method(*args); args; end
+    end
+    def connection.configure_connection; nil; end
+    connection.extend spec
+    connection
+  end
+
+  def connection_methods_stub
+    if ArJdbc::ConnectionMethods == (class << ActiveRecord::Base; self; end)
+      connection_handler = ActiveRecord::Base
+    else
+      connection_handler = Object.new
+      connection_handler.extend ArJdbc::ConnectionMethods
+    end
+    connection_handler
+  end
+  alias_method :connection_handler_stub, :connection_methods_stub
+
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -59,8 +59,10 @@ def get_system_property(name)
   defined?(ENV_JAVA) ? ENV_JAVA[name] : ENV[name]
 end
 
-# assert_queries and SQLCounter taken from rails active_record tests
+require 'stub_helper'
+
 class Test::Unit::TestCase
+  include StubHelper
 
   alias skip omit
 
