Merge branch '50-stable' into 51-stable

Author: enebo

.travis.yml

@@ -11,6 +11,8 @@ bundler_args: --without development
 script: bundle exec rake ${TEST_PREFIX}test_$DB
 before_install:
   - unset _JAVA_OPTIONS
+  - rvm @default,@global do gem uninstall bundler -a -x -I || true
+  - gem install bundler -v "~>1.17.3"
 before_script:
   - echo "JAVA_OPTS=$JAVA_OPTS"
   - export JRUBY_OPTS="-J-Xms64M -J-Xmx1024M"

src/java/arjdbc/jdbc/RubyJdbcConnection.java

@@ -2904,7 +2904,7 @@ protected String resolveArrayBaseTypeName(final ThreadContext context, final IRu
         final RubySymbol type = (RubySymbol) attributeSQLType(context, attribute);
 
         // For some reason the driver doesn't like "character varying" as a type
-        if ( type.eql(context.runtime.newSymbol("string")) ) return "text";
+        if ( type.eql(context.runtime.newSymbol("string")) ) return "varchar";
 
         final RubyHash nativeTypes = (RubyHash) getAdapter().callMethod(context, "native_database_types");
         // e.g. `integer: { name: 'integer' }`