activerecord-jdbc-adapter 1.2.0 → 1.2.1

data/test/mysql_simple_test.rb

@@ -11,6 +11,18 @@ require 'db/mysql'
 class MysqlSimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
   include ActiveRecord3TestMethods
+  include ColumnNameQuotingTests
+
+  column_quote_char "`"
+
+  def test_column_class_instantiation
+    text_column = nil
+    assert_nothing_raised do
+      text_column = ActiveRecord::ConnectionAdapters::MysqlAdapter::Column.
+        new("title", nil, "text")
+    end
+    assert_not_nil text_column
+  end
 
   def test_string_quoting_oddity
     s = "0123456789a'a"
@@ -22,8 +34,8 @@ class MysqlSimpleTest < Test::Unit::TestCase
   end
 
   def test_table_name_quoting_with_dot
-    s = "weblog_development.posts"
-    assert_equal "`weblog_development`.`posts`", ActiveRecord::Base.connection.quote_table_name(s)
+    s = "#{MYSQL_CONFIG[:database]}.posts"
+    assert_equal "`#{MYSQL_CONFIG[:database]}`.`posts`", ActiveRecord::Base.connection.quote_table_name(s)
   end
 
   def test_update_all_with_limit
@@ -34,8 +46,8 @@ class MysqlSimpleTest < Test::Unit::TestCase
     old_entries_table_name = Entry.table_name
     old_users_table_name   = User.table_name
     begin
-      User.set_table_name 'weblog_development.users'
-      Entry.set_table_name 'weblog_development.entries'
+      User.set_table_name "#{MYSQL_CONFIG[:database]}.users"
+      Entry.set_table_name "#{MYSQL_CONFIG[:database]}.entries"
       assert !Entry.all(:include => :user).empty?
     ensure
       Entry.set_table_name old_entries_table_name

data/test/postgres_native_type_mapping_test.rb

@@ -16,7 +16,8 @@ class CreateNativeTypeMappingTestSchema < ActiveRecord::Migration
           real_should_be_float real,
           bool_should_be_boolean bool,
           interval_should_be_string interval,
-          bigint_should_be_integer bigint
+          bigint_should_be_integer bigint,
+          uuid_should_be_string uuid
       )}
   end
 
@@ -42,6 +43,10 @@ class PostgresNativeTypeMappingTest < Test::Unit::TestCase
     Customer.columns.detect { |c| c.name == column_name }.type
   end
 
+  def test_uuid_column_should_map_to_string
+    assert_equal :string, column_type("uuid_should_be_string")
+  end
+  
   def test_bigint_serial_should_be_mapped_to_integer
     assert_equal :integer, column_type("bigint_serial_should_be_integer")
   end

data/test/postgres_simple_test.rb

@@ -10,7 +10,13 @@ require 'db/postgres'
 class PostgresSimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
   include ActiveRecord3TestMethods
+  include ColumnNameQuotingTests
 
+  def test_adapter_class_name_equals_native_adapter_class_name
+    classname = @connection.class.name[/[^:]*$/]
+    assert_equal 'PostgreSQLAdapter', classname
+  end
+  
   def test_multi_statement_support
     results = @connection.execute "SELECT title from entries; SELECT login from users"
     assert_equal 2, results.length
@@ -51,39 +57,39 @@ class PostgresSchemaDumperTest < Test::Unit::TestCase
 
   # http://kenai.com/jira/browse/ACTIVERECORD_JDBC-135
   def test_schema_dump_should_not_have_limits_on_boolean
-    lines = @dump.grep(/boolean/)
+    lines = @dump.lines.grep(/boolean/)
     assert !lines.empty?
     lines.each {|line| assert line !~ /limit/ }
   end
 
 
   def test_schema_dump_should_not_have_limits_on_binaries
-    lines = @dump.grep(/binary/)
+    lines = @dump.lines.grep(/binary/)
     assert !lines.empty?, 'no binary type definitions found'
     lines.each {|line| assert line !~ /limit/, 'binary definition contains limit' }
   end
 
   # http://kenai.com/jira/browse/ACTIVERECORD_JDBC-139
   def test_schema_dump_should_not_have_limits_on_text_or_date
-    lines = @dump.grep(/date|text/)
+    lines = @dump.lines.grep(/date|text/)
     assert !lines.empty?
     lines.each {|line| assert line !~ /limit/ }
   end
 
   def test_schema_dump_integer_with_no_limit_should_have_no_limit
-    lines = @dump.grep(/sample_integer_no_limit/)
+    lines = @dump.lines.grep(/sample_integer_no_limit/)
     assert !lines.empty?
     lines.each {|line| assert line !~ /:limit/ }
   end
 
   def test_schema_dump_integer_with_limit_2_should_have_limit_2
-    lines = @dump.grep(/sample_integer_with_limit_2/)
+    lines = @dump.lines.grep(/sample_integer_with_limit_2/)
     assert !lines.empty?
     lines.each {|line| assert line =~ /limit => 2/ }
   end
 
   def test_schema_dump_integer_with_limit_8_should_have_limit_8
