activerecord-jdbc-adapter 1.1.2 → 1.1.3

data/History.txt

@@ -1,3 +1,12 @@
+== 1.1.3
+
+- Remove AR version < 3 guard around some caching methods (sugg. invadersmustdie)
+- Small bug in arjdbc/discover logic, thanks autotelik.
+- Added bigint serial support + some testcases for native type mapping (postgres only)
+- mssql: use subscript instead of #first. (Kim Toms)
+- #71: fix yield called out of block error
+- Silence Rake::DSL warnings for Rake > 0.9
+
 == 1.1.2
 
 - Update version of H2 driver from 1.1.107 to 1.3.153 (Ketan

data/Manifest.txt

@@ -125,6 +125,7 @@ test/postgres_db_create_test.rb
 test/postgres_drop_db_test.rb
 test/postgres_information_schema_leak_test.rb
 test/postgres_mixed_case_test.rb
+test/postgres_native_type_mapping_test.rb
 test/postgres_nonseq_pkey_test.rb
 test/postgres_reserved_test.rb
 test/postgres_schema_search_path_test.rb

data/lib/arjdbc/jdbc/adapter.rb

@@ -202,16 +202,14 @@ module ActiveRecord
         select(sql, name)
       end
 
-      if ActiveRecord::VERSION::MAJOR < 3
-        # Allow query caching to work even when we override alias_method_chain'd methods
-        alias_chained_method :select_all, :query_cache, :jdbc_select_all
-        alias_chained_method :update, :query_dirty, :jdbc_update
-        alias_chained_method :insert, :query_dirty, :jdbc_insert
-
-        # Do we need this? Not in AR 3.
-        def select_one(sql, name = nil)
-          select(sql, name).first
-        end
+      # Allow query caching to work even when we override alias_method_chain'd methods
+      alias_chained_method :select_all, :query_cache, :jdbc_select_all
+      alias_chained_method :update, :query_dirty, :jdbc_update
+      alias_chained_method :insert, :query_dirty, :jdbc_insert
+
+      # Do we need this? Not in AR 3.
+      def select_one(sql, name = nil)
+        select(sql, name).first
       end
 
       def select_rows(sql, name = nil)

data/lib/arjdbc/jdbc/connection.rb

@@ -88,10 +88,10 @@ module ActiveRecord
       rescue ::ActiveRecord::ActiveRecordError
         raise
       rescue Exception => e
-        raise ::ActiveRecord::JDBCError.new("The driver encountered an unknown error: #{e}").tap do |err|
+        raise ::ActiveRecord::JDBCError.new("The driver encountered an unknown error: #{e}").tap { |err|
           err.errno = 0
           err.sql_exception = e
-        end
+        }
       end
 
       def adapter=(adapter)

data/lib/arjdbc/jdbc/discover.rb

@@ -5,7 +5,7 @@ module ArJdbc
     else
       files = $LOAD_PATH.map do |p|
         discover = File.join(p, 'arjdbc','discover.rb')
-        File.exist?(p) ? discover : nil
+        File.exist?(discover) ? discover : nil
       end.compact
     end
     files.each do |f|

data/lib/arjdbc/mssql/limit_helpers.rb

@@ -69,10 +69,10 @@ module ::ArJdbc
             find_select = /\b(SELECT(?:\s+DISTINCT)?)\b(.*)/im
             whole, select, rest_of_query = find_select.match(sql).to_a
             rest_of_query.strip!
-            if rest_of_query.first == "1"
+            if rest_of_query[0] == "1"
               rest_of_query[0] = "*"
             end
-            if rest_of_query.first == "*"
+            if rest_of_query[0] == "*"
               from_table = LimitHelpers.get_table_name(rest_of_query)
               rest_of_query = from_table + '.' + rest_of_query
             end

data/lib/arjdbc/postgresql/adapter.rb

@@ -41,7 +41,7 @@ module ::ArJdbc
       end
 
       def simplified_type(field_type)
-        return :integer if field_type =~ /^serial/i
+        return :integer if field_type =~ /^(big|)serial/i
         return :string if field_type =~ /\[\]$/i || field_type =~ /^interval/i
         return :string if field_type =~ /^(?:point|lseg|box|"?path"?|polygon|circle)/i
         return :datetime if field_type =~ /^timestamp/i

data/lib/arjdbc/version.rb

@@ -1,6 +1,6 @@
 module ArJdbc
   module Version
-    VERSION = "1.1.2"
+    VERSION = "1.1.3"
   end
 end
 # Compatibility with older versions of ar-jdbc for other extensions out there

data/test/abstract_db_create.rb

@@ -15,6 +15,10 @@ module Rails
 end
 
 module AbstractDbCreate
+  def self.included(base)
+    base.module_eval { include Rake::DSL } if defined?(Rake::DSL)
+  end
+
   def setup
     @prevapp = Rake.application
     Rake.application = Rake::Application.new

data/test/postgres_native_type_mapping_test.rb

@@ -0,0 +1,84 @@
+require 'jdbc_common'
+require 'db/postgres'
+
+class CreateNativeTypeMappingTestSchema < ActiveRecord::Migration
+  def self.up
+    execute "DROP SEQUENCE IF EXISTS seq_pk_customers"
+    execute "CREATE SEQUENCE seq_pk_customers"
+    execute %q{
+      CREATE TABLE customers (
+          bigint_serial_should_be_integer bigint default nextval('seq_pk_customers'),
+          integer_serial_should_be_integer integer default nextval('seq_pk_customers'),
+          varchar_should_be_string varchar(2),
+          timestamp_should_be_datetime timestamp,
+          bytea_should_be_binary bytea,
+          double_precision_should_be_float double precision,
+          real_should_be_float real,
+          bool_should_be_boolean bool,
+          interval_should_be_string interval,
+          bigint_should_be_integer bigint
+      )}
+  end
+
+  def self.down
+    execute "DROP TABLE customers"
+    execute "DROP SEQUENCE IF EXISTS seq_pk_customers"
+  end
+end
+
+class Customer < ActiveRecord::Base
+end
+
+class PostgresNativeTypeMappingTest < Test::Unit::TestCase
+  def setup
+    CreateNativeTypeMappingTestSchema.up
+  end
+
+  def teardown
+    CreateNativeTypeMappingTestSchema.down
+  end
+
+  def column_type(column_name)
+    Customer.columns.detect { |c| c.name == column_name }.type
+  end
+
+  def test_bigint_serial_should_be_mapped_to_integer
+    assert_equal :integer, column_type("bigint_serial_should_be_integer")
+  end
+
+  def test_integer_serial_should_be_mapped_to_integer
+    assert_equal :integer, column_type("integer_serial_should_be_integer")
+  end
+
+  def test_varchar_should_be_mapped_to_string
+    assert_equal :string, column_type("varchar_should_be_string")
+  end
+
+  def test_timestamp_should_be_mapped_to_datetime
+    assert_equal :datetime, column_type("timestamp_should_be_datetime")
+  end
+
+  def test_bytea_should_be_mapped_to_binary
+    assert_equal :binary, column_type("bytea_should_be_binary")
+  end
+
+  def test_double_precision_should_be_mapped_to_float
+    assert_equal :float, column_type("double_precision_should_be_float")
+  end
+
+  def test_real_should_be_mapped_to_float
+    assert_equal :float, column_type("real_should_be_float")
+  end
+
+  def test_bool_should_be_mapped_to_boolean
+    assert_equal :boolean, column_type("bool_should_be_boolean")
+  end
+
+  def test_interval_should_be_mapped_to_string
+    assert_equal :string, column_type("interval_should_be_string")
+  end
+
+  def test_bigint_should_be_mapped_to_integer
+    assert_equal :integer, column_type("bigint_should_be_integer")
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
   - Nick Sieger, Ola Bini and JRuby contributors
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 -05:00
+date: 2011-07-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -177,6 +177,7 @@ files:
   - test/postgres_drop_db_test.rb
   - test/postgres_information_schema_leak_test.rb
   - test/postgres_mixed_case_test.rb
+  - test/postgres_native_type_mapping_test.rb
   - test/postgres_nonseq_pkey_test.rb
   - test/postgres_reserved_test.rb
   - test/postgres_schema_search_path_test.rb