activerecord-jdbc-adapter 1.2.2.1 → 1.2.5

data/test/db/jdbc_derby.rb

@@ -0,0 +1,14 @@
+require 'jdbc_common'
+
+config = {
+  :adapter => 'jdbc',
+  :url => 'jdbc:derby:memory:derby-testdb;create=true',
+  :driver => 'org.apache.derby.jdbc.EmbeddedDriver',
+  :username => 'arjdbc',
+  :password => 'arjdbc'
+}
+
+require 'jdbc/derby' # driver not loaded for plain JDBC
+Jdbc::Derby.load_driver(:require)
+
+ActiveRecord::Base.establish_connection(config)

data/test/db/jdbc_h2.rb

@@ -0,0 +1,17 @@
+require 'jdbc_common'
+
+config = {
+  :adapter => 'jdbc',
+  :driver => 'org.h2.Driver',
+  :url => 'jdbc:h2:test.db'
+}
+
+require 'jdbc/h2' # driver not loaded for plain JDBC
+Jdbc::H2.load_driver(:require)
+
+ActiveRecord::Base.establish_connection(config)
+
+at_exit {
+  # Clean up hsqldb when done
+  Dir['test.db*'].each { |f| FileUtils.rm_rf(f) }
+}

data/test/db/jdbc_mysql.rb

@@ -0,0 +1,13 @@
+require 'jdbc_common'
+require 'db/mysql_config'
+
+require 'jdbc/mysql' # driver not loaded for plain JDBC
+Jdbc::MySQL.load_driver
+
+ActiveRecord::Base.establish_connection({
+  :adapter => 'jdbc',
+  :driver => 'com.mysql.jdbc.Driver',
+  :url => "jdbc:mysql://#{MYSQL_CONFIG[:host]}/#{MYSQL_CONFIG[:database]}",
+  :username => MYSQL_CONFIG[:username],
+  :password => MYSQL_CONFIG[:password],
+})

data/test/db/jdbc_postgres.rb

@@ -0,0 +1,23 @@
+require 'jdbc_common'
+require 'db/postgres_config'
+
+require 'jdbc/postgres' # driver not loaded for plain JDBC
+Jdbc::Postgres::load_driver
+
+url = POSTGRES_CONFIG[:host].dup
+url << ":#{POSTGRES_CONFIG[:port]}" if POSTGRES_CONFIG[:port]
+
+ActiveRecord::Base.establish_connection({
+  :adapter => 'jdbc',
+  :driver => 'org.postgresql.Driver',
+  :url => "jdbc:postgresql://#{url}/#{POSTGRES_CONFIG[:database]}",
+  :username => POSTGRES_CONFIG[:username],
+  :password => POSTGRES_CONFIG[:password],
+})
+
+begin
+  result = ActiveRecord::Base.connection.execute("SHOW server_version_num")
+  PG_VERSION = result.first.first[1].to_i
+rescue
+  PG_VERSION = 0
+end

data/test/db/jndi_config.rb

@@ -1,40 +1,35 @@
-require 'fileutils'
 require 'arjdbc'
+require 'jdbc_common'
 
 JNDI_CONFIG = {
-  :adapter => "jdbc",
-  :jndi => 'jdbc/derbydb'
+  :adapter => 'jdbc', :jndi => 'jdbc/DerbyDB'
 }
 
-# To test JNDI, grab fscontext-1_2-beta3.zip from
-# http://java.sun.com/products/jndi/downloads/index.html
-# and put fscontext.jar and providerutil.jar in test/
-require 'test/fscontext.jar'
-require 'test/providerutil.jar'
-require 'jdbc/derby'
-
-System = java.lang.System
-Context = javax.naming.Context
-InitialContext = javax.naming.InitialContext
-Reference = javax.naming.Reference
-StringRefAddr = javax.naming.StringRefAddr
-
-System.set_property(Context::INITIAL_CONTEXT_FACTORY,
-                    'com.sun.jndi.fscontext.RefFSContextFactory')
-project_path = File.expand_path(File.dirname(__FILE__) + '/../..')
-jndi_dir = project_path + '/jndi_test'
-jdbc_dir = jndi_dir + '/jdbc'
-FileUtils.mkdir_p jdbc_dir unless File.exist?(jdbc_dir)
+# FS based JNDI impl borrowed from tomcat :
+load 'test/jars/tomcat-juli.jar'
+load 'test/jars/tomcat-catalina.jar'
 
