activerecord-jdbc-adapter 1.2.1 → 1.2.2

data/test/row_locking.rb

@@ -0,0 +1,90 @@
+#! /usr/bin/env jruby
+
+require 'thread'
+
+module RowLockingTestMethods
+
+  def test_row_locking
+    row_locking_test_template
+  end
+
+  def test_row_locking_with_limit
+    row_locking_test_template(:limit => 1)
+  end
+
+  private
+
+    def row_locking_test_template(options={})
+      # Create two rows that we will work with
+      @row1_id = Entry.create!(:title => "row1").id
+      @row2_id = Entry.create!(:title => "row2").id
+
+      @result_queue = Queue.new
+      signal_queue = Queue.new
+      t1 = Thread.new { thread_helper { thread1_main(signal_queue, options) } }
+      t2 = Thread.new { thread_helper { thread2_main(signal_queue, options) } }
+      t1.join
+      t2.join
+
+      result = []
+      result << @result_queue.shift until @result_queue.empty?    # Convert the queue into an array
+
+      expected = [
+        :t1_locking_row2,
+        :t1_locked_row2,
+
+        :t2_locking_row1,
+        :t2_locked_row1,
+
+        :t2_locking_row2,     # thread 2 tries to lock row2 ...
+        :t1_committed,
+        :t2_locked_row2,      # ... but it doesn't succeed until after thread 1 commits its transaction
+
+        :t2_committed,
+      ]
+
+      assert_equal expected, result, "thread2 should lock row1 immediately but wait for thread1 to commit before getting the lock on row2"
+    end
+
+    def thread1_main(signal_queue, options={})
+      Entry.transaction do
+        @result_queue << :t1_locking_row2
+        Entry.find(@row2_id, {:lock=>true}.merge(options))   # acquire a row lock on r2
+        @result_queue << :t1_locked_row2
+        signal_queue << :go               # signal thread2 to start
+        sleep 2.0                         # Wait for a few seconds, to allow the other thread to race with this thread.
+        @result_queue << :t1_committed
+      end
+    end
+
+    def thread2_main(signal_queue, options={})
+      Entry.transaction do
+        signal_queue.shift   # wait until we get the signal from thread1
+        @result_queue << :t2_locking_row1
+        Entry.find(@row1_id, {:lock=>true}.merge(options))   # should return immediately
+        @result_queue << :t2_locked_row1
+        @result_queue << :t2_locking_row2
+        Entry.find(@row2_id, {:lock=>true}.merge(options))   # should block until thread1 commits its transaction
+        @result_queue << :t2_locked_row2
+        @result_queue << :t2_committed
+      end
+    end
+
+    def thread_helper
+      yield
+    rescue Exception => exc
+      # Output backtrace, since otherwise we won't see anything until the main thread joins this thread.
+      display_exception(exc)
+      raise
+    ensure
+      # This is needed.  Otherwise, the database connections aren't returned to the pool and things break.
+      ActiveRecord::Base.connection_handler.clear_active_connections!
+    end
+
+    def display_exception(exception)
+      lines = []
+      lines << "#{exception.class.name}: #{exception.message}\n"
+      lines += exception.backtrace.map{|line| "\tfrom #{line}"}
+      $stderr.puts lines.join("\n")
+    end
+end

data/test/simple.rb

@@ -98,6 +98,14 @@ end
 module SimpleTestMethods
   include FixtureSetup
 
+  def test_substitute_binds_has_no_side_effect_on_binds_parameter
+    binds = [[Entry.columns_hash['title'], 'test1']]
+    binds2 = binds.dup
+    sql = 'select * from entries where title = ?'
+    Entry.connection.substitute_binds(sql, binds)
+    assert_equal binds2, binds
+  end
+
   def test_entries_created
     assert ActiveRecord::Base.connection.tables.find{|t| t =~ /^entries$/i}, "entries not created"
   end
@@ -358,6 +366,19 @@ module SimpleTestMethods
     end
   end
 
+  def test_remove_nonexistent_index
+    assert_raise(ArgumentError, ActiveRecord::StatementInvalid, ActiveRecord::JDBCError) do
+      @connection.remove_index :entries, :nonexistent_index
+    end
+  end
+
+  def test_add_index_with_invalid_name_length
+    index_name = 'x' * (@connection.index_name_length + 1)
+    assert_raise(ArgumentError) do
+      @connection.add_index "entries", "title", :name => index_name
+    end
+  end
+
   def test_dumping_schema
     require 'active_record/schema_dumper'
     @connection.add_index :entries, :title
@@ -410,9 +431,9 @@ module SimpleTestMethods
 
     class Animal < ActiveRecord::Base; end
 
-    # ENEBO: Is this really ar-jdbc-specific or a bug in our adapter?
     def test_fetching_columns_for_nonexistent_table_should_raise
-      assert_raises(ActiveRecord::JDBCError) do
+      assert_raises(ActiveRecord::ActiveRecordError,
+                    ActiveRecord::StatementInvalid, ActiveRecord::JDBCError) do
         Animal.columns
       end
     end
