activerecord-jdbc-adapter 1.2.9.1 → 1.3.0.beta1

data/lib/arjdbc/mssql/connection_methods.rb

@@ -1,38 +1,36 @@
-class ActiveRecord::Base
-  class << self
-    def mssql_connection(config)
-      begin
-        require 'jdbc/jtds'
-        # NOTE: the adapter has only support for working with the
-        # open-source jTDS driver (won't work with MS's driver) !
-        ::Jdbc::JTDS.load_driver(:require) if defined?(::Jdbc::JTDS.load_driver)
-      rescue LoadError => e # assuming driver.jar is on the class-path
-        raise e unless e.message.to_s.index('no such file to load')
-      end
+ArJdbc::ConnectionMethods.module_eval do
+  def mssql_connection(config)
+    begin
+      require 'jdbc/jtds'
+      # NOTE: the adapter has only support for working with the
+      # open-source jTDS driver (won't work with MS's driver) !
+      ::Jdbc::JTDS.load_driver(:require) if defined?(::Jdbc::JTDS.load_driver)
+    rescue LoadError => e # assuming driver.jar is on the class-path
+      raise e unless e.message.to_s.index('no such file to load')
+    end
 
-      config[:host] ||= "localhost"
-      config[:port] ||= 1433
-      config[:driver] ||= defined?(::Jdbc::JTDS.driver_name) ? ::Jdbc::JTDS.driver_name : 'net.sourceforge.jtds.jdbc.Driver'
-      config[:adapter_spec] = ::ArJdbc::MSSQL
+    config[:host] ||= "localhost"
+    config[:port] ||= 1433
+    config[:driver] ||= defined?(::Jdbc::JTDS.driver_name) ? ::Jdbc::JTDS.driver_name : 'net.sourceforge.jtds.jdbc.Driver'
+    config[:adapter_spec] = ::ArJdbc::MSSQL
 
-      config[:url] ||= begin
-        url = "jdbc:jtds:sqlserver://#{config[:host]}:#{config[:port]}/#{config[:database]}"
-        # Instance is often a preferrable alternative to port when dynamic ports are used.
-        # If instance is specified then port is essentially ignored.
-        url << ";instance=#{config[:instance]}" if config[:instance]
-        # This will enable windows domain-based authentication and will require the JTDS native libraries be available.
-        url << ";domain=#{config[:domain]}" if config[:domain]
-        # AppName is shown in sql server as additional information against the connection.
-        url << ";appname=#{config[:appname]}" if config[:appname]
-        url
-      end
+    config[:url] ||= begin
+      url = "jdbc:jtds:sqlserver://#{config[:host]}:#{config[:port]}/#{config[:database]}"
+      # Instance is often a preferrable alternative to port when dynamic ports are used.
+      # If instance is specified then port is essentially ignored.
+      url << ";instance=#{config[:instance]}" if config[:instance]
+      # This will enable windows domain-based authentication and will require the JTDS native libraries be available.
+      url << ";domain=#{config[:domain]}" if config[:domain]
+      # AppName is shown in sql server as additional information against the connection.
+      url << ";appname=#{config[:appname]}" if config[:appname]
+      url
+    end
 
-      unless config[:domain]
-        config[:username] ||= "sa"
-        config[:password] ||= ""
-      end
-      jdbc_connection(config)
+    unless config[:domain]
+      config[:username] ||= "sa"
+      config[:password] ||= ""
     end
-    alias_method :jdbcmssql_connection, :mssql_connection
+    jdbc_connection(config)
   end
+  alias_method :jdbcmssql_connection, :mssql_connection
 end

data/lib/arjdbc/mssql/explain_support.rb

