activerecord-jdbc-adapter 1.2.5 → 1.2.8

data/test/db2_binary_test.rb

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

data/test/db2_serialize_test.rb

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

data/test/db2_simple_test.rb

@@ -15,7 +15,7 @@ class DB2SimpleTest < Test::Unit::TestCase
   # type cast's it to a Ruby boolean. Need to make sure we don't
   # break existing apps!
   def test_boolean_as_integer
-    e = DbType.find(:first)
+    e = DbType.first
 
     # true
     e.sample_boolean = 1
@@ -23,7 +23,7 @@ class DB2SimpleTest < Test::Unit::TestCase
     assert_equal true, e.sample_boolean?
     e.save!
 
-    e = DbType.find(:first)
+    e = DbType.first
     assert_equal true, e.sample_boolean
     assert_equal true, e.sample_boolean?
 
@@ -33,34 +33,29 @@ class DB2SimpleTest < Test::Unit::TestCase
     assert_equal false, e.sample_boolean?
     e.save!
 
-    e = DbType.find(:first)
+    e = DbType.first
     assert_equal false, e.sample_boolean
     assert_equal false, e.sample_boolean?
   end
+  
+  def test_find_by_sql_WITH_statement
+    user = User.create! :login => 'ferko'
+    Entry.create! :title => 'aaa', :user_id => user.id
+    entries = Entry.find_by_sql '' + 
+      'WITH EntryAndUser (title, login, updated_on) AS ' +
+      '(' +
+      ' SELECT e.title, u.login, e.updated_on ' + 
+      ' FROM entries e INNER JOIN users u ON e.user_id = u.id ' +
+      ')' +
+      ' ' +
+      'SELECT * FROM EntryAndUser ORDER BY title ASC'
+    assert entries.first
+    assert entries.first.title
+    assert entries.first.login
+  end
+  
 end
 
 class DB2HasManyThroughTest < Test::Unit::TestCase
   include HasManyThroughMethods
 end
-
-class DB2Test < Test::Unit::TestCase
-  def setup
-    @inst = Object.new
-    @inst.extend ArJdbc::DB2
-    @column = Object.new
-    class << @column
-      attr_accessor :type
-    end
-  end
-
-  def test_quote_decimal
-    assert_equal %q{'123.45'}, @inst.quote("123.45")
-    @column.type = :decimal
-    assert_equal %q{123.45}, @inst.quote("123.45", @column), "decimal columns should not have quotes"
-  end
-
-  def test_primary_key_generation
-    @column.type = :primary_key
-    assert_equal 'int not null generated by default as identity (start with 1) primary key', @inst.modify_types({:string => {}, :integer => {}, :boolean => {}})[:primary_key]
-  end
-end

data/test/db2_test.rb

@@ -0,0 +1,71 @@
+require 'test_helper'
+require 'arjdbc/db2'
+
+class DB2Test < Test::Unit::TestCase
+  
+  def setup
+    @adapter = Object.new
+    def @adapter.zos?; false; end
+    @adapter.extend ArJdbc::DB2
+    
+    @column = Object.new
+    class << @column
+      attr_accessor :type
+    end
+  end
+
+  test 'quotes decimal column' do
+    adapter, column = new_adapter_stub, new_column_stub
+    assert_equal %q{'123.45'}, adapter.quote("123.45")
+    column.type = :decimal
+    assert_equal %q{123.45}, adapter.quote("123.45", column), "decimal columns should not have quotes"
+  end
+
+  test 'generated primary key' do
+    adapter = new_adapter_stub
+    assert_equal 'int not null generated by default as identity (start with 1) primary key', 
+      adapter.modify_types({:string => {}, :integer => {}, :boolean => {}})[:primary_key]
+  end
+  
+  test 'selects correct schema' do
+    url = 'jdbc:as400://localhost/schema;naming=system;libraries=lib1,lib2'
+    assert_equal 'schema', new_adapter_stub(:url => url).send(:db2_schema)
+    
+    url = 'jdbc:as400://127.0.0.1/SCHEMA1 '
+    assert_equal 'SCHEMA1', new_adapter_stub(:url => url).send(:db2_schema)
+    
+    url = 'jdbc:as400://127.0.0.1/SCHEMA2;'
+    assert_equal 'SCHEMA2', new_adapter_stub(:url => url).send(:db2_schema)
+
+    assert_equal nil, new_adapter_stub(:jndi => 'java:comp/env/DB2DS').send(:db2_schema)
+    
+    config = { :host => 'localhost', :username => 'db2inst1' }
+    assert_equal 'db2inst1', new_adapter_stub(config).send(:db2_schema)
+  end
+  
+  test 'quote column name returns string' do
+    adapter = new_adapter_stub
+    assert_equal 'version', adapter.quote_column_name(:version)
+    assert_equal 'column1', adapter.quote_column_name("column1")
+  end
+  
+  private
+  
+  def new_adapter_stub(config = {})
+    config = config.merge({ :adapter => 'jdbc', :adapter_spec => ArJdbc::DB2 })
+    connection = stub('connection'); logger = nil
+    connection.stub_everything
+    adapter = ActiveRecord::ConnectionAdapters::JdbcAdapter.new connection, logger, config
+    def adapter.zos?; false; end
+    adapter
+  end
+
+  def new_column_stub
+    column = Object.new
+    class << column
+      attr_accessor :type
+    end
+    column
+  end
+  
+end

