activerecord-jdbc-adapter 1.3.16 → 1.3.17

data/lib/arjdbc/postgresql/base/pgconn.rb

@@ -0,0 +1,8 @@
+module ActiveRecord::ConnectionAdapters::PostgreSQL::OID
+  class PGconn # emulate PGconn#unescape_bytea due #652
+    # NOTE: on pg gem ... PGconn = (class) PG::Connection
+    def self.unescape_bytea(escaped)
+      ArJdbc::PostgreSQL.unescape_bytea(escaped)
+    end
+  end
+end

data/lib/arjdbc/postgresql/base/schema_definitions.rb

@@ -0,0 +1,131 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module PostgreSQL
+      class ColumnDefinition < ActiveRecord::ConnectionAdapters::ColumnDefinition
+        attr_accessor :array
+        def array?; !!@array; end
+      end
+
+      module ColumnMethods
+        def xml(*args)
+          options = args.extract_options!
+          column(args[0], 'xml', options)
+        end
+
+        def tsvector(*args)
+          options = args.extract_options!
+          column(args[0], 'tsvector', options)
+        end
+
+        def int4range(name, options = {})
+          column(name, 'int4range', options)
+        end
+
+        def int8range(name, options = {})
+          column(name, 'int8range', options)
+        end
+
+        def tsrange(name, options = {})
+          column(name, 'tsrange', options)
+        end
+
+        def tstzrange(name, options = {})
+          column(name, 'tstzrange', options)
+        end
+
+        def numrange(name, options = {})
+          column(name, 'numrange', options)
+        end
+
+        def daterange(name, options = {})
+          column(name, 'daterange', options)
+        end
+
+        def hstore(name, options = {})
+          column(name, 'hstore', options)
+        end
+
+        def ltree(name, options = {})
+          column(name, 'ltree', options)
+        end
+
+        def inet(name, options = {})
+          column(name, 'inet', options)
+        end
+
+        def cidr(name, options = {})
+          column(name, 'cidr', options)
+        end
+
+        def macaddr(name, options = {})
+          column(name, 'macaddr', options)
+        end
+
+        def uuid(name, options = {})
+          column(name, 'uuid', options)
+        end
+
+        def json(name, options = {})
+          column(name, 'json', options)
+        end
+
+        def jsonb(name, options = {})
+          column(name, :jsonb, options)
+        end
+
+        def bit(name, options)
+          column(name, 'bit', options)
+        end
+
+        def bit_varying(name, options)
+          column(name, 'bit varying', options)
+        end
+      end
+
+      class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition
+        include ColumnMethods
+
+        def primary_key(name, type = :primary_key, options = {})
+          return super unless type == :uuid
+          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)
+
+        def column(name, type = nil, options = {})
+          super
+          column = self[name]
+          # NOTE: <= 3.1 no #new_column_definition hard-coded ColumnDef.new :
+          # column = self[name] || ColumnDefinition.new(@base, name, type)
+          # thus we simply do not support array column definitions on <= 3.1
+          column.array = options[:array] if column.is_a?(ColumnDefinition)
+          self
+        end
+
+        private
+
+        if ::ActiveRecord::VERSION::MAJOR > 3
+
+          def create_column_definition(name, type)
+            ColumnDefinition.new name, type
+          end
+
+        else # no #create_column_definition on 3.2
+
+          def new_column_definition(base, name, type)
+            definition = ColumnDefinition.new base, name, type
+            @columns << definition
+            @columns_hash[name] = definition
+            definition
+          end
+
+        end
+
+      end
+
+      class Table < ActiveRecord::ConnectionAdapters::Table
+        include ColumnMethods
+      end
+    end
+  end
+end

data/lib/arjdbc/postgresql/column.rb

@@ -52,6 +52,7 @@ module ArJdbc
     module Column
 
       attr_accessor :array
+      alias array? array
 
       def initialize(name, default, cast_type, sql_type = nil, null = true, default_function = nil,
         oid = nil, adapter = nil) # added arguments
@@ -69,7 +70,7 @@ module ArJdbc
         @default_function = default_function
       end
 
-    end if AR42_COMPAT
+    end if AR42
 
     # @private (AR < 4.2 version) documented above
     module Column
