[postgres] we should return "raw" hstore values on AR < 4.0 by default

(regression caused by fixing #454 for AR >= 4.0)

Author: kares

lib/arjdbc/postgresql/adapter.rb

@@ -1386,5 +1386,9 @@ def jdbc_column_class
       ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn
     end
 
+    if ActiveRecord::VERSION::MAJOR < 4 # Rails 3.x compatibility
+      PostgreSQLJdbcConnection.raw_hstore_type = true if PostgreSQLJdbcConnection.raw_hstore_type? == nil
+    end
+
   end
 end

src/java/arjdbc/postgresql/PostgreSQLRubyJdbcConnection.java

@@ -499,7 +499,7 @@ protected IRubyObject objectToRuby(final ThreadContext context,
         }
 
         if ( object instanceof Map ) { // hstore
-            if ( rawHstoreType ) {
+            if ( rawHstoreType == Boolean.TRUE ) {
                 return runtime.newString( resultSet.getString(column) );
             }
             // by default we avoid double parsing by driver and than column :
@@ -552,20 +552,25 @@ private String formatInterval(final Object object) {
         return str.toString();
     }
 
-    protected static boolean rawHstoreType = Boolean.getBoolean("arjdbc.postgresql.hstore.raw");
+    protected static Boolean rawHstoreType;
+    static {
+        final String hstoreRaw = System.getProperty("arjdbc.postgresql.hstore.raw");
+        if ( hstoreRaw != null ) rawHstoreType = Boolean.parseBoolean(hstoreRaw);
+    }
 
     @JRubyMethod(name = "raw_hstore_type?", meta = true)
     public static IRubyObject useRawHstoreType(final ThreadContext context, final IRubyObject self) {
+        if ( rawHstoreType == null ) return context.getRuntime().getNil();
         return context.getRuntime().newBoolean(rawHstoreType);
     }
 
     @JRubyMethod(name = "raw_hstore_type=", meta = true)
     public static IRubyObject setRawHstoreType(final IRubyObject self, final IRubyObject value) {
         if ( value instanceof RubyBoolean ) {
-            rawHstoreType = ((RubyBoolean) value).isTrue();
+            rawHstoreType = ((RubyBoolean) value).isTrue() ? Boolean.TRUE : Boolean.FALSE;
         }
         else {
-            rawHstoreType = ! value.isNil();
+            rawHstoreType = value.isNil() ? null : Boolean.TRUE;
         }
         return value;
     }

test/db/postgresql/hstore_test.rb

@@ -2,7 +2,8 @@
 require 'test_helper'
 require 'db/postgres'
 
-class PostgresqlHstoreTest < Test::Unit::TestCase
+# Rails 4.x test
+class PostgreSQLHstoreTest < Test::Unit::TestCase
 
   class Hstore < ActiveRecord::Base
     self.table_name = 'hstores'
@@ -212,3 +213,40 @@ def assert_cycle hash
   end
 
 end if Test::Unit::TestCase.ar_version('4.0')
+
+# Rails <= 3.2 test
+class PostgreSQKHstoreTest < Test::Unit::TestCase
+
+  class Hstore < ActiveRecord::Base
+    self.table_name = 'hstores'
+  end
+
+  def setup
+    @connection = ActiveRecord::Base.connection
+
+    unless @connection.supports_extensions?
+      return skip "do not test on PG without hstore"
+    end
+
+    unless @connection.extension_enabled?('hstore')
+      @connection.enable_extension 'hstore'
+      @connection.commit_db_transaction
+    end
+
+    @connection.reconnect!
+
+    @connection.execute 'CREATE TABLE "hstores" ("id" serial primary key, "tags" hstore DEFAULT \'\')'
+  end
+
+  def teardown
+    @connection.execute 'DROP TABLE IF EXISTS "hstores"'
+  end
+
+  test 'returns hstore values as strings by default' do
+    @connection.execute "INSERT INTO hstores (tags) VALUES ('1=>2,2=>3')"
+    x = Hstore.first
+    assert_instance_of String, x.tags
+    assert_equal '"1"=>"2", "2"=>"3"', x.tags
+  end
+
+end unless Test::Unit::TestCase.ar_version('4.0')