activerecord-jdbc-adapter 1.2.2.1 → 1.2.5

data/test/jdbc_common.rb

@@ -3,9 +3,10 @@ def jruby?
   defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
 end
 
+require 'bundler'
+Bundler.require(:default, :test)
 require 'arjdbc' if jruby?
 puts "Using activerecord version #{ActiveRecord::VERSION::STRING}"
-puts "Specify version with AR_VERSION={version} or RUBYLIB={path}"
 require 'models/auto_id'
 require 'models/entry'
 require 'models/data_types'
@@ -13,16 +14,110 @@ require 'models/add_not_null_column_to_table'
 require 'models/validates_uniqueness_of_string'
 require 'models/string_id'
 require 'models/thing'
+require 'models/custom_pk_name'
 require 'simple'
 require 'has_many_through'
 require 'helper'
 require 'row_locking'
 require 'test/unit'
+require 'logger'
 
-# Comment/uncomment to enable logging to be loaded for any of the database adapters
+# we always require logger (some tests fail if ActiveRecord::Base.logger is nil), but level
+# is set to warn unless $DEBUG or ENV['DEBUG'] is set
+require 'db/logger'
 if $DEBUG || ENV['DEBUG']
-  require 'db/logger'
   require 'ruby-debug'
 end
 
+# assert_queries and SQLCounter taken from rails active_record tests
+class Test::Unit::TestCase
+  def assert_queries(num = 1, matching = nil)
+    if !ActiveRecord::SQLCounter.enabled?
+      warn "SQLCounter assert_queries skipped"
+      return
+    end
+
+    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
+
+  def self.ar_version(version)
+    match = version.match(/(\d+)\.(\d+)(?:\.(\d+))?/)
+    ActiveRecord::VERSION::MAJOR > match[1].to_i ||
+      (ActiveRecord::VERSION::MAJOR == match[1].to_i &&
+       ActiveRecord::VERSION::MINOR >= match[2].to_i)
+  end
+end
+
+module ActiveRecord
+  class SQLCounter
+    @@enabled = true
+    def self.enabled?
+      @@enabled
+    end
+
+    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
+  end
+
+  begin
+    require 'active_support/notifications'
+    ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
+  rescue LoadError
+    @@enabled = false
+  end
+end
+
 

data/test/jndi_callbacks_test.rb

@@ -1,10 +1,14 @@
 require 'jdbc_common'
 require 'db/jndi_config'
 
-begin
-  require 'mocha'
+require 'mocha'
 
 class JndiConnectionPoolCallbacksTest < Test::Unit::TestCase
+
+  def self.startup
+    ActiveRecord::Base.establish_connection JNDI_CONFIG
+  end
+
   def setup
     @logger = stub_everything "logger"
     @config = JNDI_CONFIG
@@ -29,8 +33,5 @@ class JndiConnectionPoolCallbacksTest < Test::Unit::TestCase
     Entry.connection_pool.checkin @adapter
     assert !@connection.active?
   end
-end
 
-rescue LoadError
-  warn "mocha not found, disabling mocha-based tests"
 end if ActiveRecord::Base.respond_to?(:connection_pool)

data/test/jndi_test.rb

@@ -1,25 +1,50 @@
-# In order to run these tests, you need to have a few things on your
-# classpath. First, you're going to need the Sun File system
-# context. You can get that here: 
-#
-# http://java.sun.com/products/jndi/serviceproviders.html.  
-#
-# Make sure that you put both the fscontext.jar and the
-# providerutil.jar on your classpath.  
-#
 # To support the connection pooling in the test, you'll need
 # commons-dbcp, commons-pool, and commons-collections.
-#
-# Finally, you'll need the jdbc driver, which is derby, for this test.
 
 require 'jdbc_common'
+
 require 'db/jndi_config'
 
 class DerbyJndiTest < Test::Unit::TestCase
   include SimpleTestMethods