@@ -83,7 +84,7 @@ module ArJdbc
         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.to_s[-2, 2] == '[]' && ArJdbc::PostgreSQL::AR4_COMPAT
+        if sql_type.to_s[-2, 2] == '[]' && AR40
           @array = true if respond_to?(:array)
           super(name, default, sql_type[0..-3], null)
         else
@@ -107,20 +108,20 @@ module ArJdbc
           require 'pg_array_parser'
           base_meta.send :include, PgArrayParser
         rescue LoadError
-          if AR42_COMPAT
+          if AR42
             require 'active_record/connection_adapters/postgresql/array_parser'
           else
             require 'arjdbc/postgresql/base/array_parser'
           end
           base_meta.send :include, ActiveRecord::ConnectionAdapters::PostgreSQL::ArrayParser
-        end if AR4_COMPAT
+        end if AR40
 
         base_meta.send :include, Cast
 
         base.send :include, ColumnHelpers
       end
 
-      if AR4_COMPAT && ! AR42_COMPAT
+      if AR40 && ! AR42
 
       # @private
       def oid_type
@@ -135,10 +136,10 @@ module ArJdbc
 
       end
 
-      ( attr_accessor :array; def array?; array; end ) if AR4_COMPAT
+      ( attr_accessor :array; def array?; array; end ) if AR40
 
-      def number?; !array && super end if AR4_COMPAT
-      def text?; !array && super end if AR4_COMPAT
+      def number?; !array && super end if AR40
+      def text?; !array && super end if AR40
 
       # Extracts the value from a PostgreSQL column default definition.
       #
@@ -286,7 +287,7 @@ module ArJdbc
              super(value)
           end
         end
-      end if AR4_COMPAT
+      end if AR40
 
       private
 
@@ -398,7 +399,7 @@ module ArJdbc
         else
           super
         end
-      end if AR4_COMPAT
+      end if AR40
 
       # OID Type::Range helpers :
 
@@ -409,11 +410,11 @@ module ArJdbc
           :to   => (value[-2] == ',' || t == 'infinity') ? infinity : t,
           :exclude_start => (value[0] == '('), :exclude_end => (value[-1] == ')')
         }
-      end if AR4_COMPAT
+      end if AR40
 
       def infinity(options = {})
         ::Float::INFINITY * (options[:negative] ? -1 : 1)
-      end if AR4_COMPAT
+      end if AR40
 
       private
 
@@ -495,7 +496,7 @@ module ArJdbc
           else
             value # Bit-string notation
           end
-        end if AR4_COMPAT
+        end if AR40
 
         def hstore_to_string(object, array_member = false)
           if Hash === object
@@ -634,6 +635,6 @@ module ArJdbc
 
       end
 
-    end unless AR42_COMPAT
+    end unless AR42
   end
 end

data/lib/arjdbc/postgresql/oid_types.rb

@@ -3,12 +3,18 @@ require 'thread'
 module ArJdbc
   module PostgreSQL
 
-    if AR42_COMPAT
+    if AR42
       require 'active_record/connection_adapters/postgresql/oid'
     else
       require 'arjdbc/postgresql/base/oid'
     end
 
+    require 'arjdbc/postgresql/base/pgconn'
+
+    def self.unescape_bytea(escaped)
+      String.from_java_bytes Java::OrgPostgresqlUtil::PGbytea.toBytes escaped.to_java_bytes
+    end
+
     # @private
     OID = ::ActiveRecord::ConnectionAdapters::PostgreSQL::OID
 
@@ -36,12 +42,18 @@ module ArJdbc
         @extensions ||= super
       end
 
+      # @override
+      def lookup_cast_type(sql_type)
+        oid = execute("SELECT #{quote(sql_type)}::regtype::oid", "SCHEMA")
+        super oid.first['oid'].to_i
+      end if AR42
+
       def get_oid_type(oid, fmod, column_name)
         type_map.fetch(oid, fmod) {
           warn "unknown OID #{oid}: failed to recognize type of '#{column_name}'. It will be treated as String."
           type_map[oid] = OID::Identity.new
         }
