Merge branch '60-stable'

Author: enebo

lib/arjdbc/postgresql/oid_types.rb

@@ -213,7 +213,7 @@ def load_additional_types(type_map, oid = nil) # :nodoc:
         if oid
           if oid.is_a? Numeric || oid.match(/^\d+$/)
             # numeric OID
-            query += "WHERE t.oid::integer = %s" % oid
+            query += "WHERE t.oid = %s" % oid
 
           elsif m = oid.match(/"?(\w+)"?\."?(\w+)"?/)
             # namespace and type name

test/rails/excludes/postgresql/PostgresqlJSONBTest.rb

@@ -0,0 +1,3 @@
+if ActiveRecord::Base.connection.database_version < 90500
+  exclude :test_pretty_print, 'fails with PG < 9.5'
+end