activerecord-jdbc-adapter 1.3.0.rc1 → 1.3.0

data/lib/arjdbc/jdbc/serialized_attributes_helper.rb

@@ -1,21 +1,3 @@
-module ArJdbc
-  module SerializedAttributesHelper
-
-    def self.dump_column_value(record, column)
-      value = record[ name = column.name.to_s ]
-      if record.class.respond_to?(:serialized_attributes)
-        if coder = record.class.serialized_attributes[name]
-          value = coder.respond_to?(:dump) ? coder.dump(value) : value.to_yaml
-        end
-      else
-        if record.respond_to?(:unserializable_attribute?)
-          value = value.to_yaml if record.unserializable_attribute?(name, column)
-        else
-          value = value.to_yaml if value.is_a?(Hash)
-        end
-      end
-      value
-    end
-    
-  end
-end
+# @deprecated
+warn "DEPRECATED: require 'arjdbc/util/serialized_attributes' instead of 'arjdbc/jdbc/serialized_attributes_helper'"
+require 'arjdbc/util/serialized_attributes'

data/lib/arjdbc/mssql/adapter.rb

@@ -29,18 +29,31 @@ 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_mssql_lob
-          self.class.columns.select { |c| c.sql_type =~ /image/i }.each do |column|
-            value = ::ArJdbc::SerializedAttributesHelper.dump_column_value(self, column)
-            next if value.nil? || (value == '')
-
-            self.class.connection.update_lob_value(self, column, value)
-          end
-        end
-      end
-      ActiveRecord::Base.after_save :after_save_with_mssql_lob
+      require 'arjdbc/util/serialized_attributes'
+      Util::SerializedAttributes.setup /image/i, 'after_save_with_mssql_lob'
+    end
+
+    # @private
+    @@update_lob_values = true
+
+    # Updating records with LOB values (binary/text columns) in a separate
+    # statement can be disabled using :
+    #
+    #   ArJdbc::MSSQL.update_lob_values = false
+    #
+    # @note This only applies when prepared statements are not used.
+    def self.update_lob_values?; @@update_lob_values; end
+    # @see #update_lob_values?
+    def self.update_lob_values=(update); @@update_lob_values = update; end
+
+    # @see #quote
+    # @private
+    BLOB_VALUE_MARKER = "''"
+
+    # @see #update_lob_values?
+    # @see ArJdbc::Util::SerializedAttributes#update_lob_columns
+    def update_lob_value?(value, column = nil)
+      MSSQL.update_lob_values? && ! prepared_statements? # && value
     end
 
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_connection_class
@@ -131,15 +144,19 @@ 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
       # SQL Server 2000 doesn't let you insert an integer into a NVARCHAR
-      # column, so we include Integer here.
       when String, ActiveSupport::Multibyte::Chars, Integer
         value = value.to_s
         column_type = column && column.type
         if column_type == :binary
-          "'#{quote_string(column.class.string_to_binary(value))}'" # ' (for ruby-mode)
+          if update_lob_value?(value, column)
+            BLOB_VALUE_MARKER
+          else
+            "'#{quote_string(column.class.string_to_binary(value))}'" # ' (for ruby-mode)
+          end
         elsif column_type == :integer
           value.to_i.to_s
         elsif column_type == :float
@@ -520,22 +537,28 @@ module ArJdbc
     def exec_query(sql, name = 'SQL', binds = [])
       # NOTE: we allow to execute SQL as requested returning a results.
       # e.g. this allows to use SQLServer's EXEC with a result set ...
-      sql = repair_special_columns to_sql(sql, binds)
+      if sql.respond_to?(:to_sql)
+        sql = to_sql(sql, binds); to_sql = true
+      end
+      sql = repair_special_columns(sql)
       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
 
     # @override
     def exec_query_raw(sql, name = 'SQL', binds = [], &block)
-      sql = repair_special_columns to_sql(sql, binds)
+      if sql.respond_to?(:to_sql)
+        sql = to_sql(sql, binds); to_sql = true
+      end
+      sql = repair_special_columns(sql)
       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

data/lib/arjdbc/mssql/column.rb

@@ -140,11 +140,7 @@ module ArJdbc
           return value unless value.is_a?(String)
           return nil if value.empty?
 
-          fast_string_to_time(value) ||
-            begin
-              DateTime.parse(value).to_time
-            rescue nil
-            end
+          fast_string_to_time(value) || DateTime.parse(value).to_time rescue nil
         end
 
         ISO_TIME = /\A(\d\d)\:(\d\d)\:(\d\d)(\.\d+)?\z/