-      end unless AR42_COMPAT
+      end unless AR42
 
       def get_oid_type(oid, fmod, column_name, sql_type = '')
         if !type_map.key?(oid)
@@ -54,14 +66,12 @@ module ArJdbc
             type_map.register_type(oid, cast_type)
           end
         }
-      end if AR42_COMPAT
-
-      private
+      end if AR42
 
       @@type_map_cache = {}
       @@type_map_cache_lock = Mutex.new
 
-      if AR42_COMPAT
+      if AR42
         TypeMap = ActiveRecord::Type::HashLookupTypeMap
       else
         TypeMap = OID::TypeMap
@@ -99,6 +109,8 @@ module ArJdbc
         end
       end
 
+      private
+
       def cache_type_map(type_map)
         @@type_map_cache_lock.synchronize do
           @@type_map_cache[ type_cache_key ] = type_map
@@ -148,7 +160,7 @@ module ArJdbc
           array = OID::Array.new  type_map[ row['typelem'].to_i ]
           type_map[ row['oid'].to_i ] = array
         end
-      end unless AR42_COMPAT
+      end unless AR42
 
       def initialize_type_map(m)
         register_class_with_limit m, 'int2', OID::Integer
@@ -219,7 +231,7 @@ module ArJdbc
         end
 
         load_additional_types(m)
-      end if AR42_COMPAT
+      end if AR42
 
       def load_additional_types(type_map, oids = nil)
         if supports_ranges?
@@ -238,8 +250,9 @@ module ArJdbc
         initializer = OID::TypeMapInitializer.new(type_map)
 
         if oids
-          query << "WHERE t.oid::integer IN (%s)" % oids.join(", ")
+          query << ( "WHERE t.oid::integer IN (%s)" % oids.join(", ") )
         else
+          # query_conditions_for_initial_load only available since AR > 4.2.1
           if initializer.respond_to?(:query_conditions_for_initial_load)
             query << initializer.query_conditions_for_initial_load(type_map)
           end
@@ -247,7 +260,7 @@ module ArJdbc
 
         records = execute(query, 'SCHEMA')
         initializer.run(records)
-      end if AR42_COMPAT
+      end if AR42
 
     end
   end

data/lib/arjdbc/postgresql/schema_creation.rb

@@ -1,6 +1,6 @@
 module ArJdbc
   module PostgreSQL
-    # @private copied from native adapter 4.0/4.1
+    # @private copied (and adjusted) from native adapter 4.0/4.1/4.2
     class SchemaCreation < ::ActiveRecord::ConnectionAdapters::AbstractAdapter::SchemaCreation
 
       private
@@ -9,7 +9,7 @@ module ArJdbc
         sql_type = type_to_sql(o.type.to_sym, o.limit, o.precision, o.scale)
         sql = "ADD COLUMN #{quote_column_name(o.name)} #{sql_type}"
         add_column_options!(sql, column_options(o))
-      end
+      end unless AR42
 
       def visit_ColumnDefinition(o)
         sql = super
@@ -18,7 +18,16 @@ module ArJdbc
           add_column_options!(sql, column_options(o))
         end
         sql
-      end
+      end unless AR42
+
+      def visit_ColumnDefinition(o)
+        sql = super
+        if o.primary_key? && o.type != :primary_key
+          sql << " PRIMARY KEY "
+          add_column_options!(sql, column_options(o))
+        end
+        sql
+      end if AR42
 
       def add_column_options!(sql, options)
         if options[:array] || options[:column].try(:array)
@@ -32,6 +41,15 @@ module ArJdbc
           super
         end
       end
+
+      def type_for_column(column)
+        if column.array
+          @conn.lookup_cast_type("#{column.sql_type}[]")
+        else
+          super
+        end
+      end if AR42
+
     end
 
     def schema_creation

data/lib/arjdbc/version.rb

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

data/rakelib/db.rake

@@ -44,7 +44,7 @@ SQL
   private
 
   def sql_script(sql_content, name = 'sql_script')
-    script = Tempfile.new(name)
+    require 'tempfile'; script = Tempfile.new(name)
     script.puts sql_content
     yield(script) if block_given?
     script.close

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

@@ -481,7 +481,7 @@ public class RubyJdbcConnection extends RubyObject {
         return getInstanceVariable("@connection");
     }
 
