activerecord-jdbc-adapter 1.3.0.rc1 → 1.3.0

data/lib/arjdbc/db2/column.rb

@@ -79,8 +79,8 @@ module ArJdbc
 
       def simplified_type(field_type)
         case field_type
-        when /^decimal\(1\)$/i   then DB2.emulate_booleans ? :boolean : :integer
-        when /smallint/i         then DB2.emulate_booleans ? :boolean : :integer
+        when /^decimal\(1\)$/i   then DB2.emulate_booleans? ? :boolean : :integer
+        when /smallint/i         then DB2.emulate_booleans? ? :boolean : :integer
         when /boolean/i          then :boolean
         when /^real|double/i     then :float
         when /int|serial/i       then :integer
@@ -156,7 +156,7 @@ module ArJdbc
           return value unless value.is_a?(String)
           return nil if value.empty?
           return Time.now if value.index('CURRENT') == 0
-          
+
           return value
         end
 

data/lib/arjdbc/derby/adapter.rb

@@ -146,6 +146,46 @@ module ArJdbc
       NATIVE_DATABASE_TYPES
     end
 
+    # @override
+    def quote(value, column = nil)
+      return value.quoted_id if value.respond_to?(:quoted_id)
+      return value if sql_literal?(value)
+      return 'NULL' if value.nil?
+
+      column_type = column && column.type
+      if column_type == :string || column_type == :text
+        # Derby is not permissive
+        # e.g. sending an Integer to a VARCHAR column will fail
+        case value
+        when BigDecimal then value = value.to_s('F')
+        when Numeric then value = value.to_s
+        when true, false then value = value.to_s
+        when Date, Time then value = quoted_date(value)
+        else # on 2.3 attribute serialization needs to_yaml here
+          value = value.to_s if ActiveRecord::VERSION::MAJOR >= 3
+        end
+      end
+
+      case value
+      when String, ActiveSupport::Multibyte::Chars
+        if column_type == :text
+          "CAST('#{quote_string(value)}' AS CLOB)"
+        elsif column_type == :binary
+          "CAST(X'#{quote_binary(value)}' AS BLOB)"
+        elsif column_type == :xml
+          "XMLPARSE(DOCUMENT '#{quote_string(value)}' PRESERVE WHITESPACE)"
+        elsif column_type == :integer
+          value.to_i
+        elsif column_type == :float
+          value.to_f
+        else
+          "'#{quote_string(value)}'"
+        end
+      else
+        super
+      end
+    end
+
     # @override
     def quoted_date(value)
       if value.acts_like?(:time) && value.respond_to?(:usec)
