activerecord-jdbc-adapter 1.2.2.1 → 1.2.5

data/lib/arjdbc/mssql/tsql_helper.rb

@@ -1,14 +1,6 @@
 # Common methods for handling TSQL databases.
 module TSqlMethods
 
-  def modify_types(tp) #:nodoc:
-    tp[:primary_key] = "int NOT NULL IDENTITY(1, 1) PRIMARY KEY"
-    tp[:integer][:limit] = nil
-    tp[:boolean] = {:name => "bit"}
-    tp[:binary] = { :name => "image"}
-    tp
-  end
-
   def type_to_sql(type, limit = nil, precision = nil, scale = nil) #:nodoc:
     limit = nil if %w(text binary).include? type.to_s
     return 'uniqueidentifier' if (type.to_s == 'uniqueidentifier')

data/lib/arjdbc/mysql.rb

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

data/lib/arjdbc/mysql/adapter.rb

@@ -1,3 +1,4 @@
+require 'bigdecimal'
 require 'active_record/connection_adapters/abstract/schema_definitions'
 
 module ::ArJdbc
@@ -466,6 +467,87 @@ module ActiveRecord
         configure_connection
       end
 
+      ## EXPLAIN support lifted from the mysql2 gem with slight modifications
+      ## to work in the JDBC adapter gem.
+      def supports_explain?
+        true
+      end
+
+      def explain(arel, binds = [])
+        sql     = "EXPLAIN #{to_sql(arel, binds.dup)}"
+        start   = Time.now.to_f
+        raw_result  = execute(sql, "EXPLAIN")
+        ar_result = ActiveRecord::Result.new(raw_result[0].keys, raw_result)
+        elapsed = Time.now.to_f - start
+        ExplainPrettyPrinter.new.pp(ar_result, elapsed)
+      end
+
+      class ExplainPrettyPrinter # :nodoc:
+        # Pretty prints the result of a EXPLAIN in a way that resembles the output of the
+        # MySQL shell:
+        #
+        #   +----+-------------+-------+-------+---------------+---------+---------+-------+------+-------------+
+        #   | id | select_type | table | type  | possible_keys | key     | key_len | ref   | rows | Extra       |
+        #   +----+-------------+-------+-------+---------------+---------+---------+-------+------+-------------+
+        #   |  1 | SIMPLE      | users | const | PRIMARY       | PRIMARY | 4       | const |    1 |             |
+        #   |  1 | SIMPLE      | posts | ALL   | NULL          | NULL    | NULL    | NULL  |    1 | Using where |
+        #   +----+-------------+-------+-------+---------------+---------+---------+-------+------+-------------+
+        #   2 rows in set (0.00 sec)
+        #
+        # This is an exercise in Ruby hyperrealism :).
+        def pp(result, elapsed)
+          widths    = compute_column_widths(result)
+          separator = build_separator(widths)
+
+          pp = []
+
+          pp << separator
+          pp << build_cells(result.columns, widths)
+          pp << separator
+
+          result.rows.each do |row|
+            pp << build_cells(row.values, widths)
+          end
+
+          pp << separator
+          pp << build_footer(result.rows.length, elapsed)
+
+          pp.join("\n") + "\n"
+        end
+
+        private
+
+        def compute_column_widths(result)
+          [].tap do |widths|
+            result.columns.each do |col|
+              cells_in_column = [col] + result.rows.map {|r| r[col].nil? ? 'NULL' : r[col].to_s}
+              widths << cells_in_column.map(&:length).max
+            end
+          end
+          
+        end
+
+        def build_separator(widths)
+          padding = 1
+          '+' + widths.map {|w| '-' * (w + (padding*2))}.join('+') + '+'
+        end
+
+        def build_cells(items, widths)
+          cells = []
+          items.each_with_index do |item, i|
+            item = 'NULL' if item.nil?
+            justifier = item.is_a?(Numeric) ? 'rjust' : 'ljust'
+            cells << item.to_s.send(justifier, widths[i])
+          end
+          '| ' + cells.join(' | ') + ' |'
+        end
+
+        def build_footer(nrows, elapsed)
+          rows_label = nrows == 1 ? 'row' : 'rows'
+          "#{nrows} #{rows_label} in set (%.2f sec)" % elapsed
+        end
+      end
+
       def jdbc_connection_class(spec)
         ::ArJdbc::MySQL.jdbc_connection_class
       end

