* test URI strings and test the connection

* test jdbc URI strings for jruby only

* test URIs which come in as DataObject::URI

data_objects/lib/data_objects/connection.rb

@@ -20,12 +20,13 @@ def self.new(uri_s)
       when :jdbc
         warn 'JDBC URLs (connection strings) are only for use with JRuby' unless RUBY_PLATFORM =~ /java/
 
-        driver_name = if uri.path.split(':').first == 'sqlite'
+        path = uri.path.sub(/jdbc:/, '')
+        driver_name = if path.split(':').first == 'sqlite'
           'sqlite3'
-        elsif uri.path.split(':').first == 'postgresql'
+        elsif path.split(':').first == 'postgresql'
           'postgres'
         else
-          uri.path.split(':').first
+          path.split(':').first
         end
 
         conn_uri = uri_s # NOTE: for now, do not reformat this JDBC connection

data_objects/lib/data_objects/spec/connection_spec.rb

@@ -60,6 +60,43 @@
     it { @connection.create_command('This is a dummy command').should be_kind_of(DataObjects::Command) }
   end
 
+  describe 'various connection URIs' do
+
+    def test_connection(conn)
+      reader = conn.create_command(CONFIG.testsql || "SELECT 1").execute_reader
+      reader.next!
+      reader.values[0]
+    end
+
+    after do
+      @open_connection.close if @open_connection
+    end
+
+    it 'should open with an uri object' do
+      uri = DataObjects::URI.new(
+              @driver,
+              @user,
+              @password,
+              @host,
+              @port.to_i,
+              @database,
+              nil, nil
+            )
+      test_connection(DataObjects::Connection.new(uri)).should == 1
+    end
+
+    it 'should work with non jdbc URIs' do
+      conn = DataObjects::Connection.new("#{CONFIG.uri.sub(/jdbc:/, '')}")
+      test_connection(conn).should == 1
+    end
+
+    if JRUBY
+      it 'should work with jdbc URIs' do
+        conn = DataObjects::Connection.new(CONFIG.jdbc_uri || "jdbc:#{CONFIG.uri.sub(/jdbc:/, '')}")
+        test_connection(conn).should == 1
+      end
+    end
+  end
 end
 
 share_examples_for 'a Connection with authentication support' do

do_derby/spec/spec_helper.rb

@@ -52,6 +52,7 @@
 # CONFIG.database = ENV['DO_DERBY_DATABASE'] || "#{File.expand_path(File.dirname(__FILE__))}/testdb"
 
 CONFIG.uri = ENV["DO_DERBY_SPEC_URI"] || "jdbc:derby:testdb;create=true"
+CONFIG.testsql = "SELECT 1 FROM SYSIBM.SYSDUMMY1"
 
 module DataObjectsSpecHelpers
 

do_hsqldb/spec/spec_helper.rb

@@ -52,6 +52,7 @@
 # CONFIG.database = ENV['DO_HSQLDB_DATABASE'] || "#{File.expand_path(File.dirname(__FILE__))}/testdb"
 
 CONFIG.uri = ENV["DO_HSQLDB_SPEC_URI"] || "jdbc:hsqldb:mem:test"
+CONFIG.testsql = "select 1 from INFORMATION_SCHEMA.SYSTEM_USERS"
 
 module DataObjectsSpecHelpers
 

do_jdbc/src/main/java/data_objects/Connection.java

@@ -23,9 +23,9 @@
 import org.jruby.runtime.Arity;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.callback.Callback;
-import org.jruby.runtime.Visibility;
 
 import data_objects.drivers.DriverDefinition;
 import data_objects.util.JDBCUtil;

do_jdbc/src/main/java/data_objects/drivers/AbstractDriverDefinition.java

@@ -177,7 +177,7 @@ public URI parseConnectionURI(IRubyObject connection_uri)
 
             if (user != null && !"".equals(user)) {
                 userInfo.append(user);
-                if (password != null && !"".equals(password)) {
+                if (password != null) {
                     userInfo.append(":").append(password);
                 }
             }

do_oracle/spec/spec_helper.rb

@@ -56,6 +56,7 @@
 
 CONFIG.uri = ENV["DO_ORACLE_SPEC_URI"] ||"#{CONFIG.scheme}://#{CONFIG.user}:#{CONFIG.pass}@#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}"
 CONFIG.sleep = "BEGIN SYS.DBMS_LOCK.sleep(seconds => 1); END;"
+CONFIG.testsql = "SELECT 1 FROM dual"
 
 module DataObjectsSpecHelpers
 

do_postgres/spec/spec_helper.rb

@@ -56,6 +56,7 @@
 CONFIG.database  = ENV['DO_POSTGRES_DATABASE'] || '/do_test'
 
 CONFIG.uri = ENV["DO_POSTGRES_SPEC_URI"] ||"#{CONFIG.scheme}://#{CONFIG.user_info}#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}"
+CONFIG.jdbc_uri = CONFIG.uri.sub(/postgres/,"jdbc:postgresql")
 CONFIG.sleep = "SELECT pg_sleep(1)"
 
 module DataObjectsSpecHelpers

do_sqlite3/spec/spec_helper.rb

@@ -48,6 +48,7 @@
 
 CONFIG.uri = ENV["DO_SQLITE3_SPEC_URI"] || "#{CONFIG.scheme}://#{CONFIG.database}"
 CONFIG.jdbc_driver = 'org.sqlite.JDBC'
+CONFIG.jdbc_uri = CONFIG.uri.sub(/postgres/,"jdbc:postgresql")
 
 module DataObjectsSpecHelpers