activerecord-jdbc-adapter 1.2.9.1 → 1.3.0.beta1

data/src/java/arjdbc/util/QuotingUtils.java

@@ -51,9 +51,9 @@ public abstract class QuotingUtils {
             final char value, final char quote) {
         
         final ByteList stringBytes = string.getByteList();
-        final byte[] bytes = stringBytes.bytes; // unsafeBytes();
-        final int begin = stringBytes.begin; // getBegin();
-        final int realSize = stringBytes.realSize; // getRealSize();
+        final byte[] bytes = stringBytes.unsafeBytes();
+        final int begin = stringBytes.getBegin();
+        final int realSize = stringBytes.getRealSize();
         
         ByteList quotedBytes = null; int appendFrom = begin;
         for ( int i = begin; i < begin + realSize; i++ ) {
@@ -61,10 +61,10 @@ public abstract class QuotingUtils {
                 if ( quotedBytes == null ) {
                     quotedBytes = new ByteList(
                         new byte[realSize + 8], 
-                        stringBytes.encoding // getEncoding()
+                        stringBytes.getEncoding()
                     );
-                    quotedBytes.begin = 0; // setBegin(0);
-                    quotedBytes.realSize = 0; // setRealSize(0);
+                    quotedBytes.setBegin(0);
+                    quotedBytes.setRealSize(0);
                 }
                 quotedBytes.append(bytes, appendFrom, i - appendFrom);
                 quotedBytes.append(quote).append(value); // e.g. "'" => "''"

data/test/abstract_db_create.rb

@@ -1,9 +1,8 @@
-require 'jdbc_common'
+require 'test_helper'
 require 'rake'
 
 module Rails
-  class Configuration
-  end
+  class Configuration; end unless const_defined?(:Configuration)
   class Application
     def self.config
       @config ||= Object.new
@@ -23,7 +22,7 @@ module AbstractDbCreate
   end
 
   def setup
-    @prevapp = Rake.application
+    @prev_app = Rake.application
     Rake.application = Rake::Application.new
     verbose(true)
     do_setup
@@ -31,7 +30,7 @@ module AbstractDbCreate
 
   def do_setup(env = 'unittest', db = 'test_rake_db_create')
     @env = env
-    @prevconfigs = ActiveRecord::Base.configurations
+    @prev_configs = ActiveRecord::Base.configurations
     ActiveRecord::Base.connection.disconnect!
     @db_name = db
     setup_rails
@@ -49,19 +48,19 @@ module AbstractDbCreate
 
   def teardown
     Rake::Task["db:drop"].invoke
-    Rake.application = @prevapp
+    Rake.application = @prev_app
     restore_rails
-    ActiveRecord::Base.configurations = @prevconfigs
+    ActiveRecord::Base.configurations = @prev_configs
     ActiveRecord::Base.establish_connection(db_config)
     @rails_env_set = nil
     @full_env_loaded = nil
   end
 
   def setup_rails
-    if ActiveRecord::VERSION::MAJOR == 3
-      setup_rails3
-    else
+    if ActiveRecord::VERSION::MAJOR <= 2
       setup_rails2
+    else
+      setup_rails3
     end
   end
 
@@ -77,7 +76,7 @@ module AbstractDbCreate
 
   def setup_rails2
     configs = configurations
-    Rails::Configuration.class_eval do
+    Rails::Configuration.module_eval do
       define_method(:database_configuration) { configs }
     end
     ar_version = $LOADED_FEATURES.grep(%r{active_record/version}).first
@@ -136,4 +135,5 @@ module AbstractDbCreate
   ensure
     $VERBOSE = prev
   end
+  
 end

data/test/activerecord/connection_adapters/type_conversion_test.rb

@@ -3,28 +3,34 @@ require 'models/data_types'
 require 'arjdbc'
 require 'test/unit'
 
-JInteger = java.lang.Integer
-
 class TypeConversionTest < Test::Unit::TestCase
+  
+  TEST_INT = 987654321
+  
   TEST_TIME = Time.at(1169964202).gmtime
+  
+  def self.startup
+    DbTypeMigration.up
+  end
+
+  def self.shutdown
+    DbTypeMigration.down
+  end
+  
   def setup
-    DbTypeMigration.up  
     DbType.create(
       :sample_timestamp => TEST_TIME,
-      :sample_decimal => JInteger::MAX_VALUE + 1)
-  end
-  
-  def teardown
-    DbTypeMigration.down
+      :sample_decimal => TEST_INT) # DECIMAL(9,0)
   end
   
   def test_timestamp
-    types = DbType.first
-    assert_equal TEST_TIME, types.sample_timestamp.getutc
+    type = DbType.first
+    assert_equal TEST_TIME, type.sample_timestamp.getutc
   end
   
   def test_decimal
-    types = DbType.first
-    assert_equal((JInteger::MAX_VALUE + 1), types.sample_decimal)
+    type = DbType.first
+    assert_equal TEST_INT, type.sample_decimal
   end
+  
 end

data/test/db/db2.rb

@@ -1,4 +1,4 @@
-require 'jdbc_common'
+require 'test_helper'
 
 config = { :adapter => "db2" }
 

data/test/db/db2/has_many_through_test.rb

@@ -0,0 +1,6 @@
+require 'db/db2'
+require 'has_many_through'
+
+class DB2HasManyThroughTest < Test::Unit::TestCase
+  include HasManyThroughMethods
+end

data/test/{db2_reset_column_information_test.rb → db/db2/reset_column_information_test.rb}

@@ -1,5 +1,4 @@
-require 'jdbc_common'
-require 'db/db2'
+require File.expand_path('test_helper', File.dirname(__FILE__))
 
 class DB2ResetColumnInformationTest < Test::Unit::TestCase
   include ResetColumnInformationTestMethods

data/test/{db2_simple_test.rb → db/db2/simple_test.rb}

@@ -1,7 +1,4 @@
-require 'jdbc_common'
-require 'db/db2'
-
-DbTypeMigration.big_decimal_precision = 31
+require File.expand_path('test_helper', File.dirname(__FILE__))
 
 class DB2SimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
@@ -62,7 +59,3 @@ class DB2SimpleTest < Test::Unit::TestCase
   end
   
 end
-
-class DB2HasManyThroughTest < Test::Unit::TestCase
-  include HasManyThroughMethods
-end

data/test/db/db2/test_helper.rb

@@ -0,0 +1,6 @@
+require 'db/db2'
+require 'simple'
+require 'row_locking'
+require 'schema_dump'
+
+DbTypeMigration.big_decimal_precision = 31 # DB2 maximum precision is 31 digit

data/test/{db2_test.rb → db/db2/unit_test.rb}

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'arjdbc/db2'
 
-class DB2Test < Test::Unit::TestCase
+class DB2UnitTest < Test::Unit::TestCase
   
   def setup
     @adapter = Object.new

data/test/db/derby.rb

@@ -1,4 +1,4 @@
-require 'jdbc_common'
+require 'test_helper'
 
 config = {
   :adapter => 'derby',

data/test/{derby_row_locking_test.rb → db/derby/row_locking_test.rb}

@@ -1,13 +1,10 @@
-require 'db/derby'
-require 'jdbc_common'
+require File.expand_path('test_helper', File.dirname(__FILE__))
 require 'row_locking'
 
 class DerbyRowLockingTest < Test::Unit::TestCase
   include MigrationSetup
   include RowLockingTestMethods
   
-  DbTypeMigration.big_decimal_precision = 31
-  
 #  def self.startup
 #    MigrationSetup.setup!
 #  end

data/test/db/derby/schema_dump_test.rb

@@ -0,0 +1,5 @@
+require File.expand_path('test_helper', File.dirname(__FILE__))
+
+class DerbySchemaDumpTest < Test::Unit::TestCase
+  include SchemaDumpTestMethods
+end

data/test/{derby_simple_test.rb → db/derby/simple_test.rb}

@@ -1,12 +1,12 @@
 # encoding: ASCII-8BIT
-require 'jdbc_common'
-require 'db/derby'
-
-DbTypeMigration.big_decimal_precision = 31
+require File.expand_path('test_helper', File.dirname(__FILE__))
+require 'simple'
+require 'has_many_through'
 
 class DerbySimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
   include ActiveRecord3TestMethods
+  include CustomSelectTestMethods
   
   # Check that a table-less VALUES(xxx) query (like SELECT  works.
   def test_values
@@ -18,9 +18,13 @@ class DerbySimpleTest < Test::Unit::TestCase
   end
 
   def test_find_with_include_and_order
+    Entry.create! :title => 'First Post!', 
+      :content => "Hello from 'JRuby on Rails'!", 
+      :user => (user = User.create!(:login => "someone"))
+    
     users = User.find(:all, :include=>[:entries], :order=>"entries.rating DESC", :limit => 2)
 
-    assert users.include?(@user)
+    assert users.include?(user)
   end
 
   def test_text_and_string_conversions
@@ -136,6 +140,20 @@ class DerbySimpleTest < Test::Unit::TestCase
 
     assert_equal expected_types, result
   end
+  
+  # @override Derby is made in IBM thus it needs to get complicated with 1.42
+  def test_custom_select_float
+    model = DbType.create! :sample_float => 1.42
+    if ActiveRecord::VERSION::MAJOR >= 3
+      model = DbType.where("id = #{model.id}").select('sample_float AS custom_sample_float').first
+    else
+      model = DbType.find(:first, :conditions => "id = #{model.id}", :select => 'sample_float AS custom_sample_float')
+    end
+    assert_instance_of Float, model.custom_sample_float
+    custom_sample_float = (model.custom_sample_float * 100).round.to_f / 100 # .round(2) 1.8.7 compatible
+    assert_equal 1.42, custom_sample_float # Derby otherwise returns us smt like: 1.4199999570846558
+  end
+  
 end
 
 class DerbyMultibyteTest < Test::Unit::TestCase
@@ -145,36 +163,3 @@ 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/db/derby/test_helper.rb

@@ -0,0 +1,6 @@
+require 'db/derby'
+require 'simple'
+require 'row_locking'
+require 'schema_dump'
+
+DbTypeMigration.big_decimal_precision = 31 # DECIMAL precision between 1 and 31

data/test/db/derby/unit_test.rb

@@ -0,0 +1,32 @@
+# encoding: ASCII-8BIT
+require 'test_helper'
+
+class DerbyUnitTest < 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/db/derby/xml_column_test.rb

@@ -0,0 +1,17 @@
+require File.expand_path('test_helper', File.dirname(__FILE__))
+require 'simple'
+
+class DerbyXmlColumnTest < Test::Unit::TestCase
+  include FixtureSetup
+  include XmlColumnTests
+  
+  def xml_sql_type; 'xml'; end
+  
+  # @override
+  def test_use_xml_column
+    omit("[derby] XML values are not allowed in top-level result sets;")
+    # we'll need to somehow magically add XMLSERIALIZE for all XML columns !
+    super
+  end
+  
+end

data/test/db/h2.rb

@@ -1,4 +1,4 @@
-require 'jdbc_common'
+require 'test_helper'
 
 config = {
   :adapter => 'h2',

data/test/{h2_change_column_test.rb → db/h2/change_column_test.rb}

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

data/test/{h2_simple_test.rb → db/h2/simple_test.rb}

@@ -1,9 +1,11 @@
-require 'jdbc_common'
 require 'db/h2'
+require 'jdbc_common'
 
 class H2SimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
   include ExplainSupportTestMethods if ar_version("3.1")
+  include ActiveRecord3TestMethods
+  include CustomSelectTestMethods
 end
 
 class H2HasManyThroughTest < Test::Unit::TestCase

data/test/db/hsqldb.rb

@@ -1,4 +1,4 @@
-require 'jdbc_common'
+require 'test_helper'
 
 config = {
   :adapter => 'hsqldb',