@@ -160,12 +156,11 @@ module ArJdbc
             super(value)
           end
         end
-
-        # @private
+        
         def string_to_binary(value)
           # this will only allow the adapter to insert binary data with a length
           # of 7K or less because of a SQL Server statement length policy ...
-          '' # "0x#{value.unpack("H*")[0]}"
+          "0x#{value.unpack("H*")}" # "0x#{value.unpack("H*")[0]}"
         end
 
         def binary_to_string(value)

data/lib/arjdbc/mssql/explain_support.rb

@@ -10,7 +10,7 @@ module ArJdbc
 
       def explain(arel, binds = [])
         return if DISABLED
-        sql = to_sql(arel)
+        sql = to_sql(arel, binds)
         result = with_showplan_on { exec_query(sql, 'EXPLAIN', binds) }
         PrinterTable.new(result).pp
       end

data/lib/arjdbc/mysql/adapter.rb

@@ -75,7 +75,10 @@ module ArJdbc
     #   ArJdbc::MySQL.emulate_booleans = false
     #
     # @see ActiveRecord::ConnectionAdapters::MysqlAdapter#emulate_booleans
+    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
 
     NATIVE_DATABASE_TYPES = {
@@ -141,6 +144,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)
       return value.to_s if column && column.type == :primary_key
 
       if value.kind_of?(String) && column && column.type == :binary && column.class.respond_to?(:string_to_binary)
@@ -320,15 +324,17 @@ module ArJdbc
       indexes
     end
 
+    # Returns an array of `Column` objects for the table specified.
     # @override
     def columns(table_name, name = nil)
-      sql = "SHOW FIELDS FROM #{quote_table_name(table_name)}"
+      sql = "SHOW FULL COLUMNS FROM #{quote_table_name(table_name)}"
       column = ::ActiveRecord::ConnectionAdapters::MysqlAdapter::Column
-      result = execute(sql, name || 'SCHEMA')
-      result.map! do |field|
-        column.new(field["Field"], field["Default"], field["Type"], field["Null"] == "YES")
+      columns = execute(sql, name || 'SCHEMA')
+      columns.map! do |field|
+        column.new(field['Field'], field['Default'], field['Type'],
+          field['Null'] == "YES", field['Collation'], field['Extra'])
       end
-      result
+      columns
     end
 
     # @private
@@ -591,17 +597,21 @@ module ActiveRecord
       # ```
       #   ActiveRecord::ConnectionAdapters::Mysql[2]Adapter.emulate_booleans = false
       # ```
-      def self.emulate_booleans; ::ArJdbc::MySQL.emulate_booleans; end
+      def self.emulate_booleans?; ::ArJdbc::MySQL.emulate_booleans?; end
+      def self.emulate_booleans;  ::ArJdbc::MySQL.emulate_booleans?; end # native adapter
       def self.emulate_booleans=(emulate); ::ArJdbc::MySQL.emulate_booleans = emulate; end
 
       class Column < JdbcColumn
         include ::ArJdbc::MySQL::Column
 
-        def initialize(name, *args)
+        attr_reader :collation, :strict, :extra
+
+        def initialize(name, default, sql_type = nil, null = true, collation = nil, strict = false, extra = "")
           if Hash === name
-            super
+            super # first arg: config
           else
-            super(nil, name, *args)
+            @strict = strict; @collation = collation; @extra = extra
+            super(name, default, sql_type, null)
           end
         end
 

data/lib/arjdbc/mysql/column.rb

@@ -30,7 +30,7 @@ module ArJdbc
       end
 
       def simplified_type(field_type)
-        if adapter.respond_to?(:emulate_booleans) && adapter.emulate_booleans
+        if adapter && adapter.emulate_booleans?
           return :boolean if field_type.downcase.index('tinyint(1)')
         end
 

data/lib/arjdbc/mysql/connection_methods.rb

@@ -6,6 +6,7 @@ ArJdbc::ConnectionMethods.module_eval do
     rescue LoadError # assuming driver.jar is on the class-path
     end
 
+    config[:username] = 'root' unless config.key?(:username)
     config[:port] ||= 3306
     config[:url] ||= "jdbc:mysql://#{config[:host]}:#{config[:port]}/#{config[:database]}"
     config[:driver] ||= defined?(::Jdbc::MySQL.driver_name) ? ::Jdbc::MySQL.driver_name : 'com.mysql.jdbc.Driver'