+
+  def self.startup
+    ActiveRecord::Base.establish_connection JNDI_CONFIG
+  end
+
+  test "(raw) connection is a jndi connection" do
+    connection = ActiveRecord::Base.connection.raw_connection
+    assert_true connection.jndi_connection?
+  end
+
+  test "fills username from data source meta-data if missing" do
+    connection = ActiveRecord::Base.connection.raw_connection
+    assert_true connection.jndi_connection?
+
+    config = { :jndi => JNDI_CONFIG[:jndi] }
+    ArJdbc::Derby.adapter_matcher('Derby', config)
+    assert_equal 'sa', config[:username]
+
+    # but only for Derby of course :
+    config = { :jndi => JNDI_CONFIG[:jndi] }
+    ArJdbc::Derby.adapter_matcher('DB42', config)
+    assert_nil config[:username]
+  end
+
 end
 
-at_exit {
-  require 'fileutils'
-  FileUtils.rm_rf 'derby-testdb'
-}
+require 'db/jndi_pooled_config'
+
+class DerbyJndiPooledTest < Test::Unit::TestCase
+  include SimpleTestMethods
+
+  def self.startup
+    ActiveRecord::Base.establish_connection JNDI_POOLED_CONFIG
+  end
+
+  test "(raw) connection is a jndi connection" do
+    connection = ActiveRecord::Base.connection.raw_connection
+    assert_true connection.jndi_connection?
+  end
+
+end

data/test/models/custom_pk_name.rb

@@ -0,0 +1,14 @@
+class CreateCustomPkName < ActiveRecord::Migration
+  def self.up
+    create_table :custom_pk_names, :force => true, :id => false do |t|
+      t.primary_key :custom_id
+      t.string :name
+    end
+  end
+  def self.down
+    drop_table :custom_pk_names
+  end
+end
+class CustomPkName < ActiveRecord::Base
+  self.primary_key = "custom_id"
+end

data/test/mssql_ignore_system_views_test.rb

@@ -1,5 +1,3 @@
-#! /usr/bin/env jruby
-
 require 'jdbc_common'
 require 'db/mssql'
 
@@ -8,8 +6,13 @@ class IgnoreSystemViewsTest < Test::Unit::TestCase
   include MigrationSetup
 
   def test_system_views_ignored
-    assert_equal true, table_exists?("sys.views"), %{table_exists?("sys.views")}
-    assert_equal true, table_exists?("information_schema.views"), %{table_exists?("information_schema.views")}
+    if ActiveRecord::Base.connection.sqlserver_version == "2000"
+      assert_equal false, table_exists?("sys.views"), %{table_exists?("sys.views")}
+      assert_equal false, table_exists?("information_schema.views"), %{table_exists?("information_schema.views")}
+    else
+      assert_equal true, table_exists?("sys.views"), %{table_exists?("sys.views")}
+      assert_equal true, table_exists?("information_schema.views"), %{table_exists?("information_schema.views")}
+    end
     assert_equal false, table_exists?("dbo.views"), %{table_exists?("dbo.views")}
     assert_equal false, table_exists?(:views), %{table_exists?(:views)}
     ActiveRecord::Schema.define { suppress_messages { create_table :views } }

data/test/mssql_limit_offset_test.rb

@@ -3,6 +3,26 @@ require 'db/mssql'
 
 ActiveRecord::Schema.verbose = false
 
+class CreateLegacyShips < ActiveRecord::Migration
+
+  def self.up
+    create_table "legacy_ships",{:primary_key => :ShipKey} do |t|
+      t.string "name", :limit => 50, :null => false
+      t.integer "width", :default => 123
+      t.integer "length", :default => 456
+    end
+  end
+
+  def self.down
+    drop_table "legacy_ships"
+  end
+
+end
+
+class LegacyShip < ActiveRecord::Base
+  self.primary_key = "ShipKey"
+end
+
 class CreateLongShips < ActiveRecord::Migration
 
   def self.up
@@ -64,6 +84,7 @@ end
 class MsSQLLimitOffsetTest < Test::Unit::TestCase
 
   def setup
+    CreateLegacyShips.up
     CreateLongShips.up
     CreateVikings.up
     CreateNoIdVikings.up
@@ -71,6 +92,7 @@ class MsSQLLimitOffsetTest < Test::Unit::TestCase
   end
 
   def teardown
+    CreateLegacyShips.down
     CreateVikings.down
     CreateLongShips.down
     CreateNoIdVikings.down