@@ -0,0 +1,107 @@
+require 'active_support/core_ext/string'
+
+module ArJdbc
+  module MSSQL
+    module ExplainSupport
+      
+      DISABLED = Java::JavaLang::Boolean.getBoolean('arjdbc.mssql.explain_support.disabled')
+      
+      def supports_explain?
+        ! DISABLED
+      end
+
+      def explain(arel, binds = [])
+        return if DISABLED
+        sql = to_sql(arel)
+        result = with_showplan_on do 
+          # exec_query(sql, 'EXPLAIN', binds)
+          raw_result = execute(sql, 'EXPLAIN', binds)
+          # TODO we should refactor to exec_query once it returns Result :
+          keys = raw_result[0] ? raw_result[0].keys : {}
+          rows = raw_result.map { |hash| hash.values }
+          ActiveRecord::Result.new(keys, rows)
+        end
+        PrinterTable.new(result).pp
+      end
+
+      protected
+
+      def with_showplan_on
+        set_showplan_option(true)
+        yield
+      ensure
+        set_showplan_option(false)
+      end
+
+      def set_showplan_option(enable = true)
+        option = 'SHOWPLAN_TEXT'
+        execute "SET #{option} #{enable ? 'ON' : 'OFF'}"
+      rescue Exception => e
+        raise ActiveRecord::ActiveRecordError, "#{option} could not be turned" + 
+              " #{enable ? 'ON' : 'OFF'} (check SHOWPLAN permissions) due : #{e.inspect}"
+      end
+      
+      class PrinterTable # :nodoc:
+        
+        cattr_accessor :max_column_width, :cell_padding
+        self.max_column_width = 50
+        self.cell_padding = 1
+
+        attr_reader :result
+
+        def initialize(result)
+          @result = result
+        end
+
+        def pp
+          @widths = compute_column_widths
+          @separator = build_separator
+          pp = []
+          pp << @separator
+          pp << build_cells(result.columns)
+          pp << @separator
+          result.rows.each do |row|
+            pp << build_cells(row)
+          end
+          pp << @separator
+          pp.join("\n") + "\n"
+        end
+
+        private
+
+        def compute_column_widths
+          [].tap do |computed_widths|
+            result.columns.each_with_index do |column, i|
+              cells_in_column = [column] + result.rows.map { |r| cast_item(r[i]) }
+              computed_width = cells_in_column.map(&:length).max
+              final_width = computed_width > max_column_width ? max_column_width : computed_width
+              computed_widths << final_width
+            end
+          end
+        end
+
+        def build_separator
+          '+' + @widths.map {|w| '-' * (w + (cell_padding * 2))}.join('+') + '+'
+        end
+
+        def build_cells(items)
+          cells = []
+          items.each_with_index do |item, i|
+            cells << cast_item(item).ljust(@widths[i])
+          end
+          "| #{cells.join(' | ')} |"
+        end
+
+        def cast_item(item)
+          case item
+          when NilClass then 'NULL'
+          when Float then item.to_s.to(9)
+          else item.to_s.truncate(max_column_width)
+          end
+        end
+        
+      end
+      
+    end
+  end
+end

data/lib/arjdbc/mssql/limit_helpers.rb

@@ -52,35 +52,65 @@ module ArJdbc
             start_row = offset + 1
             end_row = offset + limit.to_i
             _, select, rest_of_query = FIND_SELECT.match(sql).to_a
+			
+            #need the table name for avoiding amiguity
+            table_name  = Utils.get_table_name(sql, true)
+            primary_key = get_primary_key(order, table_name)
+			
+            #I am not sure this will cover all bases.  but all the tests pass
+            if order[/ORDER/].nil?
+              new_order = "ORDER BY #{order}, [#{table_name}].[#{primary_key}]" if order.index("#{table_name}.#{primary_key}").nil?
+            else
+              new_order ||= order
+            end
+			
             if (start_row == 1) && (end_row ==1)
-              new_sql = "#{select} TOP 1 #{rest_of_query}"
+              new_sql = "#{select} TOP 1 #{rest_of_query} #{new_order}"
               sql.replace(new_sql)
             else
-              #UGLY
-              #KLUDGY?
-              #removing out stuff before the FROM...
-              rest = rest_of_query[/FROM/i=~ rest_of_query.. -1]
-              #need the table name for avoiding amiguity
-              table_name = Utils.get_table_name(sql, true)
-              primary_key = get_primary_key(order, table_name)
-              #I am not sure this will cover all bases.  but all the tests pass
-              if order[/ORDER/].nil?
-                new_order = "ORDER BY #{order}, #{table_name}.#{primary_key}" if order.index("#{table_name}.#{primary_key}").nil?
-              else
-                new_order ||= order
-              end
+              # We are in deep trouble here. SQL Server does not have any kind of OFFSET build in.
+              # Only remaining solution is adding a where condition to be sure that the ID is not in SELECT TOP OFFSET FROM SAME_QUERY.
+              # To do so we need to extract each part of the query to insert our additional condition in the right place.
+              query_without_select = rest_of_query[/FROM/i=~ rest_of_query.. -1]
+              additional_condition = "#{table_name}.#{primary_key} NOT IN (#{select} TOP #{offset} #{table_name}.#{primary_key} #{query_without_select} #{new_order})"
 
-              if (rest_of_query.match(/WHERE/).nil?)
-                new_sql = "#{select} TOP #{limit} #{rest_of_query} WHERE #{table_name}.#{primary_key} NOT IN (#{select} TOP #{offset} #{table_name}.#{primary_key} #{rest} #{new_order}) #{order} "
+              # Extract the different parts of the query
+              having, group_by, where, from, selection = split_sql(rest_of_query, /having/i, /group by/i, /where/i, /from/i)
+
+              # Update the where part to add our additional condition
+              if where.blank?
+                where = "WHERE #{additional_condition}"
               else