data/test/derby_binary_test.rb

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

data/test/derby_migration_test.rb

@@ -1,55 +1,62 @@
+require 'db/derby'
 require 'jdbc_common'
 
-class CreateDummies < ActiveRecord::Migration
-  def self.up
-    create_table :dummies, :force => true do |t|
-      t.string :year, :default => "", :null => false
+class DerbyMigrationTest < Test::Unit::TestCase
+  
+  class CreateDummies < ActiveRecord::Migration
+    
+    def self.up
+      create_table :dummies, :force => true do |t|
+        t.string :year, :default => "", :null => false
+      end
+      add_index :dummies, :year, :unique => true
     end
-    add_index :dummies, :year, :unique => true
+
   end
 
-end
+  class ChangeColumn < ActiveRecord::Migration
+    
+    def self.up
+      create_table :people, :id => false, :force => true do |t|
+        t.string :id, :limit => 22, :null => false
+        t.string :name, :null => false
+      end
+      change_column(:people, :name, :string, { :limit => 22 })
+      execute("SELECT id FROM people WHERE id = 'some string'")
+    end
 
-class ChangeColumn < ActiveRecord::Migration
-  def self.up
-    create_table :people, :id => false, :force => true do |t|
-      t.string :id, :limit => 22, :null => false
-      t.string :name, :null => false
+    def self.down
     end
-    change_column(:people, :name, :string, {:limit=>22})
-    execute("SELECT id FROM people WHERE id = 'some string'")
-  end
 
-  def self.down
   end
 
-end
+  class CreateIndex < ActiveRecord::Migration
+    def self.up
+      create_table :people, :id => false, :force => true do |t|
+        t.string :id, :limit => 22, :null => false
+        t.string :first_name, :null => false
+        t.string :last_name, :null => false
+        t.string :nickname, :null => false
+        t.string :long_name, :null => false
+        t.string :very_long_name, :null => false
+        t.string :extremely_long_name, :null => false
+      end
+
+      add_index(:people, [:first_name, :last_name, :nickname, :long_name, :very_long_name, :extremely_long_name], :unique => true)
 
-class CreateIndex < ActiveRecord::Migration
-  def self.up
-    create_table :people, :id => false, :force => true do |t|
-      t.string :id, :limit => 22, :null => false
-      t.string :first_name, :null => false
-      t.string :last_name, :null => false
-      t.string :nickname, :null => false
-      t.string :long_name, :null => false
-      t.string :very_long_name, :null => false
-      t.string :extremely_long_name, :null => false
+      remove_index(:people, [:first_name, :last_name, :nickname, :long_name, :very_long_name, :extremely_long_name])
     end
 
-    add_index(:people, [:first_name, :last_name, :nickname, :long_name, :very_long_name, :extremely_long_name], :unique => true)
+    def self.down
+    end
 
-    remove_index(:people, [:first_name, :last_name, :nickname, :long_name, :very_long_name, :extremely_long_name])
   end
 
-  def self.down
+  def self.shutdown
+    ActiveRecord::Base.connection.execute("DROP TABLE dummies") rescue nil
+    ActiveRecord::Base.connection.execute("DROP TABLE people") rescue nil
   end