@@ -367,6 +407,11 @@ module ArJdbc
       %Q{"#{name.to_s.upcase.gsub('"', '""')}"}
     end
 
+    # @override
+    def quote_table_name_for_assignment(table, attr)
+      quote_column_name(attr)
+    end if ::ActiveRecord::VERSION::MAJOR > 3
+
     # @note Only used with (non-AREL) ActiveRecord **2.3**.
     # @see Arel::Visitors::Derby
     def add_limit_offset!(sql, options)

data/lib/arjdbc/firebird/adapter.rb

@@ -11,18 +11,8 @@ module ArJdbc
     def self.initialize!
       return if @@_initialized; @@_initialized = true
 
-      require 'arjdbc/jdbc/serialized_attributes_helper'
-      ActiveRecord::Base.class_eval do
-        def after_save_with_firebird_blob
-          self.class.columns.select { |c| c.sql_type =~ /blob/i }.each do |column|
-            value = ::ArJdbc::SerializedAttributesHelper.dump_column_value(self, column)
-            next if value.nil?
-
-            self.class.connection.update_lob_value(self, column, value)
-          end
-        end
-      end
-      ActiveRecord::Base.after_save :after_save_with_firebird_blob
+      require 'arjdbc/util/serialized_attributes'
+      Util::SerializedAttributes.setup /blob/i
     end
 
     # @see ActiveRecord::ConnectionAdapters::JdbcColumn#column_types
@@ -33,13 +23,6 @@ module ArJdbc
     # @see ActiveRecord::ConnectionAdapters::JdbcColumn
     module Column
 
-      def simplified_type(field_type)
-        case field_type
-        when /timestamp/i  then :datetime
-        else super
-        end
-      end
-
       def default_value(value)
         return nil unless value
         if value =~ /^\s*DEFAULT\s+(.*)\s*$/i
@@ -47,6 +30,26 @@ module ArJdbc
         end
       end
 
+      private
+
+      def simplified_type(field_type)
+        case field_type
+        when /timestamp/i    then :datetime
+        when /^smallint/i    then :integer
+        when /^bigint|int/i  then :integer
+        when /^double/i      then :float # double precision
+        when /^decimal/i     then
+          extract_scale(field_type) == 0 ? :integer : :decimal
+        when /^char\(1\)$/i  then Firebird.emulate_booleans? ? :boolean : :string
+        when /^char/i        then :string
+        when /^blob\ssub_type\s(\d)/i
+          return :binary if $1 == '0'
+          return :text   if $1 == '1'
+        else
+          super
+        end
+      end
+
     end
 
     # @see ArJdbc::ArelHelper::ClassMethods#arel_visitor_type
@@ -59,14 +62,18 @@ module ArJdbc
       { 'firebird' => arel_visitor_type, 'firebirdsql' => arel_visitor_type }
     end
 
-    # @@emulate_booleans = true
+    # @private
+    @@emulate_booleans = true
 
     # Boolean emulation can be disabled using :
     #
-    #   ArJdbc::FireBird.emulate_booleans = false
+    #   ArJdbc::Firebird.emulate_booleans = false
     #
-    # def self.emulate_booleans; @@emulate_booleans; end
-    # def self.emulate_booleans=(emulate); @@emulate_booleans = emulate; end
+    def self.emulate_booleans?; @@emulate_booleans; end
+    # @deprecated Use {#emulate_booleans?} instead.
+    def self.emulate_booleans; @@emulate_booleans; end
+    # @see #emulate_booleans?
+    def self.emulate_booleans=(emulate); @@emulate_booleans = emulate; end
 
     ADAPTER_NAME = 'Firebird'.freeze
 
@@ -80,25 +87,19 @@ module ArJdbc
       :text => { :name => "blob sub_type text" },
       :integer => { :name => "integer" },
       :float => { :name => "float" },
-      :decimal => { :name => "decimal" },
       :datetime => { :name => "timestamp" },
       :timestamp => { :name => "timestamp" },
       :time => { :name => "time" },
       :date => { :name => "date" },
       :binary => { :name => "blob" },
-      :boolean => { :name => 'smallint' }
+      :boolean => { :name => 'char', :limit => 1 },
+      :numeric => { :name => "numeric" },
+      :decimal => { :name => "decimal" },
+      :char => { :name => "char" },
     }
 
     def native_database_types
-      super.merge(NATIVE_DATABASE_TYPES)
-    end
-
-    def modify_types(types)
-      super(types)
-      NATIVE_DATABASE_TYPES.each do |key, value|
-        types[key] = value.dup
-      end
-      types
+      NATIVE_DATABASE_TYPES
     end
 
     def type_to_sql(type, limit = nil, precision = nil, scale = nil)
@@ -216,6 +217,7 @@ module ArJdbc
     # @override
     def quote(value, column = nil)
       return value.quoted_id if value.respond_to?(:quoted_id)
+      return value if sql_literal?(value)
 
       type = column && column.type
       # BLOBs are updated separately by an after_save trigger.
@@ -231,7 +233,7 @@ module ArJdbc
         else
           "'#{quote_string(value)}'"
         end
