activerecord-jdbc-adapter 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afad2b1bdef2eebe2358aa5de395923a306d3485
-  data.tar.gz: 467e05b0176a944fa16b3011e902e549629ae222
+  metadata.gz: 928b3af97782b45db074f63a7c5a3242e7223ea9
+  data.tar.gz: ad5a1f8133f58957d7ab2f9678367523b85c29a9
 SHA512:
-  metadata.gz: c23850d472d6e6cb0ced6a598ec119cef76c6d1e34257682b37ace3fac27e50488e5bc8629e96bf3d9f7acaafdb0fe22d58179d4a6ad1f9efdf2dccda54abeac
-  data.tar.gz: 36092c2ad04aaa6b1f2da21f6dce1f6fe69ee937b02e68a9db189a97506ff5f2f4ae9e6cff69bd8e80d2125f4d6bcc187dc0b96c436789f2f292419a3649e13c
+  metadata.gz: be7f8bbb664f74030fc79097e8f6b673b5ed93acfc348271ccfe6fa9b1e3c3098f34afbb071d597bdb8dad561828c0912a443516848a43dfd56f19653fbe7c4a
+  data.tar.gz: 60516ac2d7c14bb124b8215400368152014ff00e32a8a9b4c7790cdbcb4eaf8fe9c3ffc3510d23e20277850469e9d41a2ab23d8e2640a0ba0206ea41e1bd81c4

data/Appraisals

@@ -12,12 +12,12 @@ appraise "rails31" do
 end
 
 appraise "rails32" do
-  gem "activerecord", "~> 3.2.15", :require => false
+  gem "activerecord", "~> 3.2.16", :require => false
 end
 
 appraise "rails40" do
   # NOTE: make sure you're using --1.9 with AR-4.0
-  gem "activerecord", "~> 4.0.0", :require => false
+  gem "activerecord", "~> 4.0.2", :require => false
 end
 
 appraise "rails41" do