-System.set_property(Context::PROVIDER_URL, "file://#{jndi_dir}")
+java.lang.System.set_property(
+    javax.naming.Context::INITIAL_CONTEXT_FACTORY,
+    'org.apache.naming.java.javaURLContextFactory'
+)
+java.lang.System.set_property(
+    javax.naming.Context::URL_PKG_PREFIXES,
+    'org.apache.naming'
+)
 
-ic = InitialContext.new
-ic.rebind(JNDI_CONFIG[:jndi],
-          org.apache.derby.jdbc.EmbeddedDataSource.new.tap {|ds|
-            ds.database_name = "derby-testdb-jndi"
-            ds.create_database = "create"
-            ds.user = "sa"
-            ds.password = ""})
-
-
-ActiveRecord::Base.establish_connection(JNDI_CONFIG)
+require 'jdbc/derby'
+Jdbc::Derby.load_driver
+
+data_source = org.apache.derby.jdbc.EmbeddedDataSource.new
+data_source.database_name = "memory:DerbyDB-JNDI"
+data_source.create_database = "create"
+data_source.user = "sa"
+data_source.password = ""
+
+init_context = javax.naming.InitialContext.new
+begin
+  init_context.create_subcontext 'jdbc'
+rescue javax.naming.NameAlreadyBoundException
+end
+init_context.bind JNDI_CONFIG[:jndi], data_source

data/test/db/jndi_pooled_config.rb

@@ -0,0 +1,35 @@
+require 'arjdbc'
+require 'jdbc_common'
+
+JNDI_POOLED_CONFIG = {
+  :adapter => 'jdbc', :jndi => 'jdbc/PooledDerbyDB'
+}
+
+# FS based JNDI impl borrowed from tomcat :
+load 'test/jars/tomcat-juli.jar'
+load 'test/jars/tomcat-catalina.jar'
+
+java.lang.System.set_property(
+    javax.naming.Context::INITIAL_CONTEXT_FACTORY,
+    'org.apache.naming.java.javaURLContextFactory'
+)
+java.lang.System.set_property(
+    javax.naming.Context::URL_PKG_PREFIXES,
+    'org.apache.naming'
+)
+
+require 'jdbc/derby'
+Jdbc::Derby.load_driver
+
+data_source = org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource.new
+data_source.database_name = "memory:PooledDerbyDB-JNDI"
+data_source.create_database = "create"
+data_source.user = "sa"
+data_source.password = ""
+
+init_context = javax.naming.InitialContext.new
+begin
+  init_context.create_subcontext 'jdbc'
+rescue javax.naming.NameAlreadyBoundException
+end
+init_context.bind JNDI_POOLED_CONFIG[:jndi], data_source

data/test/db/logger.rb

@@ -1,3 +1,3 @@
 require 'logger'
 ActiveRecord::Base.logger = Logger.new($stdout)
-ActiveRecord::Base.logger.level = Logger::DEBUG
+ActiveRecord::Base.logger.level = $DEBUG || ENV['DEBUG'] ? Logger::DEBUG : Logger::WARN

data/test/db/mssql.rb