-      when NilClass then "NULL"
+      when NilClass then 'NULL'
       when TrueClass then (type == :integer ? '1' : quoted_true)
       when FalseClass then (type == :integer ? '0' : quoted_false)
       when Float, Fixnum, Bignum then value.to_s
@@ -240,7 +242,7 @@ module ArJdbc
       when Symbol then "'#{quote_string(value.to_s)}'"
       else
         if type == :time && value.acts_like?(:time)
-          return "'#{value.strftime("%H:%M:%S")}'"
+          return "'#{get_time(value).strftime("%H:%M:%S")}'"
         end
         if type == :date && value.acts_like?(:date)
           return "'#{value.strftime("%Y-%m-%d")}'"

data/lib/arjdbc/h2/adapter.rb

@@ -204,7 +204,7 @@ module ArJdbc
     # @override
     def explain(arel, binds = [])
       sql = "EXPLAIN #{to_sql(arel, binds)}"
-      raw_result  = execute(sql, "EXPLAIN", binds)
+      raw_result = exec_query_raw(sql, "EXPLAIN", binds)
       raw_result[0].values.join("\n") # [ "SELECT \n ..." ].to_s
     end
 

data/lib/arjdbc/hsqldb/adapter.rb

@@ -110,6 +110,7 @@ module ArJdbc
     # @override
     def quote(value, column = nil)
       return value.quoted_id if value.respond_to?(:quoted_id)
+      return value if sql_literal?(value)
 
       case value
       when String

data/lib/arjdbc/hsqldb/explain_support.rb

@@ -2,14 +2,14 @@ module ArJdbc
   module HSQLDB
     module ExplainSupport
       def supports_explain?; true; end
-      
+
       def explain(arel, binds = [])
         sql = "EXPLAIN PLAN FOR #{to_sql(arel, binds)}"
-        raw_result  = execute(sql, "EXPLAIN", binds)
+        raw_result = exec_query_raw(sql, "EXPLAIN", binds)
         # HSQLDB's SqlTool just prints it as it comes :
-        # 
+        #
         #  sql> EXPLAIN PLAN FOR SELECT * FROM entries JOIN users on ... ;
-        #  
+        #
         # isDistinctSelect=[false]
         # isGrouped=[false]
         # isAggregated=[false]
@@ -27,8 +27,8 @@ module ArJdbc
         # PARAMETERS=[]
         # SUBQUERIES[]
         #
-        rows = raw_result.map { |hash| hash.values }
-        rows.join("\n")
+        raw_result.map!(&:values)
+        raw_result.join("\n")
       end
     end
   end

data/lib/arjdbc/jdbc/adapter.rb

@@ -413,10 +413,13 @@ module ActiveRecord
       # @return [ActiveRecord::Result] or [Array] on **AR-2.3**
       # @override available since **AR-3.1**
       def exec_query(sql, name = 'SQL', binds = [])
+        if sql.respond_to?(:to_sql)
+          sql = to_sql(sql, binds); to_sql = true
+        end
         if prepared_statements?
           log(sql, name, binds) { @connection.execute_query(sql, binds) }
         else
-          sql = suble_binds(sql, binds)
+          sql = suble_binds(sql, binds) unless to_sql # deprecated behavior
           log(sql, name) { @connection.execute_query(sql) }
         end
       end
@@ -427,10 +430,13 @@ module ActiveRecord
       # @param binds the bind parameters
       # @override available since **AR-3.1**
       def exec_insert(sql, name, binds, pk = nil, sequence_name = nil)
+        if sql.respond_to?(:to_sql)
+          sql = to_sql(sql, binds); to_sql = true
+        end
         if prepared_statements?
           log(sql, name || 'SQL', binds) { @connection.execute_insert(sql, binds) }
         else
-          sql = suble_binds sql, binds
+          sql = suble_binds(sql, binds) unless to_sql # deprecated behavior
           log(sql, name || 'SQL') { @connection.execute_insert(sql) }
         end
       end
