Merge branch '51-stable' into 52-stable

Author: enebo

lib/arjdbc/postgresql/oid_types.rb

@@ -9,6 +9,61 @@ module PostgreSQL
     # @private
     OID = ::ActiveRecord::ConnectionAdapters::PostgreSQL::OID
 
+    # this version makes sure to register the types by name as well
+    # we still need to version with OID since it's used from SchemaStatements as well
+    class ArjdbcTypeMapInitializer < OID::TypeMapInitializer
+      private
+
+      def name_with_ns(row)
+        if row['in_ns']
+          row['typname']
+        else
+          %Q("#{row['nspname']}"."#{row['typname']}")
+        end
+      end
+
+      def register_enum_type(row)
+        super
+        register name_with_ns(row), OID::Enum.new
+      end
+
+      def register_array_type(row)
+        super
+        register_with_subtype(name_with_ns(row), row['typelem'].to_i) do |subtype|
+          OID::Array.new(subtype, row['typdelim'])
+        end
+      end
+
+      def register_range_type(row)
+        super
+        name = name_with_ns(row)
+        register_with_subtype(name, row['rngsubtype'].to_i) do |subtype|
+          OID::Range.new(subtype, name.to_sym)
+        end
+      end
+
+      def register_domain_type(row)
+        if base_type = @store.lookup(row['typbasetype'].to_i)
+          register row['oid'], base_type
+          register name_with_ns(row), base_type
+        else
+          warn "unknown base type (OID: #{row['typbasetype']}) for domain #{row['typname']}."
+        end
+      end
+
+      def register_composite_type(row)
+        if subtype = @store.lookup(row['typelem'].to_i)
+          register row['oid'], OID::Vector.new(row['typdelim'], subtype)
+          register name_with_ns(row), OID::Vector.new(row['typdelim'], subtype)
+        end
+      end
+
+      def assert_valid_registration(oid, oid_type)
+        ret = super
+        ret == 0 ? oid : ret
+      end
+    end
+
     # @private
     module OIDTypes
 
@@ -126,27 +181,46 @@ def initialize_type_map(m = type_map)
           end
         end
 
-        load_additional_types
+        load_additional_types(m)
+
+        # pgjdbc returns these if the column is auto-incrmenting
+        m.alias_type 'serial', 'int4'
+        m.alias_type 'bigserial', 'int8'
       end
 
-      def load_additional_types(oids = nil) # :nodoc:
-        initializer = OID::TypeMapInitializer.new(type_map)
+      def load_additional_types(type_map, oid = nil) # :nodoc:
+        initializer = ArjdbcTypeMapInitializer.new(type_map)
 
         if supports_ranges?
           query = <<-SQL
-              SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, r.rngsubtype, t.typtype, t.typbasetype
+              SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, r.rngsubtype, t.typtype, t.typbasetype,
+                ns.nspname, ns.nspname = ANY(current_schemas(true)) in_ns
               FROM pg_type as t
               LEFT JOIN pg_range as r ON oid = rngtypid
+              JOIN pg_namespace AS ns ON t.typnamespace = ns.oid
           SQL
         else
           query = <<-SQL
-              SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, t.typtype, t.typbasetype
+              SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, t.typtype, t.typbasetype,
+                ns.nspname, ns.nspname = ANY(current_schemas(true)) in_ns
               FROM pg_type as t
+              JOIN pg_namespace AS ns ON t.typnamespace = ns.oid
           SQL
         end
 
-        if oids
-          query += "WHERE t.oid::integer IN (%s)" % oids.join(", ")
+        if oid
+          if oid.is_a? Numeric || oid.match(/^\d+$/)
+            # numeric OID
+            query += "WHERE t.oid::integer = %s" % oid
+
+          elsif m = oid.match(/"?(\w+)"?\."?(\w+)"?/)
+            # namespace and type name
+            query += "WHERE ns.nspname = '%s' AND t.typname = '%s'" % [m[1], m[2]]
+
+          else
+            # only type name
+            query += "WHERE t.typname = '%s' AND ns.nspname = ANY(current_schemas(true))" % oid
+          end
         else
           query += initializer.query_conditions_for_initial_load
         end

src/java/arjdbc/jdbc/RubyJdbcConnection.java

