activerecord-jdbc-adapter 1.2.5 → 1.2.8

data/test/h2_binary_test.rb

@@ -0,0 +1,6 @@
+require 'db/h2'
+require 'binary'
+
+class H2BinaryTest < Test::Unit::TestCase
+  include BinaryTestMethods
+end

data/test/h2_change_column_test.rb

@@ -52,7 +52,7 @@ class H2ChangeColumnTest < Test::Unit::TestCase
   def test_should_set_non_null_restriction
     ActiveRecord::Migration.change_column :people, :phone, :string, :null => false
     Person.reset_column_information
-    assert_raises(ActiveRecord::StatementInvalid) { Person.create! }
+    assert_raise(ActiveRecord::StatementInvalid) { Person.create! }
   end
 
   def test_should_set_null_restriction_with_default

data/test/h2_schema_dump_test.rb

@@ -0,0 +1,25 @@
+require 'db/h2'
+require 'schema_dump'
+
+class H2SchemaDumpTest < Test::Unit::TestCase
+  include SchemaDumpTestMethods
+
+  DbTypeMigration.big_decimal_precision = 56 # whatever - arbitrary
+  
+#  # #override
+#  def test_schema_dump_keeps_id_column_when_id_is_false_and_id_column_added
+#    output = standard_dump
+#    match = output.match(%r{create_table "string_ids"(.*)do.*\n(.*)\n})
+#    assert_not_nil(match, "string_ids table not found")
+#    assert_match %r(:id => false), match[1], "no table id not preserved"
+#    # t.string \"id\", :limit => 2147483647, :null => false
+#    assert_match %r{t.string[[:space:]]+"id",.+?:null => false$}, match[2], "non-primary key id column not preserved"
+#  end
+
+  def test_schema_dump_decimal_when_scale_specified
+    output = standard_dump(StringIO.new, [/^[^d]/]) # keep db_types
+    # t.column :sample_small_decimal, :decimal, :precision => 3, :scale => 2, :default => 3.14
+    assert_match %r{t.decimal\s+"sample_small_decimal",\s+:precision => 3,\s+:scale => 2}, output
+  end
+  
+end

data/test/h2_serialize_test.rb

@@ -0,0 +1,6 @@
+require 'db/h2'
+require 'serialize'
+
+class H2SerializeTest < Test::Unit::TestCase
+  include SerializeTestMethods
+end

data/test/h2_simple_test.rb

@@ -1,11 +1,21 @@
 require 'jdbc_common'
+require 'db/h2'
 
 class H2SimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
+  include ExplainSupportTestMethods if ar_version("3.1")
+end
+
+class H2HasManyThroughTest < Test::Unit::TestCase
+  include HasManyThroughMethods
 end
 
 class H2SchemaTest < Test::Unit::TestCase
+  
   def setup
+    @entry_table_name, @user_table_name = Entry.table_name, User.table_name
+    @current_schema = ActiveRecord::Base.connection.current_schema
+    
     @connection = ActiveRecord::Base.connection
     @connection.execute("create schema s1");
     @connection.execute("set schema s1");
@@ -14,8 +24,9 @@ class H2SchemaTest < Test::Unit::TestCase
     @connection.execute("set schema s2");
     CreateUsers.up
     @connection.execute("set schema public");
-    Entry.table_name = 's1.entries'
-    User.table_name = 's2.users'
+    
+    Entry.table_name = 's1.entries'; User.table_name = 's2.users'
+    
     user = User.create! :login => "something"
     Entry.create! :title => "title", :content => "content", :rating => 123.45, :user => user
   end
@@ -28,13 +39,16 @@ class H2SchemaTest < Test::Unit::TestCase
     @connection.execute("drop schema s1");
     @connection.execute("drop schema s2");
     @connection.execute("set schema public");
-    Entry.reset_table_name
-    Entry.reset_column_information
-    User.reset_table_name
-    User.reset_column_information
+    
+    Entry.reset_column_information; User.reset_column_information
+    Entry.table_name, User.table_name = @entry_table_name, @user_table_name
+    
+    ActiveRecord::Base.clear_active_connections!
   end
-
+  
   def test_find_in_other_schema
-    assert !Entry.all(:include => :user).empty?
+    all = Entry.all(:include => :user)
+    assert ! all.empty?, "expected `Entry.all(:include => :user)` to not be empty but was"
   end