@@ -629,9 +650,68 @@ module ActiveRecord3TestMethods
   end
 
   module Tests
+    if ActiveRecord::VERSION::MINOR == 2
+      def test_visitor_accessor
+        adapter = Entry.connection
+        expected_visitors = adapter.config[:adapter_spec].
+          arel2_visitors(adapter).values
+        assert !adapter.visitor.nil?
+        assert expected_visitors.include?(adapter.visitor.class)
+      end
+    end
+
     def test_where
       entries = Entry.where(:title => @entry.title)
       assert_equal @entry, entries.first
     end
   end
 end
+
+module ResetColumnInformationTestMethods
+  class Fhqwhgad < ActiveRecord::Base
+  end
+
+  def test_reset_column_information
+    drop_fhqwhgads_table!
+    create_fhqwhgads_table_1!
+    Fhqwhgad.reset_column_information
+    assert_equal ["id", "come_on"].sort, Fhqwhgad.columns.map{|c| c.name}.sort, "columns should be correct the first time"
+
+    drop_fhqwhgads_table!
+    create_fhqwhgads_table_2!
+    Fhqwhgad.reset_column_information
+    assert_equal ["id", "to_the_limit"].sort, Fhqwhgad.columns.map{|c| c.name}.sort, "columns should be correct the second time"
+  ensure
+    drop_fhqwhgads_table!
+  end
+
+  private
+
+    def drop_fhqwhgads_table!
+      ActiveRecord::Schema.define do
+        suppress_messages do
+          drop_table :fhqwhgads if table_exists? :fhqwhgads
+        end
+      end
+    end
+
+    def create_fhqwhgads_table_1!
+      ActiveRecord::Schema.define do
+        suppress_messages do
+          create_table :fhqwhgads do |t|
+            t.string :come_on
+          end
+        end
+      end
+    end
+
+    def create_fhqwhgads_table_2!
+      ActiveRecord::Schema.define do
+        suppress_messages do
+          create_table :fhqwhgads do |t|
+            t.string :to_the_limit, :null=>false, :default=>'everybody'
+          end
+        end
+      end
+    end
+end

data/test/sqlite3_reset_column_information_test.rb

@@ -0,0 +1,8 @@
+#! /usr/bin/env jruby
+
+require 'jdbc_common'
+require 'db/sqlite3'
+
+class Sqlite3ResetColumnInformationTest < Test::Unit::TestCase
+  include ResetColumnInformationTestMethods
+end

data/test/sqlite3_simple_test.rb

@@ -189,6 +189,53 @@ class SQLite3SimpleTest < Test::Unit::TestCase
     assert_equal col.type, :integer
   end
 
+  def test_change_column_with_new_precision_and_scale
+    Entry.delete_all
+    Entry.
+      connection.
+      change_column "entries", "rating", :decimal, :precision => 9, :scale => 7
+    Entry.reset_column_information
+    change_column = Entry.columns_hash["rating"]
+    assert_equal 9, change_column.precision
+    assert_equal 7, change_column.scale
+  end
+
+  def test_change_column_preserve_other_column_precision_and_scale
+    Entry.delete_all
+    Entry.
+      connection.
+      change_column "entries", "rating", :decimal, :precision => 9, :scale => 7
+    Entry.reset_column_information
+
+    rating_column = Entry.columns_hash["rating"]
+    assert_equal 9, rating_column.precision
+    assert_equal 7, rating_column.scale
+
+    Entry.
+      connection.
+      change_column "entries", "title", :string, :null => false
+    Entry.reset_column_information
+
+    rating_column = Entry.columns_hash["rating"]
+    assert_equal 9, rating_column.precision
+    assert_equal 7, rating_column.scale
+  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
 
 # assert_raise ActiveRecord::RecordInvalid do

data/test/sybase_reset_column_information_test.rb

@@ -0,0 +1,8 @@
+#! /usr/bin/env jruby
+
+require 'jdbc_common'
+require 'db/sybase'
+
+class SybaseResetColumnInformationTest < Test::Unit::TestCase
+  include ResetColumnInformationTestMethods
+end

metadata

@@ -2,7 +2,7 @@
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
   - Nick Sieger, Ola Bini and JRuby contributors
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-23 00:00:00 Z
+date: 2012-01-28 00:00:00 Z
 dependencies: []
 
 description: |-
@@ -89,6 +89,7 @@ files:
   - lib/arjdbc/jdbc.rb
   - lib/arjdbc/jdbc/adapter.rb
   - lib/arjdbc/jdbc/adapter_java.jar
+  - lib/arjdbc/jdbc/base_ext.rb
   - lib/arjdbc/jdbc/callbacks.rb
   - lib/arjdbc/jdbc/column.rb
   - lib/arjdbc/jdbc/compatibility.rb