@@ -84,6 +106,14 @@ class MsSQLLimitOffsetTest < Test::Unit::TestCase
     end
   end
 
+  def test_limit_with_alternate_named_primary_key
+    %w(one two three four five six seven eight).each do |name|
+      LegacyShip.create!(:name => name)
+    end
+    ships = LegacyShip.limit(3)
+    assert_equal(3, ships.size)
+  end
+
   def test_limit_and_offset
     %w(one two three four five six seven eight).each do |name|
       LongShip.create!(:name => name)

data/test/mssql_multibyte_test.rb

@@ -1,5 +1,4 @@
-#! /usr/bin/env jruby
-
+# encoding: utf-8
 require 'jdbc_common'
 require 'db/mssql'
 

data/test/mssql_reset_column_information_test.rb

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

data/test/mssql_row_locking_sql_test.rb

@@ -1,5 +1,3 @@
-#! /usr/bin/env jruby
-
 require 'arjdbc/mssql/adapter'
 require 'test/unit'
 

data/test/mssql_row_locking_test.rb

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

data/test/mysql_reset_column_information_test.rb

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

data/test/mysql_simple_test.rb

@@ -12,6 +12,7 @@ class MysqlSimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
   include ActiveRecord3TestMethods
   include ColumnNameQuotingTests
+  include XmlColumnTests
 
   column_quote_char "`"
 
@@ -42,7 +43,7 @@ class MysqlSimpleTest < Test::Unit::TestCase
     assert_nothing_raised { Entry.update_all({:title => "test"}, {}, {:limit => 1}) }
   end
 
-  # from rails active record tests
+  # from rails active record tests, only meant to work in AR 3.2 and higher
   def test_update_all_with_joins_and_offset_and_order
     user_1 = User.create :login => 'user_1'
     user_2 = User.create :login => 'user_2'
@@ -59,7 +60,7 @@ class MysqlSimpleTest < Test::Unit::TestCase
 
     assert_equal count - 1, entries.update_all(:user_id => user_2.id)
     assert_equal user_2, Entry.find_by_title('title_2').user
-  end
+  end if ar_version("3.2")
 
   # from rails active record tests
   def test_caching_of_columns
@@ -102,22 +103,6 @@ class MysqlSimpleTest < Test::Unit::TestCase
       User.table_name  = old_users_table_name
     end
   end
-
-  def test_create_xml_column
-    assert_nothing_raised do
-      @connection.create_table :xml_testings do |t|
-        t.xml :xml_test
-      end
-    end
-
-    xml_test = @connection.columns(:xml_testings).detect do |c|
-      c.name == "xml_test"
-    end
-
-    assert_equal "text", xml_test.sql_type
-  ensure
-    @connection.drop_table :xml_testings rescue nil
-  end
 end
 
 class MysqlHasManyThroughTest < Test::Unit::TestCase

data/test/oracle_limit_test.rb

@@ -0,0 +1,23 @@
+require 'jdbc_common'
+require 'db/oracle'
+
+class OracleLimitTest < Test::Unit::TestCase
+  include FixtureSetup
+
+  def setup
+    super
+
+    1010.times do |n|
+      Entry.create!(:user => User.create!(:login => "Test User#{n}"),
+                    :title => "Entry #{n}", 
+                    :rating => n, 
+                    :content => "Testing Content #{n}")
+    end  
+  end
+   
+  def test_oracle_limit_properly_handled
+    assert_nothing_thrown do 
+      Entry.includes(:user).all
+    end
+  end 
+end 

data/test/oracle_reset_column_information_test.rb

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

data/test/postgres_db_create_test.rb

@@ -1,5 +1,4 @@
 require 'abstract_db_create'
-require 'db/postgres'
 
 class PostgresDbCreateTest < Test::Unit::TestCase
   include AbstractDbCreate

data/test/postgres_drop_db_test.rb

@@ -1,5 +1,4 @@
 require 'abstract_db_create'
-require 'db/postgres'
 
 class PostgresDbDropTest < Test::Unit::TestCase
   include AbstractDbCreate

data/test/postgres_information_schema_leak_test.rb

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