-end
+  
+end

data/test/has_many_through.rb

@@ -11,8 +11,8 @@ class CreateRbac < ActiveRecord::Migration
     end 
 
     create_table :permission_groups do |t|
-      t.column :right_id, :integer
-      t.column :role_id, :integer
+      t.column :right_id, :integer, :null => false
+      t.column :role_id, :integer, :null => false
     end 
 
     create_table :rights do |t| 
@@ -40,6 +40,10 @@ class Role < ActiveRecord::Base
   has_many :permission_groups, :dependent => :destroy
   has_many :rights, :through => :permission_groups
   has_many :role_assignments, :dependent => :destroy
+  
+  def has_right?(right)
+    rights.include? right
+  end
 end
 
 class PermissionGroup < ActiveRecord::Base
@@ -63,7 +67,7 @@ module HasManyThroughMethods
 
   def test_has_many_through
     admin_role    = Role.create( {:name => "Administrator", :description => "System defined super user - access to right and role management."} )
-    admin_role.save
+    admin_role.save!
 
     assert_equal(0, admin_role.rights.sum(:hours))
 
@@ -72,8 +76,18 @@ module HasManyThroughMethods
 
     admin_role.rights << role_rights
     admin_role.rights << right_rights
-    admin_role.save
+    admin_role.save!
 
     assert_equal(1.5, admin_role.rights.sum(:hours))
+    
+    rights_only_role = Role.create!(:name => "Rights Manager", :description => "access to rights management")
+    rights_only_role.rights << right_rights
+    rights_only_role.save!
+    rights_only_role.reload
+    
+    assert admin_role.has_right?(right_rights)
+    assert rights_only_role.has_right?(right_rights)
+    assert admin_role.reload.has_right?(role_rights)
+    assert ! rights_only_role.has_right?(role_rights)
   end
 end

data/test/hsqldb_binary_test.rb

@@ -0,0 +1,6 @@
+require 'db/hsqldb'
+require 'binary'
+
+class HSQLDBBinaryTest < Test::Unit::TestCase
+  include BinaryTestMethods
+end

data/test/hsqldb_schema_dump_test.rb

@@ -0,0 +1,15 @@
+require 'db/hsqldb'
+require 'schema_dump'
+
+class HSQLDBSchemaDumpTest < Test::Unit::TestCase
+  include SchemaDumpTestMethods
+
+  DbTypeMigration.big_decimal_precision = 42 # whatever - arbitrary
+
+  def test_schema_dump_decimal_when_scale_specified
+    output = standard_dump(StringIO.new, [/^[^d]/]) # keep db_types
+    # t.column :sample_small_decimal, :decimal, :precision => 3, :scale => 2, :default => 3.14
+    assert_match %r{t.decimal\s+"sample_small_decimal",\s+:precision => 3,\s+:scale => 2}, output
+  end
+  
+end

data/test/hsqldb_serialize_test.rb

@@ -0,0 +1,6 @@
+require 'db/hsqldb'
+require 'serialize'
+
+class HSQLDBSerializeTest < Test::Unit::TestCase
+  include SerializeTestMethods
+end

data/test/hsqldb_simple_test.rb

@@ -3,4 +3,5 @@ require 'db/hsqldb'
 
 class HsqldbSimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
+  include ExplainSupportTestMethods if ar_version("3.1")
 end

data/test/informix_simple_test.rb

@@ -36,7 +36,7 @@ class InformixMultibyteTest < Test::Unit::TestCase
   # simple insert in Informix.
   def test_select_multibyte_string
     Entry.create!(:title => 'テスト', :content => '本文')
-    entry = Entry.find(:first)
+    entry = Entry.first
     assert_equal "テスト", entry.title
     assert_equal "本文", entry.content
     assert_equal entry, Entry.find_by_title("テスト")

data/test/jdbc/db2.rb