data/Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem 'activerecord', :require => nil
-gem 'thread_safe', :require => nil
+gem 'thread_safe', :require => nil # "optional" - we can roll without it
 if defined?(JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
 gem 'jruby-openssl', :platform => :jruby
 end

data/History.md

@@ -1,3 +1,21 @@
+## 1.3.4 (12/12/13)
+
+- [postgres] unwrap connection instead of casting when adding custom types (#515)
+- [postgres] allow returning string values for (JDBC) arrays with (#510)
+- allow for symbol keys with custom JDBC properties in `config[:properties]`
+- replacing use of AR::ConnectionFailed with AR::ConnectionNotEstablished (#513)
+- [firebird] fix for missing args when visit_Arel_Nodes_SelectCore is called
+- [postgres] better column compatibility with 3.x (avoid array/oid_type)
+- [postgres] backport array-parser due `Column#extract_default` (#504)
+- [postgres] backported "Correctly parse bigint defaults in PostgreSQL"
+- [postgres] 4.0 compat - detect default_function just like on MRI
+- [postgres] backport support for negative money values (in parenthesis)
+- [postgres] support :login_timeout as a standalone config option
+- [firebird] align `prefetch_primary_key?` with Oracle (only for simple PKs)
+- [oracle] do not pre-fetch the primary key if multiple primary keys exist (#498)
+
+Code Contributors: @andfx, Gavin Stark, Ray Zane, @chapmajs
+
 ## 1.3.3 (11/12/13)
 
 - [mysql] allow encoding to be server-detected (using `encoding: false`)

data/activerecord-jdbc-adapter.gemspec

@@ -24,7 +24,8 @@ Gem::Specification.new do |gem|
 
   gem.files = `git ls-files`.split("\n").
     reject { |f| f =~ /^(activerecord-jdbc[^-]|jdbc-)/ }. # gem directories
-    reject { |f| f =~ /^(bench|test)/ } # not sure if including tests is useful
+    reject { |f| f =~ /^(bench|test)/ }. # not sure if including tests is useful
+    reject { |f| f =~ /^(gemfiles)/ } # no tests - no Gemfile_s appraised ...
   gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files = gem.files.grep(%r{^test/})
 

data/lib/arel/visitors/firebird.rb

@@ -11,7 +11,7 @@ module Arel
         ].compact.join(' ').strip
 
         sql = [
-         o.cores.map { |x| visit_Arel_Nodes_SelectCore x }.join,
+         o.cores.map { |x| do_visit_select_core x, a }.join,
          ("ORDER BY #{o.orders.map { |x| do_visit x, a }.join(', ')}" unless o.orders.empty?),
         ].compact.join ' '
 

data/lib/arjdbc/derby/adapter.rb

@@ -96,7 +96,7 @@ module ArJdbc
       md = jdbc_connection.meta_data
       major_version = md.database_major_version; minor_version = md.database_minor_version
       if major_version < 10 || (major_version == 10 && minor_version < 5)
-        raise ::ActiveRecord::ConnectionFailed, "Derby adapter requires Derby >= 10.5"
+        raise ::ActiveRecord::ConnectionNotEstablished, "Derby adapter requires Derby >= 10.5"
       end
       if major_version == 10 && minor_version < 8 # 10.8 ~ supports JDBC 4.1
         config[:connection_alive_sql] ||=

data/lib/arjdbc/firebird/adapter.rb

@@ -166,11 +166,13 @@ module ArJdbc
     end
 
     # Should primary key values be selected from their corresponding
-    # sequence before the insert statement? If true, next_sequence_value
-    # is called before each insert to set the record's primary key.
-    # This is false for all adapters but Firebird.
+    # sequence before the insert statement?
+    # @see #next_sequence_value
+    # @override
     def prefetch_primary_key?(table_name = nil)
-      true
+      return true if table_name.nil?
+      table_name = table_name.to_s
+      columns(table_name).count { |column| column.primary } == 1
     end
 
     def default_sequence_name(table_name, column=nil)

data/lib/arjdbc/jdbc/column.rb

@@ -16,8 +16,7 @@ module ActiveRecord
           default = args.shift
         else # for extending classes allow ignoring first argument :
           if ! config.nil? && ! config.is_a?(Hash)
-            # initialize(name, default, *args)
-            default = name; name = config
+            default = name; name = config # initialize(name, default, *args)
           else
             default = args.shift
           end

data/lib/arjdbc/jdbc/driver.rb

@@ -2,7 +2,7 @@ module ActiveRecord
   module ConnectionAdapters
     class JdbcDriver
       attr_reader :name, :properties
-      
+
       def initialize(name, properties = {})
         @name = name
         @driver = driver_class.new
@@ -10,10 +10,10 @@ module ActiveRecord
           @properties = properties # allow programmatically set properties
         else
           @properties = Java::JavaUtil::Properties.new
-          properties.each { |key, val| @properties[key] = val.to_s } if properties
+          properties.each { |key, val| @properties[key.to_s] = val.to_s } if properties
         end
       end
-      
+
       def driver_class
         @driver_class ||= begin
           driver_class_const = (@name[0...1].capitalize + @name[1..@name.length]).gsub(/\./, '_')

data/lib/arjdbc/mysql/adapter.rb

@@ -20,7 +20,7 @@ module ArJdbc
     def init_connection(jdbc_connection)
       meta = jdbc_connection.meta_data
       if meta.driver_major_version < 5
-        raise ::ActiveRecord::ConnectionFailed,
+        raise ::ActiveRecord::ConnectionNotEstablished,
           "MySQL adapter requires driver >= 5.0 got: '#{meta.driver_version}'"
       elsif meta.driver_major_version == 5 && meta.driver_minor_version < 1
         config[:connection_alive_sql] ||= 'SELECT 1' # need 5.1 for JDBC 4.0

data/lib/arjdbc/oracle/adapter.rb

@@ -508,7 +508,7 @@ module ArJdbc
     def prefetch_primary_key?(table_name = nil)
       return true if table_name.nil?
       table_name = table_name.to_s
-      columns(table_name).detect { |column| column.primary }
+      columns(table_name).count { |column| column.primary } == 1
     end
 
     # @override

data/lib/arjdbc/postgresql/adapter.rb

@@ -147,7 +147,7 @@ module ArJdbc
     end
 
     def type_cast(value, column, array_member = false)
-      return super unless column
+      return super(value, nil) unless column
 
       case value
       when String
@@ -243,6 +243,7 @@ module ArJdbc
     def prepare_column_options(column, types)
       spec = super
       spec[:array] = 'true' if column.respond_to?(:array) && column.array
+      spec[:default] = "\"#{column.default_function}\"" if column.default_function
       spec
     end if AR4_COMPAT
 
@@ -1237,16 +1238,25 @@ module ActiveRecord::ConnectionAdapters
     include ::ArJdbc::PostgreSQL::Column
 
     def initialize(name, default, oid_type = nil, sql_type = nil, null = true)
-      # NOTE: we support AR <= 3.2 : (name, default, sql_type = nil, null = true)
-      null, sql_type, oid_type = !! sql_type, oid_type, nil unless oid_type.is_a?(Integer)
-      @oid_type = oid_type
-      if sql_type =~ /\[\]$/
+      if oid_type.is_a?(Integer) then @oid_type = oid_type
+      else # NOTE: AR <= 3.2 : (name, default, sql_type = nil, null = true)
+        null, sql_type, oid_type = !! sql_type, oid_type, nil
+      end
+      if sql_type =~ /\[\]$/ && ArJdbc::PostgreSQL::AR4_COMPAT
         @array = true if respond_to?(:array)
         super(name, default, sql_type[0..sql_type.length - 3], null)
       else
         @array = false if respond_to?(:array)
         super(name, default, sql_type, null)
       end
+
+      @default_function = default if has_default_function?(@default, default)
+    end
+
+    private
+
+    def has_default_function?(default_value, default)
+      ! default_value && ( %r{\w+\(.*\)} === default )
     end
 
   end
@@ -1344,7 +1354,7 @@ module ActiveRecord::ConnectionAdapters
 
       def primary_key(name, type = :primary_key, options = {})
         return super unless type == :uuid
-        options[:default] ||= 'uuid_generate_v4()'
+        options[:default] = options.fetch(:default, 'uuid_generate_v4()')
         options[:primary_key] = true
         column name, type, options
       end if ActiveRecord::VERSION::MAJOR > 3 # 3.2 super expects (name)
@@ -1402,6 +1412,7 @@ module ActiveRecord::ConnectionAdapters
     end
 
     if ActiveRecord::VERSION::MAJOR < 4 # Rails 3.x compatibility
+      PostgreSQLJdbcConnection.raw_array_type = true if PostgreSQLJdbcConnection.raw_array_type? == nil
       PostgreSQLJdbcConnection.raw_hstore_type = true if PostgreSQLJdbcConnection.raw_hstore_type? == nil
     end
 

data/lib/arjdbc/postgresql/array_parser.rb

@@ -0,0 +1,89 @@
+module ArJdbc
+  module PostgreSQL
+    module ArrayParser
+
+      def parse_pg_array(string)
+        parse_data(string, 0)
+      end
+
+      private
+
+      def parse_data(string, index)
+        local_index = index
+        array = []
+        while(local_index < string.length)
+          case string[local_index]
+          when '{'
+            local_index,array = parse_array_contents(array, string, local_index + 1)
+          when '}'
+            return array
+          end
+          local_index += 1
+        end
+
+        array
+      end
+
+      def parse_array_contents(array, string, index)
+        is_escaping = false
+        is_quoted = false
+        was_quoted = false
+        current_item = ''
+
+        local_index = index
+        while local_index
+          token = string[local_index]
+          if is_escaping
+            current_item << token
+            is_escaping = false
+          else
+            if is_quoted
+              case token
+              when '"'
+                is_quoted = false
+                was_quoted = true
+              when "\\"
+                is_escaping = true
+              else
+                current_item << token
+              end
+            else
+              case token
+              when "\\"
+                is_escaping = true
+              when ','
+                add_item_to_array(array, current_item, was_quoted)
+                current_item = ''
+                was_quoted = false
+              when '"'
+                is_quoted = true
+              when '{'
+                internal_items = []
+                local_index,internal_items = parse_array_contents(internal_items, string, local_index + 1)
+                array.push(internal_items)
+              when '}'
+                add_item_to_array(array, current_item, was_quoted)
+                return local_index,array
+              else
+                current_item << token
+              end
+            end
+          end
+
+          local_index += 1
+        end
+        return local_index,array
+      end
+
+      def add_item_to_array(array, current_item, quoted)
+        if current_item.length == 0
+        elsif !quoted && current_item == 'NULL'
+          array.push nil
+        else
+          array.push current_item
+        end
+      end
+
+    end
+  end
+end

data/lib/arjdbc/postgresql/column.rb

@@ -13,13 +13,27 @@ module ArJdbc
       def self.included(base)
         # NOTE: assumes a standalone PostgreSQLColumn class
         class << base
-          include Cast
+
           attr_accessor :money_precision
+
+          # Loads pg_array_parser if available. String parsing can be
+          # performed quicker by a native extension, which will not create
+          # a large amount of Ruby objects that will need to be garbage
+          # collected. pg_array_parser has a C and Java extension
+          begin
+            require 'pg_array_parser'
+            include PgArrayParser
+          rescue LoadError
+            require 'arjdbc/postgresql/array_parser'
+            include ArrayParser
+          end if AR4_COMPAT
+
+          include Cast
+
         end
       end
 
-      attr_accessor :array
-      def array?; array; end # in case we remove the array reader
+      ( attr_accessor :array; def array?; array; end ) if AR4_COMPAT
 
       # Extracts the value from a PostgreSQL column default definition.
       #
@@ -38,7 +52,7 @@ module ArJdbc
           when /\A'(.*)'::(num|date|tstz|ts|int4|int8)range\z/m
             $1
           # Numeric types
-          when /\A\(?(-?\d+(\.\d*)?\)?)\z/
+          when /\A\(?(-?\d+(\.\d*)?\)?(::bigint)?)\z/
             $1
           # Character types
           when /\A\(?'(.*)'::.*\b(?:character varying|bpchar|text)\z/m
@@ -90,16 +104,29 @@ module ArJdbc
       end
 
       # Casts value (which is a String) to an appropriate instance.
-      def type_cast(value)
+      # @private
+      def type_cast(value) # AR < 4.0 version
+        return if value.nil?
+        return super if respond_to?(:encoded?) && encoded? # since AR-3.2
+
+        case sql_type
+        when 'money'
+          self.class.string_to_money(value)
+        else super
+        end
+      end
+
+      # Casts value (which is a String) to an appropriate instance.
+      def type_cast(value, type = false) # AR >= 4.0 version
         return if value.nil?
-        return super if encoded? # respond_to?(:encoded?) only since AR-3.2
+        return super(value) if encoded?
 
         # NOTE: we do not use OID::Type
         # @oid_type.type_cast value
 
-        return value if array? # handled on the connection (JDBC) side
+        return self.class.string_to_array(value, self) if array? && type == false
 
-        case type
+        case type ||= self.type
         when :hstore then self.class.string_to_hstore value
         when :json then self.class.string_to_json value
         when :cidr, :inet then self.class.string_to_cidr value
@@ -109,18 +136,7 @@ module ArJdbc
         else
           case sql_type
           when 'money'
-            # Because money output is formatted according to the locale, there
-            # are two cases to consider (note the decimal separators) :
-            # (1) $12,345,678.12
-            # (2) $12.345.678,12
-            case value
-            when /^-?\D+[\d,]+\.\d{2}$/ # (1)
-              value.gsub!(/[^-\d.]/, '')
-            when /^-?\D+[\d.]+,\d{2}$/ # (2)
-              value.gsub!(/[^-\d,]/, '')
-              value.sub!(/,/, '.')
-            end
-            self.class.value_to_decimal value
+            self.class.string_to_money(value)
           when /^point/
             value.is_a?(String) ? self.class.string_to_point(value) : value
           when /^(bit|varbit)/
@@ -152,7 +168,7 @@ module ArJdbc
             end
 
             ::Range.new(from, to, extracted[:exclude_end])
-          else super
+          else super(value)
           end
         end
       end if AR4_COMPAT
@@ -299,6 +315,27 @@ module ArJdbc
       # @note Based on *active_record/connection_adapters/postgresql/cast.rb* (4.0).
       module Cast
 
+        def string_to_money(string)
+          return string unless String === string
+
+          # Because money output is formatted according to the locale, there
+          # are two cases to consider (note the decimal separators) :
+          # (1) $12,345,678.12
+          # (2) $12.345.678,12
+          # Negative values are represented as follows:
+          #  (3) -$2.55
+          #  (4) ($2.55)
+          string = string.sub(/^\((.+)\)$/, '-\1') # (4)
+          case string
+          when /^-?\D+[\d,]+\.\d{2}$/ # (1)
+            string.gsub!(/[^-\d.]/, '')
+          when /^-?\D+[\d.]+,\d{2}$/ # (2)
+            string.gsub!(/[^-\d,]/, '')
+            string.sub!(/,/, '.')
+          end
+          value_to_decimal string
+        end
+
         def point_to_string(point)
           "(#{point[0]},#{point[1]})"
         end
@@ -416,10 +453,11 @@ module ArJdbc
           end
         end
 
-        # NOTE: not used - we get "parsed" array value from connection
-        #def string_to_array(string, oid)
-        #  parse_pg_array(string).map { |val| oid.type_cast val }
-        #end
+        # @note Only used for default values - we get a "parsed" array from JDBC.
+        def string_to_array(string, column)
+          return string unless String === string
+          parse_pg_array(string).map { |val| column.type_cast(val, column.type) }
+        end
 
         private
 

data/lib/arjdbc/postgresql/connection_methods.rb

@@ -19,7 +19,9 @@ ArJdbc::ConnectionMethods.module_eval do
     # PG :connect_timeout - maximum time to wait for connection to succeed
     if connect_timeout = ( config[:connect_timeout] || ENV['PGCONNECT_TIMEOUT'] )
       properties['socketTimeout'] ||= connect_timeout
-      # NOTE: maybe set options['loginTimeout'] as well?
+    end
+    if login_timeout = config[:login_timeout]
+      properties['loginTimeout'] ||= login_timeout
     end
     sslmode = config.key?(:sslmode) ? config[:sslmode] : config[:requiressl]
     # NOTE: makes not much sense since this needs some JVM options :

data/lib/arjdbc/tasks/databases.rake

@@ -42,7 +42,7 @@ namespace :db do
   end
 
   if defined? adapt_jdbc_config
-    puts "ArJdbc: double loading #{__FILE__} please delete lib/rasks/jdbc.rake if present!"
+    puts "ArJdbc: double loading #{__FILE__} please delete lib/tasks/jdbc.rake if present!"
   end
 
   def adapt_jdbc_config(config)

data/lib/arjdbc/version.rb

@@ -1,5 +1,5 @@
 module ArJdbc
-  VERSION = "1.3.3"
+  VERSION = "1.3.4"
   # @deprecated
   module Version
     # @private 1.2.x compatibility

data/src/java/arjdbc/jdbc/RubyJdbcConnection.java

@@ -444,7 +444,7 @@ public class RubyJdbcConnection extends RubyObject {
      * @return connection
      */
     @JRubyMethod(name = "init_connection")
-    public IRubyObject init_connection(final ThreadContext context) throws SQLException {
+    public synchronized IRubyObject init_connection(final ThreadContext context) throws SQLException {
         final IRubyObject jdbcConnection = setConnection( newConnection() );
         final IRubyObject adapter = callMethod("adapter"); // self.adapter
         if ( ! adapter.isNil() ) {
@@ -482,7 +482,7 @@ public class RubyJdbcConnection extends RubyObject {
     }
 
     @JRubyMethod(name = "disconnect!")
-    public IRubyObject disconnect(final ThreadContext context) {
+    public synchronized IRubyObject disconnect(final ThreadContext context) {
         // TODO: only here to try resolving multi-thread issues :
         // https://github.com/jruby/activerecord-jdbc-adapter/issues/197
         // https://github.com/jruby/activerecord-jdbc-adapter/issues/198
@@ -499,7 +499,7 @@ public class RubyJdbcConnection extends RubyObject {
     }
 
     @JRubyMethod(name = "reconnect!")
-    public IRubyObject reconnect(final ThreadContext context) {
+    public synchronized IRubyObject reconnect(final ThreadContext context) {
         try {
             final Connection connection = newConnection();
             final IRubyObject result = setConnection( connection );
@@ -1162,7 +1162,7 @@ public class RubyJdbcConnection extends RubyObject {
                 String _tableName = caseConvertIdentifierForJdbc(connection, tableName);
                 String _schemaName = caseConvertIdentifierForJdbc(connection, schemaName);
                 final TableName table = extractTableName(connection, _schemaName, _tableName);
-                
+
                 final List<RubyString> primaryKeys = primaryKeys(context, connection, table);
 
                 ResultSet indexInfoSet = null;
@@ -2662,7 +2662,7 @@ public class RubyJdbcConnection extends RubyObject {
     }
 
     protected Connection getConnection(boolean error) {
-        final Connection connection = (Connection) dataGetStruct();
+        final Connection connection = (Connection) dataGetStruct(); // synchronized
         if ( connection == null && error ) {
             final RubyClass errorClass = getConnectionNotEstablished( getRuntime() );
             throw new RaiseException(getRuntime(), errorClass, "no connection available", false);
@@ -2670,7 +2670,7 @@ public class RubyJdbcConnection extends RubyObject {
         return connection;
     }
 
-    private synchronized IRubyObject setConnection(final Connection connection) {
+    private IRubyObject setConnection(final Connection connection) {
         close( getConnection(false) ); // close previously open connection if there is one
 
         final IRubyObject rubyConnectionObject =

data/src/java/arjdbc/postgresql/PostgreSQLRubyJdbcConnection.java

@@ -119,18 +119,22 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
     }
 
     @Override
-    protected void setStatementParameters(final ThreadContext context,
-        final Connection connection, final PreparedStatement statement,
-        final List<?> binds) throws SQLException {
-
-        ((PGConnection) connection).addDataType("daterange", DateRangeType.class);
-        ((PGConnection) connection).addDataType("tsrange",   TsRangeType.class);
-        ((PGConnection) connection).addDataType("tstzrange", TstzRangeType.class);
-        ((PGConnection) connection).addDataType("int4range", Int4RangeType.class);
-        ((PGConnection) connection).addDataType("int8range", Int8RangeType.class);
-        ((PGConnection) connection).addDataType("numrange",  NumRangeType.class);
-
-        super.setStatementParameters(context, connection, statement, binds);
+    protected Connection newConnection() throws SQLException {
+        final Connection connection = getConnectionFactory().newConnection();
+        final PGConnection pgConnection;
+        if ( connection instanceof PGConnection ) {
+            pgConnection = (PGConnection) connection;
+        }
+        else {
+            pgConnection = connection.unwrap(PGConnection.class);
+        }
+        pgConnection.addDataType("daterange", DateRangeType.class);
+        pgConnection.addDataType("tsrange",   TsRangeType.class);
+        pgConnection.addDataType("tstzrange", TstzRangeType.class);
+        pgConnection.addDataType("int4range", Int4RangeType.class);
+        pgConnection.addDataType("int8range", Int8RangeType.class);
+        pgConnection.addDataType("numrange",  NumRangeType.class);
+        return connection;
     }
 
     @Override // due statement.setNull(index, Types.BLOB) not working :
@@ -458,6 +462,9 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
     protected IRubyObject arrayToRuby(final ThreadContext context,
         final Ruby runtime, final ResultSet resultSet, final int column)
         throws SQLException {
+        if ( rawArrayType == Boolean.TRUE ) { // pre AR 4.0 compatibility
+            return runtime.newString( resultSet.getString(column) );
+        }
         // NOTE: avoid `finally { array.free(); }` on PostgreSQL due :
         // java.sql.SQLFeatureNotSupportedException:
         // Method org.postgresql.jdbc4.Jdbc4Array.free() is not yet implemented.
@@ -552,6 +559,29 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
         return str.toString();
     }
 
+    protected static Boolean rawArrayType;
+    static {
+        final String arrayRaw = System.getProperty("arjdbc.postgresql.array.raw");
+        if ( arrayRaw != null ) rawArrayType = Boolean.parseBoolean(arrayRaw);
+    }
+
+    @JRubyMethod(name = "raw_array_type?", meta = true)
+    public static IRubyObject useRawArrayType(final ThreadContext context, final IRubyObject self) {
+        if ( rawArrayType == null ) return context.getRuntime().getNil();
+        return context.getRuntime().newBoolean(rawArrayType);
+    }
+
+    @JRubyMethod(name = "raw_array_type=", meta = true)
+    public static IRubyObject setRawArrayType(final IRubyObject self, final IRubyObject value) {
+        if ( value instanceof RubyBoolean ) {
+            rawArrayType = ((RubyBoolean) value).isTrue() ? Boolean.TRUE : Boolean.FALSE;
+        }
+        else {
+            rawArrayType = value.isNil() ? null : Boolean.TRUE;
+        }
+        return value;
+    }
+
     protected static Boolean rawHstoreType;
     static {
         final String hstoreRaw = System.getProperty("arjdbc.postgresql.hstore.raw");

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -50,18 +50,6 @@ files:
 - Rakefile
 - Rakefile.jdbc
 - activerecord-jdbc-adapter.gemspec
-- gemfiles/rails23.gemfile
-- gemfiles/rails23.gemfile.lock
-- gemfiles/rails30.gemfile
-- gemfiles/rails30.gemfile.lock
-- gemfiles/rails31.gemfile
-- gemfiles/rails31.gemfile.lock
-- gemfiles/rails32.gemfile
-- gemfiles/rails32.gemfile.lock
-- gemfiles/rails40.gemfile
-- gemfiles/rails40.gemfile.lock
-- gemfiles/rails41.gemfile
-- gemfiles/rails41.gemfile.lock
 - lib/active_record/connection_adapters/as400_adapter.rb
 - lib/active_record/connection_adapters/db2_adapter.rb
 - lib/active_record/connection_adapters/derby_adapter.rb
@@ -153,6 +141,7 @@ files:
 - lib/arjdbc/oracle/connection_methods.rb
 - lib/arjdbc/postgresql.rb
 - lib/arjdbc/postgresql/adapter.rb
+- lib/arjdbc/postgresql/array_parser.rb
 - lib/arjdbc/postgresql/column.rb
 - lib/arjdbc/postgresql/connection_methods.rb
 - lib/arjdbc/postgresql/explain_support.rb

data/gemfiles/rails23.gemfile

@@ -1,18 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "thread_safe", :require=>nil
-gem "rake", :require=>nil
-gem "appraisal", :require=>nil
-gem "test-unit", "2.5.4", :group=>:test
-gem "test-unit-context", ">= 0.3.0", :group=>:test
-gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test
-gem "simplecov", :require=>nil, :group=>:test
-gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
-gem "mysql2", :require=>nil, :platform=>:mri, :group=>:test
-gem "pg", :require=>nil, :platform=>:mri, :group=>:test
-gem "sqlite3", :require=>nil, :platform=>:mri, :group=>:test
-gem "activerecord", "~> 2.3.18", :require=>false
-gem "rails", "~> 2.3.18"
-

data/gemfiles/rails23.gemfile.lock

@@ -1,63 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (2.3.18)
-      actionpack (= 2.3.18)
-    actionpack (2.3.18)
-      activesupport (= 2.3.18)
-      rack (~> 1.1.0)
-    activerecord (2.3.18)
-      activesupport (= 2.3.18)
-    activeresource (2.3.18)
-      activesupport (= 2.3.18)
-    activesupport (2.3.18)
-    appraisal (0.5.2)
-      bundler
-      rake
-    atomic (1.1.10)
-    atomic (1.1.10-java)
-    bcrypt-ruby (3.0.1)
-    bcrypt-ruby (3.0.1-java)
-    metaclass (0.0.1)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.7.7)
-    rack (1.1.6)
-    rails (2.3.18)
-      actionmailer (= 2.3.18)
-      actionpack (= 2.3.18)
-      activerecord (= 2.3.18)
-      activeresource (= 2.3.18)
-      activesupport (= 2.3.18)
-      rake (>= 0.8.3)
-    rake (10.1.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    test-unit (2.5.4)
-    test-unit-context (0.3.1)
-      test-unit (>= 2.4.0)
-    thread_safe (0.1.2)
-      atomic
-    thread_safe (0.1.2-java)
-      atomic
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 2.3.18)
-  appraisal
-  bcrypt-ruby (~> 3.0.0)
-  mocha (~> 0.13.1)
-  mysql2
-  pg
-  rails (~> 2.3.18)
-  rake
-  simplecov
-  sqlite3
-  test-unit (= 2.5.4)
-  test-unit-context (>= 0.3.0)
-  thread_safe

data/gemfiles/rails30.gemfile

@@ -1,17 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "thread_safe", :require=>nil
-gem "rake", :require=>nil
-gem "appraisal", :require=>nil
-gem "test-unit", "2.5.4", :group=>:test
-gem "test-unit-context", ">= 0.3.0", :group=>:test
-gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test
-gem "simplecov", :require=>nil, :group=>:test
-gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
-gem "mysql2", :require=>nil, :platform=>:mri, :group=>:test
-gem "pg", :require=>nil, :platform=>:mri, :group=>:test
-gem "sqlite3", :require=>nil, :platform=>:mri, :group=>:test
-gem "activerecord", "~> 3.0.20", :require=>false
-

data/gemfiles/rails30.gemfile.lock

@@ -1,61 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.20)
-    appraisal (0.5.2)
-      bundler
-      rake
-    arel (2.0.10)
-    atomic (1.1.10)
-    atomic (1.1.10-java)
-    bcrypt-ruby (3.0.1)
-    bcrypt-ruby (3.0.1-java)
-    builder (2.1.2)
-    i18n (0.5.0)
-    metaclass (0.0.1)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.7.7)
-    mysql2 (0.3.13)
-    pg (0.16.0)
-    rake (10.1.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sqlite3 (1.3.8)
-    test-unit (2.5.4)
-    test-unit-context (0.3.1)
-      test-unit (>= 2.4.0)
-    thread_safe (0.1.2)
-      atomic
-    thread_safe (0.1.2-java)
-      atomic
-    tzinfo (0.3.37)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 3.0.20)
-  appraisal
-  bcrypt-ruby (~> 3.0.0)
-  mocha (~> 0.13.1)
-  mysql2
-  pg
-  rake
-  simplecov
-  sqlite3
-  test-unit (= 2.5.4)
-  test-unit-context (>= 0.3.0)
-  thread_safe

data/gemfiles/rails31.gemfile

@@ -1,17 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "thread_safe", :require=>nil
-gem "rake", :require=>nil
-gem "appraisal", :require=>nil
-gem "test-unit", "2.5.4", :group=>:test
-gem "test-unit-context", ">= 0.3.0", :group=>:test
-gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test
-gem "simplecov", :require=>nil, :group=>:test
-gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
-gem "mysql2", :require=>nil, :platform=>:mri, :group=>:test
-gem "pg", :require=>nil, :platform=>:mri, :group=>:test
-gem "sqlite3", :require=>nil, :platform=>:mri, :group=>:test
-gem "activerecord", "~> 3.1.12", :require=>false
-

data/gemfiles/rails31.gemfile.lock

@@ -1,59 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (3.1.12)
-      activesupport (= 3.1.12)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.12)
-      activemodel (= 3.1.12)
-      activesupport (= 3.1.12)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activesupport (3.1.12)
-      multi_json (~> 1.0)
-    appraisal (0.5.2)
-      bundler
-      rake
-    arel (2.2.3)
-    atomic (1.1.10)
-    atomic (1.1.10-java)
-    bcrypt-ruby (3.0.1)
-    bcrypt-ruby (3.0.1-java)
-    builder (3.0.4)
-    i18n (0.6.4)
-    metaclass (0.0.1)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.7.7)
-    rake (10.1.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    test-unit (2.5.4)
-    test-unit-context (0.3.1)
-      test-unit (>= 2.4.0)
-    thread_safe (0.1.2)
-      atomic
-    thread_safe (0.1.2-java)
-      atomic
-    tzinfo (0.3.37)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 3.1.12)
-  appraisal
-  bcrypt-ruby (~> 3.0.0)
-  mocha (~> 0.13.1)
-  mysql2
-  pg
-  rake
-  simplecov
-  sqlite3
-  test-unit (= 2.5.4)
-  test-unit-context (>= 0.3.0)
-  thread_safe

data/gemfiles/rails32.gemfile

@@ -1,17 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "thread_safe", :require=>nil
-gem "rake", :require=>nil
-gem "appraisal", :require=>nil
-gem "test-unit", "2.5.4", :group=>:test
-gem "test-unit-context", ">= 0.3.0", :group=>:test
-gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test
-gem "simplecov", :require=>nil, :group=>:test
-gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
-gem "mysql2", :require=>nil, :platform=>:mri, :group=>:test
-gem "pg", :require=>nil, :platform=>:mri, :group=>:test
-gem "sqlite3", :require=>nil, :platform=>:mri, :group=>:test
-gem "activerecord", "~> 3.2.15", :require=>false
-

data/gemfiles/rails32.gemfile.lock

@@ -1,62 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (3.2.15)
-      activesupport (= 3.2.15)
-      builder (~> 3.0.0)
-    activerecord (3.2.15)
-      activemodel (= 3.2.15)
-      activesupport (= 3.2.15)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.15)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    appraisal (0.5.2)
-      bundler
-      rake
-    arel (3.0.2)
-    atomic (1.1.14)
-    atomic (1.1.14-java)
-    bcrypt-ruby (3.0.1)
-    bcrypt-ruby (3.0.1-java)
-    builder (3.0.4)
-    i18n (0.6.5)
-    metaclass (0.0.1)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.7.7)
-    mysql2 (0.3.13)
-    pg (0.16.0)
-    rake (10.1.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sqlite3 (1.3.8)
-    test-unit (2.5.4)
-    test-unit-context (0.3.1)
-      test-unit (>= 2.4.0)
-    thread_safe (0.1.3)
-      atomic
-    thread_safe (0.1.3-java)
-      atomic
-    tzinfo (0.3.38)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 3.2.15)
-  appraisal
-  bcrypt-ruby (~> 3.0.0)
-  mocha (~> 0.13.1)
-  mysql2
-  pg
-  rake
-  simplecov
-  sqlite3
-  test-unit (= 2.5.4)
-  test-unit-context (>= 0.3.0)
-  thread_safe

data/gemfiles/rails40.gemfile

@@ -1,17 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "thread_safe", :require=>nil
-gem "rake", :require=>nil
-gem "appraisal", :require=>nil
-gem "test-unit", "2.5.4", :group=>:test
-gem "test-unit-context", ">= 0.3.0", :group=>:test
-gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test
-gem "simplecov", :require=>nil, :group=>:test
-gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
-gem "mysql2", :require=>nil, :platform=>:mri, :group=>:test
-gem "pg", :require=>nil, :platform=>:mri, :group=>:test
-gem "sqlite3", :require=>nil, :platform=>:mri, :group=>:test
-gem "activerecord", "~> 4.0.0", :require=>false
-

data/gemfiles/rails40.gemfile.lock

@@ -1,59 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    appraisal (0.5.2)
-      bundler
-      rake
-    arel (4.0.1)
-    atomic (1.1.14-java)
-    bcrypt-ruby (3.0.1-java)
-    builder (3.1.4)
-    i18n (0.6.5)
-    metaclass (0.0.1)
-    minitest (4.7.5)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.8.2)
-    rake (10.1.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    test-unit (2.5.4)
-    test-unit-context (0.3.1)
-      test-unit (>= 2.4.0)
-    thread_safe (0.1.3-java)
-      atomic
-    tzinfo (0.3.38)
-
-PLATFORMS
-  java
-
-DEPENDENCIES
-  activerecord (~> 4.0.0)
-  appraisal
-  bcrypt-ruby (~> 3.0.0)
-  mocha (~> 0.13.1)
-  mysql2
-  pg
-  rake
-  simplecov
-  sqlite3
-  test-unit (= 2.5.4)
-  test-unit-context (>= 0.3.0)
-  thread_safe

data/gemfiles/rails41.gemfile

@@ -1,18 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "thread_safe", :require=>nil
-gem "rake", :require=>nil
-gem "appraisal", :require=>nil
-gem "test-unit", "2.5.4", :group=>:test
-gem "test-unit-context", ">= 0.3.0", :group=>:test
-gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test
-gem "simplecov", :require=>nil, :group=>:test
-gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
-gem "mysql2", :require=>nil, :platform=>:mri, :group=>:test
-gem "pg", :require=>nil, :platform=>:mri, :group=>:test
-gem "sqlite3", :require=>nil, :platform=>:mri, :group=>:test
-gem "activerecord", :github=>"rails/rails", :branch=>"master", :require=>false
-gem "rails", :github=>"rails/rails", :branch=>"master"
-

data/gemfiles/rails41.gemfile.lock

@@ -1,117 +0,0 @@
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: 094e31ce6700993759c6f36db52afb0a43bfa71f
-  branch: master
-  specs:
-    actionmailer (4.1.0.beta)
-      actionpack (= 4.1.0.beta)
-      actionview (= 4.1.0.beta)
-      mail (~> 2.5.4)
-    actionpack (4.1.0.beta)
-      activesupport (= 4.1.0.beta)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.0.beta)
-      activemodel (= 4.1.0.beta)
-      activesupport (= 4.1.0.beta)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-    activemodel (4.1.0.beta)
-      activesupport (= 4.1.0.beta)
-      builder (~> 3.1.0)
-    activerecord (4.1.0.beta)
-      activemodel (= 4.1.0.beta)
-      activesupport (= 4.1.0.beta)
-      arel (~> 4.0.0)
-    activesupport (4.1.0.beta)
-      i18n (~> 0.6, >= 0.6.4)
-      json (~> 1.7)
-      minitest (~> 5.0)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    rails (4.1.0.beta)
-      actionmailer (= 4.1.0.beta)
-      actionpack (= 4.1.0.beta)
-      actionview (= 4.1.0.beta)
-      activemodel (= 4.1.0.beta)
-      activerecord (= 4.1.0.beta)
-      activesupport (= 4.1.0.beta)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.0.beta)
-      sprockets-rails (~> 2.0.0)
-    railties (4.1.0.beta)
-      actionpack (= 4.1.0.beta)
-      activesupport (= 4.1.0.beta)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    appraisal (0.5.2)
-      bundler
-      rake
-    arel (4.0.1)
-    atomic (1.1.14-java)
-    bcrypt-ruby (3.0.1-java)
-    builder (3.1.4)
-    erubis (2.7.0)
-    hike (1.2.3)
-    i18n (0.6.5)
-    json (1.8.1-java)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.25)
-    minitest (5.0.8)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.8.2)
-    polyglot (0.3.3)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rake (10.1.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sprockets (2.10.0)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    test-unit (2.5.4)
-    test-unit-context (0.3.1)
-      test-unit (>= 2.4.0)
-    thor (0.18.1)
-    thread_safe (0.1.3-java)
-      atomic
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
-
-PLATFORMS
-  java
-
-DEPENDENCIES
-  activerecord!
-  appraisal
-  bcrypt-ruby (~> 3.0.0)
-  mocha (~> 0.13.1)
-  mysql2
-  pg
-  rails!
-  rake
-  simplecov
-  sqlite3
-  test-unit (= 2.5.4)
-  test-unit-context (>= 0.3.0)
-  thread_safe