-                new_sql = "#{select} TOP #{limit} #{rest_of_query} AND #{table_name}.#{primary_key} NOT IN (#{select} TOP #{offset} #{table_name}.#{primary_key} #{rest} #{new_order}) #{order} "
+                where = "#{where} AND #{additional_condition}"
               end
 
-              sql.replace(new_sql)
+              # Replace the query to be our new customized query
+              sql.replace("#{select} TOP #{limit} #{selection} #{from} #{where} #{group_by} #{having} #{new_order}")
             end
           end
           sql
         end
+
+        # Split the rest_of_query into chunks based on regexs (applied from end of string to the beginning)
+        # The result is an array of regexs.size+1 elements (the last one being the remaining once everything was chopped away)
+        def split_sql rest_of_query, *regexs
+          results = Array.new
+
+          regexs.each do |regex|
+            if position = (regex =~ rest_of_query)
+              # Extract the matched string and chop the rest_of_query
+              matched       = rest_of_query[position..-1]
+              rest_of_query = rest_of_query[0...position]
+            else
+              matched = nil
+            end
+
+            results << matched
+          end
+          results << rest_of_query
+
+          results
+        end
         
         def get_primary_key(order, table_name) # table_name might be quoted
           if order =~ /(\w*id\w*)/i

data/lib/arjdbc/mysql.rb

@@ -1,3 +1,3 @@
-require 'arjdbc/jdbc'
+require 'arjdbc'
 require 'arjdbc/mysql/adapter'
 require 'arjdbc/mysql/connection_methods'

data/lib/arjdbc/mysql/adapter.rb

@@ -10,9 +10,41 @@ module ArJdbc
     end
 
     def configure_connection
-      execute("SET SQL_AUTO_IS_NULL=0")
-    end
+      variables = config[:variables] || {}
+      # By default, MySQL 'where id is null' selects the last inserted id. Turn this off.
+      variables[:sql_auto_is_null] = 0 # execute "SET SQL_AUTO_IS_NULL=0"
+
+      # Increase timeout so the server doesn't disconnect us.
+      wait_timeout = config[:wait_timeout]
+      wait_timeout = 2147483 unless wait_timeout.is_a?(Fixnum)
+      variables[:wait_timeout] = wait_timeout
+
+      # Make MySQL reject illegal values rather than truncating or blanking them, see
+      # http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html#sqlmode_strict_all_tables
+      # If the user has provided another value for sql_mode, don't replace it.
+      if strict_mode? && ! variables.has_key?(:sql_mode)
+        variables[:sql_mode] = 'STRICT_ALL_TABLES' # SET SQL_MODE='STRICT_ALL_TABLES'
+      end
+
+      # NAMES does not have an equals sign, see
+      # http://dev.mysql.com/doc/refman/5.0/en/set-statement.html#id944430
+      # (trailing comma because variable_assignments will always have content)
+      encoding = "NAMES #{config[:encoding]}, " if config[:encoding]
+
+      # Gather up all of the SET variables...
+      variable_assignments = variables.map do |k, v|
+        if v == ':default' || v == :default
+          "@@SESSION.#{k.to_s} = DEFAULT" # Sets the value to the global or compile default
+        elsif ! v.nil?
+          "@@SESSION.#{k.to_s} = #{quote(v)}"
+        end
+        # or else nil; compact to clear nils out
+      end.compact.join(', ')
 
+      # ...and send them all in one query
+      execute("SET #{encoding} #{variable_assignments}", :skip_logging)
+    end
+    
     def self.column_selector
       [ /mysql/i, lambda { |_,column| column.extend(::ArJdbc::MySQL::Column) } ]
     end
@@ -21,6 +53,10 @@ module ArJdbc
       ::ActiveRecord::ConnectionAdapters::MySQLJdbcConnection
     end
 
+    def strict_mode? # strict_mode is default since AR 4.0
+      config.key?(:strict) ? config[:strict] : ::ActiveRecord::VERSION::MAJOR > 3
+    end
+    
     module Column
       
       def extract_default(default)
@@ -206,6 +242,10 @@ module ArJdbc
       true
     end
 
+    def supports_transaction_isolation?(level = nil)
+      version[0] >= 5 # MySQL 5+
+    end
+    
     def create_savepoint
       execute("SAVEPOINT #{current_savepoint_name}")
     end
@@ -230,11 +270,17 @@ module ArJdbc
 
     # DATABASE STATEMENTS ======================================
     
-    def exec_insert(sql, name, binds)
+    def exec_insert(sql, name, binds, pk = nil, sequence_name = nil) # :nodoc:
+      execute sql, name, binds
+    end
+    
+    def exec_update(sql, name, binds) # :nodoc:
+      execute sql, name, binds
+    end
+    
+    def exec_delete(sql, name, binds) # :nodoc:
       execute sql, name, binds
     end