@@ -441,10 +447,13 @@ module ActiveRecord
       # @param binds the bind parameters
       # @override available since **AR-3.1**
       def exec_delete(sql, name, binds)
+        if sql.respond_to?(:to_sql)
+          sql = to_sql(sql, binds); to_sql = true
+        end
         if prepared_statements?
           log(sql, name || 'SQL', binds) { @connection.execute_delete(sql, binds) }
         else
-          sql = suble_binds sql, binds
+          sql = suble_binds(sql, binds) unless to_sql # deprecated behavior
           log(sql, name || 'SQL') { @connection.execute_delete(sql) }
         end
       end
@@ -455,10 +464,13 @@ module ActiveRecord
       # @param binds the bind parameters
       # @override available since **AR-3.1**
       def exec_update(sql, name, binds)
+        if sql.respond_to?(:to_sql)
+          sql = to_sql(sql, binds); to_sql = true
+        end
         if prepared_statements?
           log(sql, name || 'SQL', binds) { @connection.execute_update(sql, binds) }
         else
-          sql = suble_binds sql, binds
+          sql = suble_binds(sql, binds) unless to_sql # deprecated behavior
           log(sql, name || 'SQL') { @connection.execute_update(sql) }
         end
       end
@@ -474,10 +486,13 @@ module ActiveRecord
       # instead of returning mapped query results in an array.
       # @return [Array] unless a block is given
       def exec_query_raw(sql, name = 'SQL', binds = [], &block)
+        if sql.respond_to?(:to_sql)
+          sql = to_sql(sql, binds); to_sql = true
+        end
         if prepared_statements?
           log(sql, name, binds) { @connection.execute_query_raw(sql, binds, &block) }
         else
-          sql = suble_binds(sql, binds)
+          sql = suble_binds(sql, binds) unless to_sql # deprecated behavior
           log(sql, name) { @connection.execute_query_raw(sql, &block) }
         end
       end
@@ -512,6 +527,7 @@ module ActiveRecord
       # statements that return a result set, while {#exec_query} is expected to
       # return a `ActiveRecord::Result` (since AR 3.1).
       # @note This method does not use prepared statements.
+      # @note The method does not emulate various "native" `execute` results on MRI.
       # @see #exec_query
       # @see #exec_insert
       # @see #exec_update
@@ -578,11 +594,14 @@ module ActiveRecord
         @connection.primary_keys(table)
       end
 
-      # @deprecated use {#update_lob_value} instead
+      # @deprecated Rather use {#update_lob_value} instead.
       def write_large_object(*args)
         @connection.write_large_object(*args)
       end
 
+      # @param record the record e.g. `User.find(1)`
+      # @param column the model's column e.g. `User.columns_hash['photo']`
+      # @param value the lob value - string or (IO or Java) stream
       def update_lob_value(record, column, value)
         @connection.update_lob_value(record, column, value)
       end
@@ -604,22 +623,6 @@ module ActiveRecord
           sql
         end
 
-      else # AR >= 3.1 or 4.0
-
-        # @private
-        def to_sql(arel, binds = [])
-          # NOTE: same on 3.1/3.2 but on 4.0 binds are dup-ed
-          # for us it is intentional to 'consume' (empty) the binds array
-          # due our {#suble_binds} hack (that will be getting deprecated)
-          if arel.respond_to?(:ast)
-            visitor.accept(arel.ast) do
-              quote(*binds.shift.reverse)
-            end
-          else
-            arel
-          end
-        end
-
       end
 
       protected
@@ -713,29 +716,62 @@ module ActiveRecord
       #  @prepared_statements = statements
       #end
 
-      private
-
       def self.prepared_statements?(config)
         config.key?(:prepared_statements) ?
           type_cast_config_to_boolean(config.fetch(:prepared_statements)) :
-            false # off by default
+            false # off by default - NOTE: on AR 4.x it's on by default !?
       end
 