@@ -1,3 +1,5 @@
+require 'jdbc_common'
+
 MSSQL_CONFIG = {
   :username => 'blog',
   :password => '',

data/test/db/mysql.rb

@@ -1,10 +1,5 @@
-MYSQL_CONFIG = {
-  :username => 'arjdbc',
-  :password => 'arjdbc',
-  :adapter  => 'mysql',
-  :database => 'arjdbc_test',
-  :host     => 'localhost'
-}
+require 'jdbc_common'
+require 'db/mysql_config'
 
 ActiveRecord::Base.establish_connection(MYSQL_CONFIG)
 

data/test/db/mysql_config.rb

@@ -0,0 +1,7 @@
+MYSQL_CONFIG = {
+  :username => 'arjdbc',
+  :password => 'arjdbc',
+  :adapter  => 'mysql',
+  :database => 'arjdbc_test',
+  :host     => 'localhost'
+}

data/test/db/oracle.rb

@@ -1,3 +1,5 @@
+require 'jdbc_common'
+
 config = {
   :username => 'blog',
   :password => 'blog',

data/test/db/postgres.rb

@@ -1,9 +1,11 @@
-POSTGRES_CONFIG = {
-  :adapter => 'postgresql',
-  :database => 'arjdbc_test',
-  :host => 'localhost',
-  :username => 'arjdbc',
-  :password => 'arjdbc'
-}
+require 'jdbc_common'
+require 'db/postgres_config'
 
 ActiveRecord::Base.establish_connection(POSTGRES_CONFIG)
+
+begin
+  result = ActiveRecord::Base.connection.execute("SHOW server_version_num")
+  PG_VERSION = result.first.first[1].to_i
+rescue
+  PG_VERSION = 0
+end

data/test/db/postgres_config.rb

@@ -0,0 +1,10 @@
+POSTGRES_CONFIG = {
+  :adapter => 'postgresql',
+  :database => 'arjdbc_test',
+  :host => 'localhost',
+  :username => 'arjdbc',
+  :password => 'arjdbc'
+}
+
+POSTGRES_CONFIG[:host] = ENV['PGHOST'] if ENV['PGHOST']
+POSTGRES_CONFIG[:port] = ENV['PGPORT'] if ENV['PGPORT']

data/test/db/sqlite3.rb

@@ -1,3 +1,5 @@
+require 'jdbc_common'
+
 config = {
   :adapter => 'sqlite3',
   :database  => 'test.sqlite3.db'

data/test/db2_reset_column_information_test.rb

@@ -1,5 +1,3 @@
-#! /usr/bin/env jruby
-
 require 'jdbc_common'
 require 'db/db2'
 

data/test/derby_migration_test.rb

@@ -1,5 +1,4 @@
 require 'jdbc_common'
-require 'db/derby'
 
 class CreateDummies < ActiveRecord::Migration
   def self.up

data/test/derby_multibyte_test.rb

@@ -5,7 +5,6 @@
 #   grant all on weblog_development.* to blog@localhost;
 
 require 'jdbc_common'
-require 'db/derby'
 
 class DerbyMultibyteTest < Test::Unit::TestCase
   include MultibyteTestMethods

data/test/derby_reset_column_information_test.rb

@@ -1,7 +1,4 @@
-#! /usr/bin/env jruby
-
 require 'jdbc_common'
-require 'db/derby'
 
 class DerbyResetColumnInformationTest < Test::Unit::TestCase
   include ResetColumnInformationTestMethods

data/test/derby_row_locking_test.rb

@@ -1,7 +1,4 @@
-#! /usr/bin/env jruby
-
 require 'jdbc_common'
-require 'db/derby'
 
 class DerbyRowLockingTest < Test::Unit::TestCase
   include MigrationSetup

data/test/derby_simple_test.rb

@@ -5,7 +5,6 @@
 #   grant all on weblog_development.* to blog@localhost;
 
 require 'jdbc_common'
-require 'db/derby'
 
 class DerbySimpleTest < Test::Unit::TestCase
   include SimpleTestMethods

data/test/generic_jdbc_connection_test.rb

@@ -2,28 +2,83 @@ require 'jdbc_common'
 require 'db/jdbc'
 
 class GenericJdbcConnectionTest < Test::Unit::TestCase
+
   def test_connection_available_through_jdbc_adapter
-    ActiveRecord::Base.connection.execute("show databases");
-    assert ActiveRecord::Base.connected?
+     ActiveRecord::Base.connection.execute("show databases") # MySQL
+     assert ActiveRecord::Base.connected?
   end
 
-  def test_configure_connection_url
-    connection = Object.new
-    connection.extend ActiveRecord::ConnectionAdapters::JdbcConnection::ConfigHelper
-    connection.config = { :url => "jdbc://somehost", :options => { :hoge => "true", :fuya => "false"} }
-    assert_equal "jdbc://somehost?hoge=true&fuya=false", connection.configure_url
+  class ConfigHelperTest < Test::Unit::TestCase
 
-    connection.config = { :url => "jdbc://somehost?param=0", :options => { :hoge => "true", :fuya => "false"} }
-    assert_equal "jdbc://somehost?param=0&hoge=true&fuya=false", connection.configure_url
-  end
+    test 'configure connection url' do
+      connection = Object.new
+      connection.extend ActiveRecord::ConnectionAdapters::JdbcConnection::ConfigHelper
+      connection.config = { :url => "jdbc://somehost", :options => { :hoge => "true", :fuya => "false"} }
+      assert_equal "jdbc://somehost?hoge=true&fuya=false", connection.send(:configure_url)
+
+      connection.config = { :url => "jdbc://somehost?param=0", :options => { :hoge => "true", :fuya => "false"} }
+      assert_equal "jdbc://somehost?param=0&hoge=true&fuya=false", connection.send(:configure_url)
+    end
+
+    test 'connection fails without driver and url' do
+      with_connection_removed do
+        ActiveRecord::Base.establish_connection :adapter => 'jdbc'
+        assert_raises(ActiveRecord::ConnectionNotEstablished) do
+          ActiveRecord::Base.connection
+        end
+      end
+    end
+
+    test 'connection fails without driver' do
+      with_connection_removed do
+        ActiveRecord::Base.establish_connection :adapter => 'jdbc', :url => 'jdbc:derby:test.derby;create=true'
+        assert_raises(ActiveRecord::ConnectionNotEstablished) do
+          ActiveRecord::Base.connection
+        end
+      end
+    end
+
+    test 'connection does not fail with driver_instance and url' do
+      load_derby_driver
+      with_connection_removed do
+        driver_instance = ActiveRecord::ConnectionAdapters::JdbcDriver.new('org.apache.derby.jdbc.EmbeddedDriver')
+        ActiveRecord::Base.establish_connection :adapter => 'jdbc', 
+          :url => 'jdbc:derby:memory:TestDB;create=true', :driver_instance => driver_instance
+        assert_nothing_raised do
+          ActiveRecord::Base.connection
+        end
 
-  def test_connection_fails_without_driver_and_url
-    conn = ActiveRecord::Base.remove_connection
-    assert_raises(ActiveRecord::ConnectionNotEstablished) do
-      ActiveRecord::Base.establish_connection :adapter => 'jdbc'
-      ActiveRecord::Base.connection
+        assert ActiveRecord::Base.connected?
+        assert_nothing_raised do
+          connection = ActiveRecord::Base.connection
+          connection.execute("create table my_table(x int)")
+          #connection.execute("insert into my_table values 42")
+          #connection.execute("select * from my_table")
+        end
+      end
     end
-  ensure
-    ActiveRecord::Base.establish_connection conn
+
+    private
+
+    def with_connection_removed
+      connection = ActiveRecord::Base.remove_connection
+      begin
+        yield
+      ensure
+        ActiveRecord::Base.establish_connection connection 
+      end
+    end
+
+    @@derby_driver_loaded = nil
+
+    def load_derby_driver
+      @@derby_driver_loaded ||= begin
+        require 'jdbc/derby'
+        Jdbc::Derby.load_driver
+        true
+      end
+    end
+
   end
+
 end

data/test/h2_change_column_test.rb

@@ -1,5 +1,4 @@
 require 'jdbc_common'
-require 'db/h2'
 
 class H2ChangeColumnTest < Test::Unit::TestCase
 

data/test/h2_simple_test.rb

@@ -1,5 +1,4 @@
 require 'jdbc_common'
-require 'db/h2'
 
 class H2SimpleTest < Test::Unit::TestCase
   include SimpleTestMethods

data/test/helper.rb

@@ -1,104 +1,35 @@
+# Defining helper methods useful both in the definition of test tasks, as well as in the execution
+# of tests themselves.  Do not require test/unit within this file, as that'll make the rake process
+# attempt to run tests itself.  Test-specific helpers should go in test/jdbc_common.rb.
+
 module Kernel
   def find_executable?(name)
-    ENV['PATH'].split(File::PATH_SEPARATOR).detect {|p| File.executable?(File.join(p, name))}
+    (ENV['PATH'] || '').split(File::PATH_SEPARATOR).
+      detect { |p| File.executable?(File.join(p, name)) }
   end
+end
 
-  def have_postgres?
+module PostgresHelper
+  def self.pg_cmdline_params
+    params = ""
+    params += "-h #{ENV['PGHOST']} " if ENV['PGHOST']
+    params += "-p #{ENV['PGPORT']} " if ENV['PGPORT']
+    params
+  end
+
+  def self.have_postgres?(warn = nil)
     if find_executable?("psql")
-      if `psql -c '\\l' -U postgres 2>&1` && $?.exitstatus == 0
+      if `psql -c '\\l' -U postgres #{pg_cmdline_params}2>&1` && $?.exitstatus == 0
         true
       else
-        warn "No \"postgres\" role? You might need to execute `createuser postgres -drs' first."
+        if warn.nil?
+          warn = "No \"postgres\" role? You might need to execute `createuser postgres -drs' first."
+        end
+        send(:warn, warn) if warn # warn == false disables warnings
         false
       end
     end
   end
 end
 
-if defined?(::ActiveRecord::ConnectionAdapters)
-
-  # assert_queries and SQLCounter taken from rails active_record tests
-  require 'test/unit'
-  class Test::Unit::TestCase
-    def assert_queries(num = 1, matching = nil)
-      ActiveRecord::SQLCounter.log = []
-      yield
-    ensure
-      queries = nil
-      ActiveRecord::SQLCounter.log.tap {|log| queries = (matching ? log.select {|s| s =~ matching } : log) }
-      assert_equal num, queries.size, "#{queries.size} instead of #{num} queries were executed.#{queries.size == 0 ? '' : "\nQueries:\n#{queries.join("\n")}"}"
-    end
-  end
-
-  module ActiveRecord
-    class SQLCounter
-      def self.ignored_sql
-        @@ignored_sql
-      end
-
-      def self.ignored_sql=(value)
-        @@ignored_sql = value
-      end
-
-      self.ignored_sql = [
-        /^PRAGMA (?!(table_info))/,
-        /^SELECT currval/,
-        /^SELECT CAST/,
-        /^SELECT @@IDENTITY/,
-        /^SELECT @@ROWCOUNT/,
-        /^SAVEPOINT/,
-        /^ROLLBACK TO SAVEPOINT/,
-        /^RELEASE SAVEPOINT/,
-        /^SHOW max_identifier_length/,
-        /^BEGIN/,
-        /^COMMIT/
-      ]
-
-      # FIXME: this needs to be refactored so specific database can add their own
-      # ignored SQL.  This ignored SQL is for Oracle.
-      ignored_sql.concat [/^select .*nextval/i,
-        /^SAVEPOINT/,
-        /^ROLLBACK TO/,
-        /^\s*select .* from all_triggers/im
-      ]
-
-      def self.log=(v)
-        @@log = v
-      end
-
-      def self.log
-        @@log
-      end
-
-      self.log = []
-
-      def call(name, start, finish, message_id, values)
-        sql = values[:sql]
-
-        # FIXME: this seems bad. we should probably have a better way to indicate
-        # the query was cached
-        unless 'CACHE' == values[:name]
-          self.class.log << sql unless self.class.ignored_sql.
-            any? { |r| sql =~ r }
-        end
-      end
-
-      def self.instance
-        @instance || self.new
-      end
-    end
-
-    begin
-      require 'active_support/notifications'
-      ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
-    rescue LoadError
-      class ActiveRecord::ConnectionAdapters::JdbcAdapter
-        def log_info(sql, name, ms)
-          ActiveRecord::SQLCounter.instance.call(name, ms, ms, nil, :sql => sql)
-          super
-        end
-      end
-    end
-  end
-
-end
+require 'fileutils'