-
-end
-
-class DerbyMigrationTest < Test::Unit::TestCase
-  include FixtureSetup
-
+  
   def test_create_table_column_quoting_vs_keywords
     CreateDummies.up
   end

data/test/derby_reset_column_information_test.rb

@@ -1,3 +1,4 @@
+require 'db/derby'
 require 'jdbc_common'
 
 class DerbyResetColumnInformationTest < Test::Unit::TestCase

data/test/derby_row_locking_test.rb

@@ -1,6 +1,23 @@
+require 'db/derby'
 require 'jdbc_common'
+require 'row_locking'
 
 class DerbyRowLockingTest < Test::Unit::TestCase
   include MigrationSetup
   include RowLockingTestMethods
+  
+  DbTypeMigration.big_decimal_precision = 31
+  
+#  def self.startup
+#    MigrationSetup.setup!
+#  end
+#  
+#  def setup!; nil; end
+#
+#  def self.shutdown
+#    MigrationSetup.teardown!
+#  end
+#  
+#  def teardown!; nil; end
+  
 end

data/test/derby_schema_dump_test.rb

@@ -0,0 +1,9 @@
+require 'db/derby'
+require 'schema_dump'
+
+class DerbySchemaDumpTest < Test::Unit::TestCase
+  include SchemaDumpTestMethods
+  
+  DbTypeMigration.big_decimal_precision = 31 # DECIMAL precision between 1 and 31
+  
+end

data/test/derby_serialize_test.rb

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

data/test/derby_simple_test.rb

@@ -1,14 +1,13 @@
-# To run this script, run the following in a mysql instance:
-#
-#   drop database if exists weblog_development;
-#   create database weblog_development;
-#   grant all on weblog_development.* to blog@localhost;
-
+# encoding: ASCII-8BIT
 require 'jdbc_common'
+require 'db/derby'
+
+DbTypeMigration.big_decimal_precision = 31
 
 class DerbySimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
-
+  include ActiveRecord3TestMethods
+  
   # Check that a table-less VALUES(xxx) query (like SELECT  works.
   def test_values
     value = nil
@@ -19,13 +18,13 @@ class DerbySimpleTest < Test::Unit::TestCase
   end
 
   def test_find_with_include_and_order
-    users = User.find(:all, :include=>[:entries], :order=>"entries.rating DESC", :limit=>2)
+    users = User.find(:all, :include=>[:entries], :order=>"entries.rating DESC", :limit => 2)
 
     assert users.include?(@user)
   end
 
   def test_text_and_string_conversions
-    e = DbType.find(:first)
+    e = DbType.first
 
     # Derby will normally reject any non text value.
     # The adapter has been patched to convert non text values to strings
@@ -97,26 +96,28 @@ class DerbySimpleTest < Test::Unit::TestCase
   end
 
   def test_data_types
-    # From test/models/data_types.rb, with the modifications as noted in the comments.
+    # from test/models/data_types.rb, with the modifications as noted in the comments.
     expected_types = [
       ["id",                          :integer,   { }],
-      ["sample_timestamp",            :datetime,  { }],   # :timestamp is just an alias for :datetime in Derby
+      ["sample_timestamp",            :datetime,  { }], # :timestamp is just an alias for :datetime in Derby
       ["sample_datetime",             :datetime,  { }],
       ["sample_date",                 :date,      { }],
       ["sample_time",                 :time,      { }],
-      ["sample_decimal",              :integer,   { :precision => 15, :scale => 0 }],   # it's an :integer because the :scale is 0 (...right?)
-      ["sample_small_decimal",        :decimal,   { :precision => 3,  :scale => 2 }],
-      ["sample_default_decimal",      :integer,   { }],                 # decimal and integer are the same type in Derby
+      # NOTE: it's an :integer because the :scale is 0 (...right?) :
+      ["sample_decimal",              :integer,   { :precision => 9, :scale => 0 }],
+      ["sample_small_decimal",        :decimal,   { :precision => 3, :scale => 2, :default => 3.14 }],
+      ["sample_default_decimal",      :integer,   { }], # decimal by default assumes :scale => 0
       ["sample_float",                :float,     { }],
       ["sample_binary",               :binary,    { }],
       ["sample_boolean",              :boolean,   { }],
       ["sample_string",               :string,    { :default => '' }],
-      ["sample_integer",              :integer,   { }],                 # don't care about the limit
-      ["sample_integer_with_limit_2", :integer,   { }],                 # don't care about the limit
-      ["sample_integer_with_limit_8", :integer,   { }],                 # don't care about the limit
+      ["sample_integer",              :integer,   { }], # don't care about the limit
+      ["sample_integer_with_limit_2", :integer,   { }], # don't care about the limit
+      ["sample_integer_with_limit_8", :integer,   { }], # don't care about the limit
       ["sample_integer_no_limit",     :integer,   { }],
       ["sample_integer_neg_default",  :integer,   { :default => -1 }],
       ["sample_text",                 :text,      { }],
+      ["big_decimal",                 :integer,   { :precision => 31, :scale => 0 }],
     ].sort{|a,b| a[0] <=> b[0]}
 
     column_names = (expected_types.map{|et| et[0]} + DbType.column_names).sort.uniq