data/lib/arjdbc/mysql/connection_methods.rb

@@ -5,7 +5,8 @@ $LOADED_FEATURES << "active_record/connection_adapters/mysql2_adapter.rb"
 class ActiveRecord::Base
   class << self
     def mysql_connection(config)
-      require "arjdbc/mysql"
+      require 'active_record/connection_adapters/jdbcmysql_adapter'
+
       config[:port] ||= 3306
       options = (config[:options] ||= {})
       options['zeroDateTimeBehavior'] ||= 'convertToNull'
@@ -13,7 +14,7 @@ class ActiveRecord::Base
       options['useUnicode'] ||= 'true'
       options['characterEncoding'] = config[:encoding] || 'utf8'
       config[:url] ||= "jdbc:mysql://#{config[:host]}:#{config[:port]}/#{config[:database]}"
-      config[:driver] ||= "com.mysql.jdbc.Driver"
+      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
       connection = jdbc_connection(config)
@@ -24,5 +25,3 @@ class ActiveRecord::Base
     alias_method :mysql2_connection, :mysql_connection
   end
 end
-
-

data/lib/arjdbc/oracle/adapter.rb

@@ -10,7 +10,11 @@ module ::ArJdbc
           def after_save_with_oracle_lob
             self.class.columns.select { |c| c.sql_type =~ /LOB\(|LOB$/i }.each do |c|
               value = self[c.name]
-              value = value.to_yaml if unserializable_attribute?(c.name, c)
+              if respond_to?(:unserializable_attribute?)
+                value = value.to_yaml if unserializable_attribute?(c.name, c)
+              else
+                value = value.to_yaml if value.is_a?(Hash)
+              end
               next if value.nil?  || (value == '')
 
               connection.write_large_object(c.type == :binary, c.name, self.class.table_name, self.class.primary_key, quote_value(id), value)
@@ -30,8 +34,14 @@ module ::ArJdbc
       (class << mod; self; end).class_eval do
         alias_chained_method :insert, :query_dirty, :ora_insert
         alias_chained_method :columns, :query_cache, :ora_columns
+        
+        # Prevent ORA-01795 for in clauses with more than 1000 
+        def in_clause_length
+          1000
+        end
       end
     end
+    
 
     def self.column_selector
       [/oracle/i, lambda {|cfg,col| col.extend(::ArJdbc::Oracle::Column)}]
@@ -156,7 +166,7 @@ module ::ArJdbc
       execute "DROP SEQUENCE #{seq_name}" rescue nil
     end
 
-    def recreate_database(name)
+    def recreate_database(name, options = {})
       tables.each{ |table| drop_table(table) }
     end
 

data/lib/arjdbc/postgresql.rb

@@ -1,4 +1,3 @@
 require 'arjdbc/jdbc'
-jdbc_require_driver 'jdbc/postgres'
 require 'arjdbc/postgresql/connection_methods'
 require 'arjdbc/postgresql/adapter'

data/lib/arjdbc/postgresql/adapter.rb

@@ -8,6 +8,8 @@ module ::ArJdbc
       (class << mod; self; end).class_eval do
         alias_chained_method :columns, :query_cache, :pg_columns
       end
+
+      mod.configure_connection
     end
 
     def self.column_selector
@@ -18,6 +20,10 @@ module ::ArJdbc
       ::ActiveRecord::ConnectionAdapters::PostgresJdbcConnection
     end
 
+    def configure_connection
+      self.standard_conforming_strings = true
+    end
+
     # column behavior based on postgresql_adapter in rails project
     # https://github.com/rails/rails/blob/3-1-stable/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L41
     module Column
@@ -207,20 +213,43 @@ module ::ArJdbc
       true
     end
 
+    # Enable standard-conforming strings if available.
+    def standard_conforming_strings=(enable)
+      old, self.client_min_messages = client_min_messages, 'panic'
+      value = if(enable) then "on" else "off" end
+      execute("SET standard_conforming_strings = #{value}", 'SCHEMA')
+      @standard_conforming_strings = (value == "on")
+    rescue
+      @standard_conforming_strings = :unsupported
+    ensure
+      self.client_min_messages = old
+    end
+
+    def standard_conforming_strings? #:nodoc:
+      if @standard_conforming_strings.nil?
+        begin
+          old, self.client_min_messages = client_min_messages, 'panic'
+          value = select_one('SHOW standard_conforming_strings', 'SCHEMA')['standard_conforming_strings']
+          @standard_conforming_strings = (value == "on")
+        rescue
+          @standard_conforming_strings = :unsupported
+        ensure
+          self.client_min_messages = old
+        end
+      end
+
+      # Return false if unsupported.
+      @standard_conforming_strings == true
+    end
+
     # Does PostgreSQL support standard conforming strings?
     def supports_standard_conforming_strings?
-      # Temporarily set the client message level above error to prevent unintentional
-      # error messages in the logs when working on a PostgreSQL database server that
-      # does not support standard conforming strings.
-      client_min_messages_old = client_min_messages
-      self.client_min_messages = 'panic'
+      standard_conforming_strings?
+      @standard_conforming_strings != :unsupported
+    end
 
-      # postgres-pr does not raise an exception when client_min_messages is set higher
-      # than error and "SHOW standard_conforming_strings" fails, but returns an empty
-      # PGresult instead.
-      has_support = select('SHOW standard_conforming_strings').to_a[0][0] rescue false
-      self.client_min_messages = client_min_messages_old
-      has_support
+    def supports_hex_escaped_bytea?
+      postgresql_version >= 90000
     end
 
     def supports_insert_with_returning?
@@ -235,10 +264,6 @@ module ::ArJdbc
       true
     end
 
-    def supports_count_distinct? #:nodoc:
-      false
-    end
-
     def create_savepoint
       execute("SAVEPOINT #{current_savepoint_name}")
     end
@@ -419,7 +444,6 @@ module ::ArJdbc
 
     # Based on postgresql_adapter.rb
     def indexes(table_name, name = nil)
-      schema_search_path = @config[:schema_search_path] || select_rows('SHOW search_path')[0][0]
       schemas = schema_search_path.split(/,/).map { |p| quote(p) }.join(',')
       result = select_rows(<<-SQL, name)
         SELECT i.relname, d.indisunique, a.attname, a.attnum, d.indkey
@@ -430,7 +454,7 @@ module ::ArJdbc
            AND d.indisprimary = 'f'
            AND t.oid = d.indrelid
            AND t.relname = '#{table_name}'
-           AND i.relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname IN (#{schemas}) )
+           AND i.relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname = ANY (current_schemas(false)) )
            AND a.attrelid = t.oid
            AND d.indkey[s.i]=a.attnum
         ORDER BY i.relname
@@ -459,20 +483,40 @@ module ::ArJdbc
 
     # take id from result of insert query
     def last_inserted_id(result)
-      Hash[Array(*result)].fetch("id") { result }
+      if result.is_a? Fixnum
+        result
+      else
+        result.first.first[1]
+      end
     end
 
     def last_insert_id(table, sequence_name)
       Integer(select_value("SELECT currval('#{sequence_name}')"))
     end
 
-    def recreate_database(name)
+    def recreate_database(name, options = {})
       drop_database(name)
-      create_database(name)
+      create_database(name, options)
     end
 
     def create_database(name, options = {})
-      execute "CREATE DATABASE \"#{name}\" ENCODING='#{options[:encoding] || 'utf8'}'"
+      options = options.with_indifferent_access
+      create_query = "CREATE DATABASE \"#{name}\" ENCODING='#{options[:encoding] || 'utf8'}'"
+      create_query += options.symbolize_keys.sum do |key, value|
+        case key
+          when :owner
+            " OWNER = \"#{value}\""
+          when :template
+            " TEMPLATE = \"#{value}\""
+          when :tablespace
+            " TABLESPACE = \"#{value}\""
+          when :connection_limit
+            " CONNECTION LIMIT = #{value}"
+          else
+            ""
+        end
+      end
+      execute create_query
     end
 
     def drop_database(name)
@@ -504,8 +548,7 @@ module ::ArJdbc
       ENV['PGHOST']     = @config[:host] if @config[:host]
       ENV['PGPORT']     = @config[:port].to_s if @config[:port]
       ENV['PGPASSWORD'] = @config[:password].to_s if @config[:password]
-      search_path = @config[:schema_search_path]
-      search_path = "--schema=#{search_path}" if search_path
+      search_path = "--schema=#{schema_search_path}" if schema_search_path
 
       @connection.connection.close
       begin
@@ -519,6 +562,38 @@ module ::ArJdbc
       end
     end
 
+    # Sets the schema search path to a string of comma-separated schema names.
+    # Names beginning with $ have to be quoted (e.g. $user => '$user').
+    # See: http://www.postgresql.org/docs/current/static/ddl-schemas.html
+    #
+    # This should be not be called manually but set in database.yml.
+    def schema_search_path=(schema_csv)
+      if schema_csv
+        execute "SET search_path TO #{schema_csv}"
+        @schema_search_path = schema_csv
+      end
+    end
+
+    # Returns the active schema search path.
+    def schema_search_path
+      @schema_search_path ||= exec_query('SHOW search_path', 'SCHEMA')[0]['search_path']
+    end
+
+    # Returns the current schema name.
+    def current_schema
+      exec_query('SELECT current_schema', 'SCHEMA')[0]["current_schema"]
+    end
+
+    # Returns the current client message level.
+    def client_min_messages
+      exec_query('SHOW client_min_messages', 'SCHEMA')[0]['client_min_messages']
+    end
+
+    # Set the client message level.
+    def client_min_messages=(level)
+      execute("SET client_min_messages TO '#{level}'", 'SCHEMA')
+    end
+
     # SELECT DISTINCT clause for a given set of columns and a given ORDER BY clause.
     #
     # PostgreSQL requires the ORDER BY columns in the select list for distinct queries, and
@@ -568,7 +643,7 @@ module ::ArJdbc
         "'#{value}'"
       when String
         case column.sql_type
-        when 'bytea' then "'#{escape_bytea(value)}'"
+        when 'bytea' then "E'#{escape_bytea(value)}'::bytea"
         when 'xml'   then "xml '#{quote_string(value)}'"
         when /^bit/
           case value
@@ -583,11 +658,26 @@ module ::ArJdbc
       end
     end
 
+    # Quotes a string, escaping any ' (single quote) and \ (backslash)
+    # characters.
+    def quote_string(s)
+      quoted = s.gsub(/'/, "''")
+      if !standard_conforming_strings?
+        quoted.gsub!(/\\/, '\&\&')
+      end
+
+      quoted
+    end
+
     def escape_bytea(s)
       if s
-        result = ''
-        s.each_byte { |c| result << sprintf('\\\\%03o', c) }
-        result
+        if supports_hex_escaped_bytea?
+          "\\\\x#{s.unpack("H*")[0]}"
+        else
+          result = ''
+          s.each_byte { |c| result << sprintf('\\\\%03o', c) }
+          result
+        end
       end
     end
 
@@ -623,6 +713,11 @@ module ::ArJdbc
 
     def rename_table(name, new_name)
       execute "ALTER TABLE #{name} RENAME TO #{new_name}"
+      pk, seq = pk_and_sequence_for(new_name)
+      if seq == "#{name}_#{pk}_seq"
+        new_seq = "#{new_name}_#{pk}_seq"
+        execute "ALTER TABLE #{quote_table_name(seq)} RENAME TO #{quote_table_name(new_seq)}"
+      end
     end
 
     # Adds a new column to the named table.
@@ -832,6 +927,11 @@ module ActiveRecord::ConnectionAdapters
   class PostgreSQLAdapter < JdbcAdapter
     include ArJdbc::PostgreSQL
 
+    def initialize(*args)
+      super
+      configure_connection
+    end
+
     class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition
       def xml(*args)
         options = args.extract_options!

data/lib/arjdbc/postgresql/connection_methods.rb

@@ -4,12 +4,13 @@ $LOADED_FEATURES << "active_record/connection_adapters/postgresql_adapter.rb"
 class ActiveRecord::Base
   class << self
     def postgresql_connection(config)
-      require "arjdbc/postgresql"
+      require 'active_record/connection_adapters/jdbcpostgresql_adapter'
+
       config[:host] ||= "localhost"
       config[:port] ||= 5432
       config[:url] ||= "jdbc:postgresql://#{config[:host]}:#{config[:port]}/#{config[:database]}"
       config[:url] << config[:pg_params] if config[:pg_params]
-      config[:driver] ||= "org.postgresql.Driver"
+      config[:driver] ||= defined?(::Jdbc::Postgres.driver_name) ? ::Jdbc::Postgres.driver_name : 'org.postgresql.Driver'
       config[:adapter_class] = ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
       config[:adapter_spec] = ::ArJdbc::PostgreSQL
       conn = jdbc_connection(config)
@@ -19,5 +20,3 @@ class ActiveRecord::Base
     alias_method :jdbcpostgresql_connection, :postgresql_connection
   end
 end
-
-