-    lines = @dump.grep(/sample_integer_with_limit_8/)
+    lines = @dump.lines.grep(/sample_integer_with_limit_8/)
     assert !lines.empty?
     lines.each {|line| assert line =~ /limit => 8/ }
   end

data/test/postgres_type_conversion_test.rb

@@ -0,0 +1,34 @@
+require 'jdbc_common'
+require 'db/postgres'
+
+class BooleanSchema < ActiveRecord::Migration
+  def self.up
+    create_table :booleans do |t|
+      t.boolean :value, :default => false, :null => false
+    end
+  end
+
+  def self.down
+    drop_table :booleans
+  end
+end
+
+class Boolean < ActiveRecord::Base
+end
+
+class PostgresTypeConversionTest < Test::Unit::TestCase
+  def setup
+    BooleanSchema.up
+  end
+
+  def teardown
+    BooleanSchema.down
+  end
+
+  def test_should_handle_bool_conversion_with_boolean_relation
+    assert_nothing_raised do
+      ActiveRecord::Base.connection.raw_connection.set_native_database_types
+    end
+  end
+end
+

data/test/simple.rb

@@ -43,6 +43,58 @@ module FixtureSetup
   end
 end
 
+module ColumnNameQuotingTests
+  def self.included(base)
+    base.class_eval do
+      @@column_quote_char = "\""
+
+      def self.column_quote_char(char)
+        @@column_quote_char = char
+      end
+    end
+  end
+
+  def test_column_names_are_escaped
+    conn = ActiveRecord::Base.connection
+    quoted = conn.quote_column_name "foo#{column_quote_char}bar"
+    assert_equal "#{column_quote_char}foo#{column_quote_char * 2}bar#{column_quote_char}", quoted
+  end
+
+  protected
+  def column_quote_char
+    @@column_quote_char || "\""
+  end
+end
+
+module DirtyAttributeTests
+  def test_partial_update
+    entry = Entry.new(:title => 'foo')
+    old_updated_on = 1.hour.ago.beginning_of_day
+
+    with_partial_updates Entry, false do
+      assert_queries(2) { 2.times { entry.save! } }
+      Entry.update_all({ :updated_on => old_updated_on }, :id => entry.id)
+    end
+
+    with_partial_updates Entry, true do
+      assert_queries(0) { 2.times { entry.save! } }
+      assert_equal old_updated_on, entry.reload.updated_on
+
+      assert_queries(1) { entry.title = 'bar'; entry.save! }
+      assert_not_equal old_updated_on, entry.reload.updated_on
+    end
+  end
+
+  private
+  def with_partial_updates(klass, on = true)
+    old = klass.partial_updates?
+    klass.partial_updates = on
+    yield
+  ensure
+    klass.partial_updates = old
+  end
+end
+
 module SimpleTestMethods
   include FixtureSetup
 
@@ -228,11 +280,11 @@ module SimpleTestMethods
     # so they all have a initial value of an empty string ''
     assert_equal(nil, e.sample_text) unless ActiveRecord::Base.connection.adapter_name =~ /oracle/i
 
-    e.sample_text = "ooop"
+    e.sample_text = "ooop?"
     e.save!
 
     e = DbType.find(:first)
-    assert_equal("ooop", e.sample_text)
+    assert_equal("ooop?", e.sample_text)
   end
 
   def test_string
@@ -240,11 +292,11 @@ module SimpleTestMethods
 
     # An empty string is treated as a null value in Oracle: http://www.techonthenet.com/oracle/questions/empty_null.php
     assert_equal('', e.sample_string) unless ActiveRecord::Base.connection.adapter_name =~ /oracle/i
-    e.sample_string = "ooop"
+    e.sample_string = "ooop?"
     e.save!
 
     e = DbType.find(:first)
-    assert_equal("ooop", e.sample_string)
+    assert_equal("ooop?", e.sample_string)
   end
 
   def test_save_binary
@@ -259,8 +311,28 @@ module SimpleTestMethods
 
   def test_default_decimal_should_keep_fractional_part
     expected = 7.3
-    actual = DbType.create(:sample_default_decimal => expected).sample_default_decimal
-    assert_equal expected, actual
+    db_type = DbType.new(:sample_small_decimal => expected)
+    assert db_type.save
+    db_type = DbType.find(db_type.id)
+    assert_equal BigDecimal.new(expected.to_s), db_type.sample_small_decimal
+  end
+
+  def test_decimal_with_scale
+    test_value = 7.3
+    db_type = DbType.new(:sample_small_decimal => test_value)
+    assert db_type.save
+    db_type = DbType.find(db_type.id)
+    assert_kind_of BigDecimal, db_type.sample_small_decimal
+    assert_equal BigDecimal.new(test_value.to_s), db_type.sample_small_decimal
+  end
+
+  def test_decimal_with_zero_scale
+    test_value = 7000.0
+    db_type = DbType.new(:sample_decimal => test_value)
+    assert db_type.save
+    db_type = DbType.find(db_type.id)
+    assert_kind_of Integer, db_type.sample_decimal
+    assert_equal test_value.to_i, db_type.sample_decimal
   end
 
   def test_negative_default_value