@@ -0,0 +1,23 @@
+module Jdbc
+  module DB2
+    def self.driver_jar
+      if const_defined?(:VERSION)
+        "db2jcc-#{VERSION}.jar"
+      else
+        "db2jcc4.jar"
+      end
+    end
+
+    def self.load_driver(method = :load)
+      send method, driver_jar
+    end
+
+    def self.driver_name
+      'com.ibm.db2.jcc.DB2Driver'
+    end
+  end
+end
+
+# NOTE: just put the db2jcc4.jar into the test/jars directory ...
+jars = File.expand_path('../jars', File.dirname(__FILE__))
+$LOAD_PATH << jars unless $LOAD_PATH.include?(jars)

data/test/jdbc/oracle.rb

@@ -0,0 +1,23 @@
+module Jdbc
+  module Oracle
+    def self.driver_jar
+      if const_defined?(:VERSION)
+        "ojdbc-#{VERSION}.jar"
+      else
+        "ojdbc6.jar"
+      end
+    end
+
+    def self.load_driver(method = :load)
+      send method, driver_jar
+    end
+
+    def self.driver_name
+      'oracle.jdbc.driver.OracleDriver'
+    end
+  end
+end
+
+# NOTE: just put the ojdbc6.jar into the test/jars directory ...
+jars = File.expand_path('../jars', File.dirname(__FILE__))
+$LOAD_PATH << jars unless $LOAD_PATH.include?(jars)

data/test/jdbc_common.rb

@@ -1,12 +1,7 @@
 # Simple method to reduce the boilerplate
-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}"
+require 'test_helper'
+
 require 'models/auto_id'
 require 'models/entry'
 require 'models/data_types'
@@ -15,109 +10,7 @@ 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'
-
-# 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 '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,8 +1,6 @@
 require 'jdbc_common'
 require 'db/jndi_config'
 
-require 'mocha'
-
 class JndiConnectionPoolCallbacksTest < Test::Unit::TestCase
 
   def self.startup

data/test/jndi_test.rb

@@ -38,6 +38,8 @@ require 'db/jndi_pooled_config'
 class DerbyJndiPooledTest < Test::Unit::TestCase
   include SimpleTestMethods
 
+  DbTypeMigration.big_decimal_precision = 31
+  
   def self.startup
     ActiveRecord::Base.establish_connection JNDI_POOLED_CONFIG
   end

data/test/models/binary.rb

@@ -0,0 +1,18 @@
+class Binary < ActiveRecord::Base
+end
+
+class BinaryMigration < ActiveRecord::Migration
+
+  def self.up
+    create_table :binaries, :force => true do |t|
+      t.string :name
+      t.binary :data
+      t.binary :short_data, :limit => 2048
+    end
+  end
+
+  def self.down
+    drop_table :binaries
+  end
+
+end

data/test/models/custom_pk_name.rb

@@ -9,6 +9,7 @@ class CreateCustomPkName < ActiveRecord::Migration
     drop_table :custom_pk_names
   end
 end
+
 class CustomPkName < ActiveRecord::Base
   self.primary_key = "custom_id"
 end

data/test/models/data_types.rb

@@ -1,12 +1,20 @@
 class DbTypeMigration < ActiveRecord::Migration
+  
+  # Oracle/SQLServer supports precision up to 38
+  @@big_decimal_precision = 38
+  
+  def self.big_decimal_precision; @@big_decimal_precision; end
+  def self.big_decimal_precision=(precision); @@big_decimal_precision = precision; end
+  
   def self.up
     create_table "db_types", :force => true do |t|
       t.column :sample_timestamp, :timestamp
       t.column :sample_datetime, :datetime
       t.column :sample_date, :date
       t.column :sample_time, :time
-      t.column :sample_decimal, :decimal, :precision => 15, :scale => 0
-      t.column :sample_small_decimal, :decimal, :precision => 3, :scale => 2
+      # NOTE: on purpose setup so that it's OK to use a 32-bit integer column :
+      t.column :sample_decimal, :decimal, :precision => 9, :scale => 0
+      t.column :sample_small_decimal, :decimal, :precision => 3, :scale => 2, :default => 3.14
       t.column :sample_default_decimal, :decimal
       t.column :sample_float, :float
       t.column :sample_binary, :binary
@@ -18,6 +26,7 @@ class DbTypeMigration < ActiveRecord::Migration
       t.column :sample_integer_no_limit, :integer
       t.column :sample_integer_neg_default, :integer, :default => -1
       t.column :sample_text, :text
+      t.decimal :big_decimal, :precision => big_decimal_precision, :scale => 0
     end
   end