@@ -136,3 +137,44 @@ class DerbySimpleTest < Test::Unit::TestCase
     assert_equal expected_types, result
   end
 end
+
+class DerbyMultibyteTest < Test::Unit::TestCase
+  include MultibyteTestMethods
+end
+
+class DerbyHasManyThroughTest < Test::Unit::TestCase
+  include HasManyThroughMethods
+end
+
+# encoding: ASCII-8BIT
+require 'test_helper'
+
+class DerbyTest < Test::Unit::TestCase
+
+  class DerbyImpl
+    include ArJdbc::Derby
+    def initialize; end
+  end
+  derby = DerbyImpl.new
+  
+  test "quote (string) without column passed" do
+    s = "'"; q = "''"
+    assert_equal q, derby.quote_string(s)
+    assert_equal "'string #{q}'", derby.quote(v = "string #{s}"), "while quoting #{v.inspect}"
+    assert_equal "' #{q}'", derby.quote(v = " #{s}", nil), "while quoting #{v.inspect}"
+    assert_equal "'#{q}str'", derby.quote(v = "#{s}str", nil), "while quoting #{v.inspect}"
+  end
+
+  test "quote (string) keeps original" do
+    s = "kôň ůň löw9876qűáéőú.éáű-mehehehehehehe0 \x01 \x02"
+    q = "'kôň ůň löw9876qűáéőú.éáű-mehehehehehehe0 \x01 \x02'"
+    assert_equal q, derby.quote(s.dup)
+    
+    if s.respond_to?(:force_encoding)
+      s.force_encoding('UTF-8')
+      q.force_encoding('UTF-8')
+      assert_equal q, derby.quote(s.dup)
+    end
+  end
+  
+end

data/test/generic_jdbc_connection_test.rb

@@ -8,15 +8,108 @@ class GenericJdbcConnectionTest < Test::Unit::TestCase
      assert ActiveRecord::Base.connected?
   end
 