@@ -128,6 +128,7 @@ public class RubyJdbcConnection extends RubyObject {
     private boolean lazy = false; // final once set on initialize
     private boolean jndi; // final once set on initialize
     private boolean configureConnection = true; // final once initialized
+    private int fetchSize = 0; // 0 = JDBC default
 
     protected RubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
@@ -571,6 +572,11 @@ protected void doInitialize(final ThreadContext context, final IRubyObject confi
         else {
             this.configureConnection = value != context.runtime.getFalse();
         }
+
+        IRubyObject jdbcFetchSize = getConfigValue(context, "jdbc_fetch_size");
+        if (jdbcFetchSize != context.nil) {
+            this.fetchSize = RubyNumeric.fix2int(jdbcFetchSize);
+        }
     }
 
     @JRubyMethod(name = "adapter")
@@ -818,6 +824,7 @@ public IRubyObject call(final Connection connection) throws SQLException {
                             // is called, so we have to process the result sets as we get them
                             // this shouldn't be an issue in most cases since we're only getting 1 result set anyways
                             result = mapExecuteResult(context, connection, resultSet);
+                            resultSet.close();
                         } else {
                             result = context.runtime.newFixnum(updateCount);
                         }
@@ -851,6 +858,7 @@ protected Statement createStatement(final ThreadContext context, final Connectio
         else {
             statement.setEscapeProcessing(escapeProcessing.isTrue());
         }
+        if (fetchSize != 0) statement.setFetchSize(fetchSize);
         return statement;
     }
 
@@ -1045,6 +1053,7 @@ public IRubyObject call(final Connection connection) throws SQLException {
                     else {
                         final PreparedStatement prepStatement;
                         statement = prepStatement = connection.prepareStatement(query);
+                        if (fetchSize != 0) statement.setFetchSize(fetchSize);
                         statement.setMaxRows(maxRows); // zero means there is no limit
                         setStatementParameters(context, connection, prepStatement, binds);
                         hasResult = prepStatement.execute();
@@ -1123,7 +1132,9 @@ public IRubyObject prepare_statement(final ThreadContext context, final IRubyObj
         return withConnection(context, new Callable<IRubyObject>() {
             public IRubyObject call(Connection connection) throws SQLException {
                 final String query = sql.convertToString().getUnicodeValue();
-                return JavaUtil.convertJavaToRuby(context.runtime, connection.prepareStatement(query));
+                PreparedStatement statement = connection.prepareStatement(query);
+                if (fetchSize != 0) statement.setFetchSize(fetchSize);
+                return JavaUtil.convertJavaToRuby(context.runtime, statement);
             }
         });
     }
@@ -1158,19 +1169,15 @@ public IRubyObject call(final Connection connection) throws SQLException {
                         statement = (PreparedStatement) JavaEmbedUtils.rubyToJava(cachedStatement);
                     } else {
                         statement = connection.prepareStatement(query);
+                        if (fetchSize != 0) statement.setFetchSize(fetchSize);
                     }
 
                     setStatementParameters(context, connection, statement, (RubyArray) binds);
 
                     if (statement.execute()) {
                         ResultSet resultSet = statement.getResultSet();
                         IRubyObject results = mapQueryResult(context, connection, resultSet);
-
-                        if (cached) {
-                            // Make sure we free the result set if we are caching the statement
-                            // It gets closed automatically when the statement is closed if we aren't caching
-                            resultSet.close();
-                        }
+                        resultSet.close();
 
                         return results;
                     } else {
@@ -2501,6 +2508,8 @@ protected IRubyObject arrayToRuby(final ThreadContext context,
             while ( arrayResult.next() ) {
                 array.append( jdbcToRuby(context, runtime, 2, baseType, arrayResult) );
             }
+            arrayResult.close();
+
             return array;
         }
         finally { if ( value != null ) value.free(); }

src/java/arjdbc/postgresql/PgResultSetMetaDataWrapper.java

@@ -4,6 +4,7 @@
 import arjdbc.jdbc.RubyJdbcConnection;
 
 import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Types;
 
@@ -22,10 +23,6 @@
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
-import org.postgresql.core.Field;
-import org.postgresql.jdbc.PgResultSetMetaData;
-import org.postgresql.jdbc.PgResultSetMetaDataWrapper; // This is a hack unfortunately to get around method scoping
-
 /*
  * This class mimics the PG::Result class enough to get by.  It also adorns common methods useful for
  * gems like mini_sql to consume it similarly to PG::Result
@@ -34,7 +31,7 @@ public class PostgreSQLResult extends JdbcResult {
     private RubyArray fields = null; // lazily created if PG fields method is called.
 
     // These are needed when generating an AR::Result
-    private final PgResultSetMetaData resultSetMetaData;
+    private final ResultSetMetaData resultSetMetaData;
 
     /********* JRuby compat methods ***********/
 
@@ -64,7 +61,7 @@ private PostgreSQLResult(ThreadContext context, RubyClass clazz, RubyJdbcConnect
                              ResultSet resultSet) throws SQLException {
         super(context, clazz, connection, resultSet);
 
-        resultSetMetaData = (PgResultSetMetaData) resultSet.getMetaData();
+        resultSetMetaData = resultSet.getMetaData();
     }
 
     /**
@@ -77,16 +74,28 @@ private PostgreSQLResult(ThreadContext context, RubyClass clazz, RubyJdbcConnect
     protected IRubyObject columnTypeMap(final ThreadContext context) throws SQLException {
         Ruby runtime = context.runtime;
         RubyHash types = RubyHash.newHash(runtime);
-        PgResultSetMetaDataWrapper mdWrapper = new PgResultSetMetaDataWrapper(resultSetMetaData);
         int columnCount = columnNames.length;
 
         IRubyObject adapter = connection.adapter(context);
         for (int i = 0; i < columnCount; i++) {
-            final Field field = mdWrapper.getField(i + 1);
+            int col = i + 1;
+            String typeName = resultSetMetaData.getColumnTypeName(col);
+
+            int mod = 0;
+            if  ("numeric".equals(typeName)) {
+                // this field is only relevant for "numeric" type in AR
+                // AR checks (fmod - 4 & 0xffff).zero?
+                // pgjdbc:
+                //  - for typmod == -1, getScale() and getPrecision() return 0
+                //  - for typmod != -1, getScale() returns "(typmod - 4) & 0xFFFF;"
+                mod = resultSetMetaData.getScale(col);
+                mod = mod == 0 && resultSetMetaData.getPrecision(col) == 0 ? -1 : mod + 4;
+            }
+
             final RubyString name = columnNames[i];
             final IRubyObject type = Helpers.invoke(context, adapter, "get_oid_type",
-                    runtime.newFixnum(field.getOID()),
-                    runtime.newFixnum(field.getMod()),
+                    runtime.newString(typeName),
+                    runtime.newFixnum(mod),
                     name);
 
             if (!type.isNil()) types.fastASet(name, type);

src/java/arjdbc/postgresql/PostgreSQLResult.java

@@ -62,6 +62,7 @@ connections:
       driver: <%= 'org.mariadb.jdbc.Driver' %>
       <% end %>
       <% if defined? JRUBY_VERSION %>
+      jdbc_fetch_size: 100
       properties:
         serverTimezone: <%= java.util.TimeZone.getDefault.getID %>
       <% end %>
@@ -80,6 +81,7 @@ connections:
       prepared_statements: <%= ENV['PREPARED_STATEMENTS'] || ENV['PS'] %> # should leave it off to its default if not set
       <% end %>
       username: <%= ENV['PGUSER'] || ENV['user'] || 'rails' %>
+      jdbc_fetch_size: 100
       properties:
         # Postgres' JDBC driver does not prepare statements until executed 5 times by default, let's lower:
         prepareThreshold: <%= ENV['PREPARE_THRESHOLD'] || 1 %>
@@ -99,9 +101,11 @@ connections:
     arunit:
       database: <%= FIXTURES_ROOT %>/fixture_database.sqlite3
       timeout:  5000
+      jdbc_fetch_size: 100
     arunit2:
       database: <%= FIXTURES_ROOT %>/fixture_database_2.sqlite3
       timeout:  5000
+      jdbc_fetch_size: 100
 
   sqlite3_mem:
     arunit:

test/rails/config.yml

@@ -0,0 +1,2 @@
+exclude :test_some_time, 'intermittent failures, leaks thread, fires at high frequency'
+exclude :test_connection_pool_starts_reaper, 'intermittent failures, leaks thread, fires at high frequency'

test/rails/excludes/mysql2/ActiveRecord/ConnectionAdapters/ReaperTest.rb

@@ -3,4 +3,6 @@
   exclude :test_exec_typecasts_bind_vals, 'it uses $1 for parameter mapping which is not currently supported'
 end
 
+exclude :test_only_warn_on_first_encounter_of_unrecognized_oid, 'expects warning with OID, ARJBC has name instead'
+exclude :test_only_warn_on_first_encounter_of_unknown_oid, 'expects warning with OID, ARJBC has name instead'
 exclude :test_default_sequence_name_bad_table, "ARJDBC does more quoting (which is not wrong)"

test/rails/excludes/postgresql/ActiveRecord/ConnectionAdapters/PostgreSQLAdapterTest.rb

@@ -0,0 +1,2 @@
+exclude :test_some_time, 'intermittent failures, leaks thread, fires at high frequency'
+exclude :test_connection_pool_starts_reaper, 'intermittent failures, leaks thread, fires at high frequency'

test/rails/excludes/postgresql/ActiveRecord/ConnectionAdapters/ReaperTest.rb

@@ -1 +1,2 @@
-exclude :test_connection_pool_starts_reaper, "Hangs due to threading code in test"
+exclude :test_some_time, 'intermittent failures, leaks thread, fires at high frequency'
+exclude :test_connection_pool_starts_reaper, 'intermittent failures, leaks thread, fires at high frequency'