data/lib/arjdbc/mysql/explain_support.rb

@@ -13,7 +13,8 @@ module ::ArJdbc
         ExplainPrettyPrinter.new.pp result, elapsed
       end
 
-      class ExplainPrettyPrinter # :nodoc:
+      # @private
+      class ExplainPrettyPrinter
         # Pretty prints the result of a EXPLAIN in a way that resembles the output of the
         # MySQL shell:
         #

data/lib/arjdbc/oracle/adapter.rb

@@ -15,18 +15,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_oracle_lob
-          self.class.columns.select { |c| c.sql_type =~ /LOB\(|LOB$/i }.each do |column|
-            value = ::ArJdbc::SerializedAttributesHelper.dump_column_value(self, column)
-            next if value.nil? || (value == '')
-
-            self.class.connection.update_lob_value(self, column, value)
-          end
-        end
-      end
-      ActiveRecord::Base.after_save :after_save_with_oracle_lob
+      require 'arjdbc/util/serialized_attributes'
+      Util::SerializedAttributes.setup /LOB\(|LOB$/i, 'after_save_with_oracle_lob'
 
       unless ActiveRecord::ConnectionAdapters::AbstractAdapter.
           instance_methods(false).detect { |m| m.to_s == "prefetch_primary_key?" }
@@ -45,6 +35,25 @@ module ArJdbc
       ::ActiveRecord::ConnectionAdapters::OracleColumn
     end
 
+    # @private
+    @@update_lob_values = true
+
+    # Updating records with LOB values (binary/text columns) in a separate
+    # statement can be disabled using :
+    #
+    #   ArJdbc::Oracle.update_lob_values = false
+    #
+    # @note This only applies when prepared statements are not used.
+    def self.update_lob_values?; @@update_lob_values; end
+    # @see #update_lob_values?
+    def self.update_lob_values=(update); @@update_lob_values = update; end
+
+    # @see #update_lob_values?
+    # @see ArJdbc::Util::SerializedAttributes#update_lob_columns
+    def update_lob_value?(value, column = nil)
+      Oracle.update_lob_values? && ! prepared_statements? && ! ( value.nil? || value == '' )
+    end
+
     # @private
     @@emulate_booleans = true
 
@@ -53,7 +62,10 @@ module ArJdbc
     #   ArJdbc::Oracle.emulate_booleans = false
     #
     # @see ActiveRecord::ConnectionAdapters::OracleAdapter#emulate_booleans
+    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
 
     class TableDefinition < ::ActiveRecord::ConnectionAdapters::TableDefinition
@@ -161,8 +173,11 @@ module ArJdbc
 
     # @override
     def drop_table(name, options = {})
-      super(name)
-      seq_name = options[:sequence_name] || default_sequence_name(name)
+      outcome = super(name)
+      return outcome if name == 'schema_migrations'
+      seq_name = options.key?(:sequence_name) ? # pass nil/false - no sequence
+        options[:sequence_name] : default_sequence_name(name)
+      return outcome unless seq_name
       execute "DROP SEQUENCE #{quote_table_name(seq_name)}" rescue nil
     end
 
@@ -191,11 +206,6 @@ module ArJdbc
       end
     end
 
-    def sql_literal?(value)
-      defined?(::Arel::SqlLiteral) && ::Arel::SqlLiteral === value
-    end
-    private :sql_literal?
-
     def indexes(table, name = nil)
       @connection.indexes(table, name, @connection.connection.meta_data.user_name)
     end
@@ -380,14 +390,19 @@ module ArJdbc
 
     # @override
     def quote(value, column = nil)
-      return value if sql_literal?(value) # Arel 2 passes SqlLiterals through
+      return value if sql_literal?(value)
 
       column_type = column && column.type
       if column_type == :text || column_type == :binary
-        if /(.*?)\([0-9]+\)/ =~ column.sql_type
-          %Q{empty_#{ $1.downcase }()}
+        return 'NULL' if value.nil? || value == ''
+        if update_lob_value?(value, column)
+          if /(.*?)\([0-9]+\)/ =~ ( sql_type = column.sql_type )
+            %Q{empty_#{ $1.downcase }()}
+          else
+            %Q{empty_#{ sql_type.respond_to?(:downcase) ? sql_type.downcase : 'blob' }()}
+          end
         else
-          %Q{empty_#{ column.sql_type.downcase rescue 'blob' }()}
+          "'#{quote_string(value.to_s)}'"
         end
       elsif column_type == :xml
         "XMLTYPE('#{quote_string(value)}')" # XMLTYPE ?
@@ -462,9 +477,9 @@ module ArJdbc
     end
 
     def explain(arel, binds = [])
-      sql = "EXPLAIN PLAN FOR #{to_sql(arel)}"
+      sql = "EXPLAIN PLAN FOR #{to_sql(arel, binds)}"
       return if sql =~ /FROM all_/
-      execute(sql, 'EXPLAIN', binds)
+      exec_update(sql, 'EXPLAIN', binds)
       select_values("SELECT * FROM TABLE(DBMS_XPLAN.DISPLAY)", 'EXPLAIN').join("\n")
     end
 
@@ -611,7 +626,8 @@ module ActiveRecord::ConnectionAdapters
     #
     #   ActiveRecord::ConnectionAdapters::OracleAdapter.emulate_booleans = false
     #
-    def self.emulate_booleans; ::ArJdbc::Oracle.emulate_booleans; end
+    def self.emulate_booleans?; ::ArJdbc::Oracle.emulate_booleans?; end
+    def self.emulate_booleans;  ::ArJdbc::Oracle.emulate_booleans?; end # oracle-enhanced
     def self.emulate_booleans=(emulate); ::ArJdbc::Oracle.emulate_booleans = emulate; end
 
     def initialize(*args)

data/lib/arjdbc/oracle/column.rb

@@ -55,7 +55,7 @@ module ArJdbc
         when /char/i            then :string
         when /float|double/i    then :float
         when /int/i             then :integer
-        when /^number\(1\)$/i   then Oracle.emulate_booleans ? :boolean : :integer
+        when /^number\(1\)$/i   then Oracle.emulate_booleans? ? :boolean : :integer
         when /^num|dec|real/i   then extract_scale(field_type) == 0 ? :integer : :decimal
         # Oracle TIMESTAMP stores the date and time to up to 9 digits of sub-second precision
         when /TIMESTAMP/i       then :timestamp

data/lib/arjdbc/postgresql/adapter.rb

@@ -379,7 +379,8 @@ module ArJdbc
     def extension_enabled?(name)
       if supports_extensions?
         rows = select_rows("SELECT EXISTS(SELECT * FROM pg_available_extensions WHERE name = '#{name}' AND installed_version IS NOT NULL)", 'SCHEMA')
-        rows.first.first
+        available = rows.first.first # true/false or 't'/'f'
+        available == true || available == 't'
       end
     end
 
@@ -635,7 +636,11 @@ module ArJdbc
 
     def last_insert_id(table, sequence_name = nil)
       sequence_name = table if sequence_name.nil? # AR-4.0 1 argument
-      Integer(select_value("SELECT currval('#{sequence_name}')", 'SQL'))
+      last_insert_id_result(sequence_name)
+    end
+
+    def last_insert_id_result(sequence_name)
+      select_value("SELECT currval('#{sequence_name}')", 'SQL')
     end
 
     def recreate_database(name, options = {})
@@ -792,6 +797,7 @@ module ArJdbc
     # @override
     def quote(value, column = nil)
       return super unless column
+      return value if sql_literal?(value)
 
       case value
       when Float
@@ -1085,13 +1091,16 @@ module ArJdbc
 
       binds = [[ nil, table.gsub(/(^"|"$)/,'') ]]
       binds << [ nil, schema ] if schema
-
-      exec_query_raw(<<-SQL, 'SCHEMA', binds).first["table_count"] > 0
+      sql = <<-SQL
         SELECT COUNT(*) as table_count
         FROM pg_tables
         WHERE tablename = ?
         AND schemaname = #{schema ? "?" : "ANY (current_schemas(false))"}
       SQL
+
+      log(sql, 'SCHEMA', binds) do
+        @connection.execute_query_raw(sql, binds).first["table_count"] > 0
+      end
     end
 
     # @private

data/lib/arjdbc/sqlite3/adapter.rb

@@ -209,6 +209,8 @@ module ArJdbc
 
     # @override
     def quote(value, column = nil)
+      return value if sql_literal?(value)
+      
       if value.kind_of?(String)
         column_type = column && column.type
         if column_type == :binary && column.class.respond_to?(:string_to_binary)