+  test 'configures driver/connection properties' do
+    config = JDBC_CONFIG.dup
+    config[:properties] = {
+      'autoDeserialize' => true,
+      'maxAllowedPacket' => 128,
+      'metadataCacheSize' => '5'
+    }
+    ActiveRecord::Base.remove_connection
+    begin
+      ActiveRecord::Base.establish_connection config
+      connection = ActiveRecord::Base.connection.jdbc_connection
+      # assuming MySQL internals :
+      assert_equal 'true', connection.getProperties['autoDeserialize']
+      assert_equal '128', connection.getProperties['maxAllowedPacket']
+      assert_equal '5', connection.getProperties['metadataCacheSize']
+    ensure
+      ActiveRecord::Base.establish_connection JDBC_CONFIG
+    end
+  end
+
+  test 'driver runtime errors do not get swallowed' do
+    config = JDBC_CONFIG.dup
+    config[:properties] = Java::JavaUtil::Properties.new
+    config[:properties]['invalid_property'] = java.lang.Object.new
+    ActiveRecord::Base.remove_connection
+    begin
+      ActiveRecord::Base.establish_connection config
+      ActiveRecord::Base.connection.jdbc_connection
+      fail "exception not thrown"
+    rescue Java::JavaLang::NullPointerException # OK :
+      # java.util.Hashtable.put(Hashtable.java:394)
+      # java.util.Properties.setProperty(Properties.java:143)
+      # com.mysql.jdbc.NonRegisteringDriver.parseURL(NonRegisteringDriver.java:849)
+      # com.mysql.jdbc.NonRegisteringDriver.connect(NonRegisteringDriver.java:325)
+    ensure
+      ActiveRecord::Base.establish_connection JDBC_CONFIG
+    end
+  end
+
+  class MockDriver < ActiveRecord::ConnectionAdapters::JdbcDriver
+    
+    class DriverImpl 
+      include Java::JavaSql::Driver
+      
+      def connect(url, info)
+        if url =~ /invalid_authorization_spec/i
+          raise Java::JavaSql::SQLInvalidAuthorizationSpecException.new
+        else
+          reason = "#{url} connect with #{info.inspect} failed"
+          raise Java::JavaSql::SQLException.new(reason, '42000', 1042)
+        end
+      end
+      
+    end
+    
+    def driver_class; DriverImpl; end
+    
+  end
+  
+  test 'driver sql exceptions are wrapped into jdbc errors' do
+    config = JDBC_CONFIG.dup
+    config[:driver_instance] = MockDriver.new('MockDriver')
+    ActiveRecord::Base.remove_connection
+    begin
+      ActiveRecord::Base.establish_connection config
+      ActiveRecord::Base.connection.jdbc_connection
+      fail "jdbc error not thrown"
+    rescue  ActiveRecord::JDBCError => e
+      assert_match /connect with {"user"=>"arjdbc", "password"=>"arjdbc"} failed/, e.to_s
+      assert_equal 1042, e.errno
+      assert_kind_of Java::JavaSql::SQLException, e.sql_exception
+    ensure
+      ActiveRecord::Base.establish_connection JDBC_CONFIG
+    end
+  end
+
+  test 'driver sql exceptions without message and sql state' do
+    config = JDBC_CONFIG.dup
+    config[:url] = 'jdbc:mysql://127.0.0.1:1234/invalid_authorization_spec'
+    config[:driver_instance] = MockDriver.new('MockDriver')
+    ActiveRecord::Base.remove_connection
+    begin
+      ActiveRecord::Base.establish_connection config
+      ActiveRecord::Base.connection.jdbc_connection
+      fail "jdbc error not thrown"
+    rescue  ActiveRecord::JDBCError => e
+      assert_match /driver encountered an unknown error: java.sql.SQLInvalidAuthorizationSpecException/, e.to_s
+      assert_kind_of Java::JavaSql::SQLNonTransientException, e.sql_exception
+    ensure
+      ActiveRecord::Base.establish_connection JDBC_CONFIG
+    end
+  end
+  
   class ConfigHelperTest < Test::Unit::TestCase
 
     test 'configure connection url' do
       connection = Object.new
       connection.extend ActiveRecord::ConnectionAdapters::JdbcConnection::ConfigHelper
-      connection.config = { :url => "jdbc://somehost", :options => { :hoge => "true", :fuya => "false"} }
+      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"} }
+      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
 
@@ -37,7 +130,7 @@ class GenericJdbcConnectionTest < Test::Unit::TestCase
         end
       end
     end
-
+    
     test 'connection does not fail with driver_instance and url' do
       load_derby_driver
       with_connection_removed do
@@ -57,7 +150,21 @@ class GenericJdbcConnectionTest < Test::Unit::TestCase
         end
       end
     end
-
+    
+    test 'configures driver instance' do
+      load_derby_driver
+      with_connection_removed do
+        ActiveRecord::Base.establish_connection :adapter => 'jdbc', 
+          :url => 'jdbc:derby:memory:TestDB;create=true', :driver => 'org.apache.derby.jdbc.EmbeddedDriver'
+        assert_nothing_raised do
+          ActiveRecord::Base.connection
+        end
+        assert config = ActiveRecord::Base.connection.config
+        assert_instance_of ActiveRecord::ConnectionAdapters::JdbcDriver, config[:driver_instance]
+        assert_equal 'org.apache.derby.jdbc.EmbeddedDriver', config[:driver_instance].name
+      end
+    end
+    
     private
 
     def with_connection_removed
@@ -65,7 +172,7 @@ class GenericJdbcConnectionTest < Test::Unit::TestCase
       begin
         yield
       ensure
-        ActiveRecord::Base.establish_connection connection 
+        ActiveRecord::Base.establish_connection connection
       end
     end