data/test/sqlite3_simple_test.rb

@@ -6,6 +6,8 @@ require 'models/validates_uniqueness_of_string'
 class SQLite3SimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
   include ActiveRecord3TestMethods
+  include ColumnNameQuotingTests
+  include DirtyAttributeTests
 
   def test_recreate_database
     assert @connection.tables.include?(Entry.table_name)
@@ -30,7 +32,7 @@ class SQLite3SimpleTest < Test::Unit::TestCase
 
   def test_columns
     cols = ActiveRecord::Base.connection.columns("entries")
-    assert cols.find {|col| col.name == "title"}    
+    assert cols.find {|col| col.name == "title"}
   end
 
   def test_remove_column
@@ -136,9 +138,9 @@ class SQLite3SimpleTest < Test::Unit::TestCase
     col = cols.find{|col| col.name == "test_column_default"}
     assert col
     assert_equal col.default, nil
-    
+
   end
-  
+
   def test_change_column_default
     assert_nothing_raised do
       ActiveRecord::Schema.define do
@@ -218,6 +220,14 @@ class SQLite3TypeConversionTest < Test::Unit::TestCase
       :sample_decimal => JInteger::MAX_VALUE + 1,
       :sample_small_decimal => 3.14,
       :sample_binary => TEST_BINARY)
+    DbType.create(
+      :sample_timestamp => TEST_TIME,
+      :sample_datetime => TEST_TIME,
+      :sample_time => TEST_TIME,
+      :sample_date => TEST_TIME,
+      :sample_decimal => JInteger::MAX_VALUE + 1,
+      :sample_small_decimal => 1.0,
+      :sample_binary => TEST_BINARY)
   end
 
   def teardown
@@ -244,4 +254,16 @@ class SQLite3TypeConversionTest < Test::Unit::TestCase
     assert_equal(TEST_BINARY, types.sample_binary)
   end
 
+  def test_small_decimal
+    types = DbType.find(:all, :order => ["sample_small_decimal desc"])
+    assert_equal(3.14, types[0].sample_small_decimal)
+    assert_equal(1.0, types[1].sample_small_decimal)
+  end
+
+  def test_small_decimal_with_ordering
+    types = DbType.find(:all, :order => ["sample_small_decimal asc"])
+    types[1].sample_small_decimal
+    assert_equal(1.0, types[0].sample_small_decimal)
+    assert_equal(3.14, types[1].sample_small_decimal)
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
   - Nick Sieger, Ola Bini and JRuby contributors
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-13 00:00:00 Z
+date: 2011-11-23 00:00:00 Z
 dependencies: []
 
 description: |-
@@ -26,6 +26,7 @@ extra_rdoc_files: []
 
 files: 
   - .gitignore
+  - .travis.yml
   - Gemfile
   - Gemfile.lock
   - History.txt
@@ -137,6 +138,7 @@ files:
   - rails_generators/jdbc_generator.rb
   - rails_generators/templates/config/initializers/jdbc.rb
   - rails_generators/templates/lib/tasks/jdbc.rake
+  - rakelib/bundler_ext.rb
   - rakelib/compile.rake
   - rakelib/db.rake
   - rakelib/rails.rake
@@ -178,6 +180,7 @@ files:
   - test/derby_multibyte_test.rb
   - test/derby_simple_test.rb
   - test/generic_jdbc_connection_test.rb
+  - test/h2_change_column_test.rb
   - test/h2_simple_test.rb
   - test/has_many_through.rb
   - test/helper.rb
@@ -220,6 +223,7 @@ files:
   - test/postgres_schema_search_path_test.rb
   - test/postgres_simple_test.rb
   - test/postgres_table_alias_length_test.rb
+  - test/postgres_type_conversion_test.rb
   - test/simple.rb
   - test/sqlite3_simple_test.rb
   - test/sybase_jtds_simple_test.rb
@@ -281,6 +285,7 @@ test_files:
   - test/derby_multibyte_test.rb
   - test/derby_simple_test.rb
   - test/generic_jdbc_connection_test.rb
+  - test/h2_change_column_test.rb
   - test/h2_simple_test.rb
   - test/has_many_through.rb
   - test/helper.rb
@@ -323,6 +328,7 @@ test_files:
   - test/postgres_schema_search_path_test.rb
   - test/postgres_simple_test.rb
   - test/postgres_table_alias_length_test.rb
+  - test/postgres_type_conversion_test.rb
   - test/simple.rb
   - test/sqlite3_simple_test.rb
   - test/sybase_jtds_simple_test.rb