-    @JRubyMethod(name = "active?")
+    @JRubyMethod(name = "active?", alias = "valid?")
     public IRubyObject active_p(final ThreadContext context) {
         IRubyObject connection = getInstanceVariable("@connection");
         if ( connection != null && ! connection.isNil() ) {
@@ -529,6 +529,36 @@ public class RubyJdbcConnection extends RubyObject {
         }
     }
 
+    @JRubyMethod(name = { "open?" /* "conn?" */ })
+    public IRubyObject open_p(final ThreadContext context) {
+        final Connection connection = getConnection(false);
+        if ( connection == null ) return context.getRuntime().getFalse();
+        try {
+            // NOTE: isClosed method generally cannot be called to determine
+            // whether a connection to a database is valid or invalid ...
+            return context.getRuntime().newBoolean( ! connection.isClosed() );
+        }
+        catch (SQLException e) {
+            return handleException(context, e);
+        }
+    }
+
+    @JRubyMethod(name = "close")
+    public IRubyObject close(final ThreadContext context) {
+        final Connection connection = getConnection(false);
+        if ( connection == null ) return context.getRuntime().getFalse();
+        try {
+            final boolean closed = connection.isClosed();
+            if ( closed ) return context.getRuntime().getFalse();
+            setConnection(null); // does connection.close();
+            return context.getRuntime().getTrue();
+        }
+        catch (Exception e) {
+            debugStackTrace(context, e);
+            return context.getRuntime().getNil();
+        }
+    }
+
     @JRubyMethod(name = "database_name")
     public IRubyObject database_name(final ThreadContext context) throws SQLException {
         final Connection connection = getConnection(true);
@@ -1032,28 +1062,38 @@ public class RubyJdbcConnection extends RubyObject {
         return keyNames;
     }
 
-    @JRubyMethod(name = "tables")
+    @Deprecated //@JRubyMethod(name = "tables")
     public IRubyObject tables(ThreadContext context) {
         return tables(context, null, null, null, TABLE_TYPE);
     }
 
-    @JRubyMethod(name = "tables")
+    @Deprecated //@JRubyMethod(name = "tables")
     public IRubyObject tables(ThreadContext context, IRubyObject catalog) {
         return tables(context, toStringOrNull(catalog), null, null, TABLE_TYPE);
     }
 
-    @JRubyMethod(name = "tables")
+    @Deprecated //@JRubyMethod(name = "tables")
     public IRubyObject tables(ThreadContext context, IRubyObject catalog, IRubyObject schemaPattern) {
         return tables(context, toStringOrNull(catalog), toStringOrNull(schemaPattern), null, TABLE_TYPE);
     }
 
-    @JRubyMethod(name = "tables")
+    @Deprecated //@JRubyMethod(name = "tables")
     public IRubyObject tables(ThreadContext context, IRubyObject catalog, IRubyObject schemaPattern, IRubyObject tablePattern) {
         return tables(context, toStringOrNull(catalog), toStringOrNull(schemaPattern), toStringOrNull(tablePattern), TABLE_TYPE);
     }
 
-    @JRubyMethod(name = "tables", required = 4, rest = true)
-    public IRubyObject tables(ThreadContext context, IRubyObject[] args) {
+    @JRubyMethod(name = "tables", required = 0, optional = 4)
+    public IRubyObject tables(final ThreadContext context, final IRubyObject[] args) {
+        switch ( args.length ) {
+            case 0: // ()
+                return tables(context, null, null, null, TABLE_TYPE);
+            case 1: // (catalog)
+                return tables(context, toStringOrNull(args[0]), null, null, TABLE_TYPE);
+            case 2: // (catalog, schemaPattern)
+                return tables(context, toStringOrNull(args[0]), toStringOrNull(args[1]), null, TABLE_TYPE);
+            case 3: // (catalog, schemaPattern, tablePattern)
+                return tables(context, toStringOrNull(args[0]), toStringOrNull(args[1]), toStringOrNull(args[2]), TABLE_TYPE);
+        }
         return tables(context, toStringOrNull(args[0]), toStringOrNull(args[1]), toStringOrNull(args[2]), getTypes(args[3]));
     }