-      def suble_binds(sql, binds)
-        return sql if binds.nil? || binds.empty?
-        copy = binds.dup
-        # TODO deprecate/warn about this behavior !
-        sql.gsub('?') { quote(*copy.shift.reverse) }
+      if @@suble_binds = Java::JavaLang::System.getProperty('arjdbc.adapter.suble_binds')
+        @@suble_binds = Java::JavaLang::Boolean.parseBoolean(@@suble_binds)
+      else
+        @@suble_binds = ActiveRecord::VERSION::MAJOR < 4 # due compatibility
       end
+      def self.suble_binds?; @@suble_binds; end
+      def self.suble_binds=(flag); @@suble_binds = flag; end
 
-      # @deprecated Replaced with {#suble_binds}.
+      private
+
+      # @note Since AR 4.0 we (finally) do not "sub" SQL's '?' parameters !
+      # @deprecated This should go away (hopefully), now here due 1.2.x.
+      def suble_binds(sql, binds)
+        return sql if ! @@suble_binds || binds.nil? || binds.empty?
+        binds = binds.dup; warn = nil
+        result = sql.gsub('?') { warn = true; quote(*binds.shift.reverse) }
+        ActiveSupport::Deprecation.warn(
+          "string binds substitution is deprecated - please refactor your sql", caller[1..-1]
+        ) if warn
+        result
+      end
+
+      # @private Supporting "string-subling" on AR 4.0 would require {#to_sql}
+      # to consume binds parameters otherwise it happens twice e.g. for a record
+      # insert it is called during {#insert} as well as on {#exec_insert} ...
+      # but that than leads to other issues with libraries that save the binds
+      # array and run a query again since it's the very same instance on 4.0 !
+      def suble_binds(sql, binds)
+        sql
+      end if ActiveRecord::VERSION::MAJOR > 3
+
+      # @deprecated No longer used, will be removed.
+      # @see #suble_binds
       def substitute_binds(sql, binds)
-        suble_binds(extract_sql(sql), binds)
+        return sql if binds.nil? || binds.empty?; binds = binds.dup
+        extract_sql(sql).gsub('?') { quote(*binds.shift.reverse) }
       end
 
-      # @deprecated No longer used, only kept for 1.2 API compatibility.
-      def extract_sql(obj)
-        obj.respond_to?(:to_sql) ? obj.send(:to_sql) : obj
+      # @deprecated No longer used, kept for 1.2 API compatibility.
+      def extract_sql(arel)
+        arel.respond_to?(:to_sql) ? arel.send(:to_sql) : arel
+      end
+
+      if ActiveRecord::VERSION::MAJOR > 2
+        # Helper useful during {#quote} since AREL might pass in it's literals
+        # to be quoted, fixed since AREL 4.0.0.beta1 : http://git.io/7gyTig
+        def sql_literal?(value); ::Arel::Nodes::SqlLiteral === value; end
+      else
+        # @private
+        def sql_literal?(value); false; end
       end
 
       # Helper to get local/UTC time (based on `ActiveRecord::Base.default_timezone`).
@@ -769,11 +805,11 @@ module ActiveRecord
           config =~ /\A\d+\z/ ? config.to_i : config
         end
 
-        # @private
-        def self.type_cast_config_to_boolean(config)
-          config == "false" ? false : config
-        end
+      end
 
+      # @private
+      def self.type_cast_config_to_boolean(config)
+        config == 'false' ? false : (config == 'true' ? true : config)
       end
 
       public
@@ -796,6 +832,11 @@ module ActiveRecord
         jdbc_column_class.string_to_time(value)
       end
 
+      if ActiveRecord::VERSION::MAJOR < 4 # emulating Rails 3.x compatibility
+        JdbcConnection.raw_date_time = true if JdbcConnection.raw_date_time? == nil
+        JdbcConnection.raw_boolean = true if JdbcConnection.raw_boolean? == nil
+      end
+
     end
   end
 end