-    alias :exec_update :exec_insert
-    alias :exec_delete :exec_insert
     
     # Make it public just like native MySQL adapter does.
     def update_sql(sql, name = nil) # :nodoc:
@@ -336,10 +382,11 @@ module ArJdbc
       super(name, {:options => "ENGINE=InnoDB DEFAULT CHARSET=utf8"}.merge(options))
     end
 
-    def rename_table(name, new_name)
-      execute "RENAME TABLE #{quote_table_name(name)} TO #{quote_table_name(new_name)}"
+    def rename_table(table_name, new_name)
+      execute "RENAME TABLE #{quote_table_name(table_name)} TO #{quote_table_name(new_name)}"
+      rename_table_indexes(table_name, new_name) if respond_to?(:rename_table_indexes) # AR-4.0 SchemaStatements
     end
-
+    
     def remove_index!(table_name, index_name) #:nodoc:
       # missing table_name quoting in AR-2.3
       execute "DROP INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)}"
@@ -387,8 +434,7 @@ module ArJdbc
     def rename_column(table_name, column_name, new_column_name) #:nodoc:
       options = {}
       if column = columns(table_name).find { |c| c.name == column_name.to_s }
-        options[:default] = column.default
-        options[:null] = column.null
+        options[:default] = column.default; options[:null] = column.null
       else
         raise ActiveRecord::ActiveRecordError, "No such column: #{table_name}.#{column_name}"
       end
@@ -396,8 +442,9 @@ module ArJdbc
       rename_column_sql = "ALTER TABLE #{quote_table_name(table_name)} CHANGE #{quote_column_name(column_name)} #{quote_column_name(new_column_name)} #{current_type}"
       add_column_options!(rename_column_sql, options)
       execute(rename_column_sql)
+      rename_column_indexes(table_name, column_name, new_column_name) if respond_to?(:rename_column_indexes) # AR-4.0 SchemaStatements
     end
-
+    
     def add_limit_offset!(sql, options) #:nodoc:
       limit, offset = options[:limit], options[:offset]
       if limit && offset
@@ -486,6 +533,10 @@ module ArJdbc
       end
     end
 
+    def empty_insert_statement_value
+      "VALUES ()"
+    end
+    
     protected
     def quoted_columns_for_index(column_names, options = {})
       length = options[:length] if options.is_a?(Hash)
@@ -560,9 +611,7 @@ module ActiveRecord
           super(nil, name, *args)
         end
       end
-
-      def call_discovered_column_callbacks(*)
-      end
+      
     end
 
     class MysqlAdapter < JdbcAdapter

data/lib/arjdbc/mysql/connection_methods.rb

@@ -1,27 +1,25 @@
-class ActiveRecord::Base
-  class << self
-    def mysql_connection(config)
-      begin
-        require 'jdbc/mysql'
-        ::Jdbc::MySQL.load_driver(:require) if defined?(::Jdbc::MySQL.load_driver)
-      rescue LoadError # assuming driver.jar is on the class-path
-      end
-
-      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'
-      config[:adapter_class] = ActiveRecord::ConnectionAdapters::MysqlAdapter
-      config[:adapter_spec] = ::ArJdbc::MySQL
-      options = (config[:options] ||= {})
-      options['zeroDateTimeBehavior'] ||= 'convertToNull'
-      options['jdbcCompliantTruncation'] ||= 'false'
-      options['useUnicode'] ||= 'true'
-      options['characterEncoding'] = config[:encoding] || 'utf8'
-      connection = jdbc_connection(config)
-      ::ArJdbc::MySQL.kill_cancel_timer(connection.raw_connection)
-      connection
+ArJdbc::ConnectionMethods.module_eval do
+  def mysql_connection(config)
+    begin
+      require 'jdbc/mysql'
+      ::Jdbc::MySQL.load_driver(:require) if defined?(::Jdbc::MySQL.load_driver)
+    rescue LoadError # assuming driver.jar is on the class-path
     end
-    alias_method :jdbcmysql_connection, :mysql_connection
-    alias_method :mysql2_connection, :mysql_connection
+
+    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'
+    config[:adapter_class] = ActiveRecord::ConnectionAdapters::MysqlAdapter
+    config[:adapter_spec] = ::ArJdbc::MySQL
+    options = (config[:options] ||= {})
+    options['zeroDateTimeBehavior'] ||= 'convertToNull'
+    options['jdbcCompliantTruncation'] ||= 'false'
+    options['useUnicode'] ||= 'true'
+    options['characterEncoding'] = config[:encoding] || 'utf8'
+    connection = jdbc_connection(config)
+    ::ArJdbc::MySQL.kill_cancel_timer(connection.raw_connection)
+    connection
   end
+  alias_method :jdbcmysql_connection, :mysql_connection
+  alias_method :mysql2_connection, :mysql_connection
 end