@@ -112,6 +113,7 @@ files:
   - lib/arjdbc/mssql/adapter.rb
   - lib/arjdbc/mssql/connection_methods.rb
   - lib/arjdbc/mssql/limit_helpers.rb
+  - lib/arjdbc/mssql/lock_helpers.rb
   - lib/arjdbc/mssql/tsql_helper.rb
   - lib/arjdbc/mysql.rb
   - lib/arjdbc/mysql/adapter.rb
@@ -175,9 +177,12 @@ files:
   - test/db/oracle.rb
   - test/db/postgres.rb
   - test/db/sqlite3.rb
+  - test/db2_reset_column_information_test.rb
   - test/db2_simple_test.rb
   - test/derby_migration_test.rb
   - test/derby_multibyte_test.rb
+  - test/derby_reset_column_information_test.rb
+  - test/derby_row_locking_test.rb
   - test/derby_simple_test.rb
   - test/generic_jdbc_connection_test.rb
   - test/h2_change_column_test.rb
@@ -201,16 +206,23 @@ files:
   - test/models/validates_uniqueness_of_string.rb
   - test/mssql_db_create_test.rb
   - test/mssql_identity_insert_test.rb
+  - test/mssql_ignore_system_views_test.rb
   - test/mssql_legacy_types_test.rb
   - test/mssql_limit_offset_test.rb
   - test/mssql_multibyte_test.rb
+  - test/mssql_null_test.rb
+  - test/mssql_reset_column_information_test.rb
+  - test/mssql_row_locking_sql_test.rb
+  - test/mssql_row_locking_test.rb
   - test/mssql_simple_test.rb
   - test/mysql_db_create_test.rb
   - test/mysql_index_length_test.rb
   - test/mysql_info_test.rb
   - test/mysql_multibyte_test.rb
   - test/mysql_nonstandard_primary_key_test.rb
+  - test/mysql_reset_column_information_test.rb
   - test/mysql_simple_test.rb
+  - test/oracle_reset_column_information_test.rb
   - test/oracle_simple_test.rb
   - test/oracle_specific_test.rb
   - test/postgres_db_create_test.rb
@@ -220,13 +232,17 @@ files:
   - test/postgres_native_type_mapping_test.rb
   - test/postgres_nonseq_pkey_test.rb
   - test/postgres_reserved_test.rb
+  - test/postgres_reset_column_information_test.rb
   - 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/row_locking.rb
   - test/simple.rb
+  - test/sqlite3_reset_column_information_test.rb
   - test/sqlite3_simple_test.rb
   - test/sybase_jtds_simple_test.rb
+  - test/sybase_reset_column_information_test.rb
 homepage: https://github.com/jruby/activerecord-jdbc-adapter
 licenses: []
 
@@ -257,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jruby-extras
-rubygems_version: 1.8.9
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.
@@ -280,9 +296,12 @@ test_files:
   - test/db/oracle.rb
   - test/db/postgres.rb
   - test/db/sqlite3.rb
+  - test/db2_reset_column_information_test.rb
   - test/db2_simple_test.rb
   - test/derby_migration_test.rb
   - test/derby_multibyte_test.rb
+  - test/derby_reset_column_information_test.rb
+  - test/derby_row_locking_test.rb
   - test/derby_simple_test.rb
   - test/generic_jdbc_connection_test.rb
   - test/h2_change_column_test.rb
@@ -306,16 +325,23 @@ test_files:
   - test/models/validates_uniqueness_of_string.rb
   - test/mssql_db_create_test.rb
   - test/mssql_identity_insert_test.rb
+  - test/mssql_ignore_system_views_test.rb
   - test/mssql_legacy_types_test.rb
   - test/mssql_limit_offset_test.rb
   - test/mssql_multibyte_test.rb
+  - test/mssql_null_test.rb
+  - test/mssql_reset_column_information_test.rb
+  - test/mssql_row_locking_sql_test.rb
+  - test/mssql_row_locking_test.rb
   - test/mssql_simple_test.rb
   - test/mysql_db_create_test.rb
   - test/mysql_index_length_test.rb
   - test/mysql_info_test.rb
   - test/mysql_multibyte_test.rb
   - test/mysql_nonstandard_primary_key_test.rb
+  - test/mysql_reset_column_information_test.rb
   - test/mysql_simple_test.rb
+  - test/oracle_reset_column_information_test.rb
   - test/oracle_simple_test.rb
   - test/oracle_specific_test.rb
   - test/postgres_db_create_test.rb
@@ -325,10 +351,14 @@ test_files:
   - test/postgres_native_type_mapping_test.rb
   - test/postgres_nonseq_pkey_test.rb
   - test/postgres_reserved_test.rb
+  - test/postgres_reset_column_information_test.rb
   - 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/row_locking.rb
   - test/simple.rb
+  - test/sqlite3_reset_column_information_test.rb
   - test/sqlite3_simple_test.rb
   - test/sybase_jtds_simple_test.rb
+  - test/sybase_reset_column_information_test.rb