activerecord-jdbc-adapter 1.1.3 → 1.2.0

data/lib/arjdbc/mimer/adapter.rb

@@ -44,9 +44,9 @@ module ArJdbc
       execute "DROP INDEX #{index_name(table_name, options)}"
     end
 
-    def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
+    def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = []) #:nodoc:
       if pk.nil? # Who called us? What does the sql look like? No idea!
-        execute sql, name
+        execute sql, name, binds
       elsif id_value # Pre-assigned id
         log(sql, name) { @connection.execute_insert sql,pk }
       else # Assume the sql contains a bind-variable for the id
@@ -104,14 +104,14 @@ module ArJdbc
       @offset = options[:offset]
     end
 
-    def select_all(sql, name = nil)
+    def select_all(sql, name = nil, binds = [])
       @offset ||= 0
       if !@limit || @limit == -1
         range = @offset..-1
       else
         range = @offset...(@offset+@limit)
       end
-      select(sql, name)[range]
+      select(sql, name, binds)[range]
     ensure
       @limit = @offset = nil
     end

data/lib/arjdbc/mssql/adapter.rb

@@ -7,7 +7,7 @@ module ::ArJdbc
     include LimitHelpers
 
     def self.extended(mod)
-      unless @lob_callback_added
+      unless defined?(@lob_callback_added)
         ActiveRecord::Base.class_eval do
           def after_save_with_mssql_lob
             self.class.columns.select { |c| c.sql_type =~ /image/i }.each do |c|
@@ -34,10 +34,10 @@ module ::ArJdbc
       ::ActiveRecord::ConnectionAdapters::MssqlJdbcConnection
     end
 
-    def arel2_visitors
+    def self.arel2_visitors(config)
       require 'arel/visitors/sql_server'
-      visitor_class = sqlserver_version == "2000" ? ::Arel::Visitors::SQLServer2000 : ::Arel::Visitors::SQLServer
-      { 'mssql' => visitor_class, 'sqlserver' => visitor_class, 'jdbcmssql' => visitor_class}
+      visitor_class = config[:sqlserver_version] == "2000" ? ::Arel::Visitors::SQLServer2000 : ::Arel::Visitors::SQLServer
+      {}.tap {|v| %w(mssql sqlserver jdbcmssql).each {|x| v[x] = visitor_class } }
     end
 
     def sqlserver_version
@@ -45,7 +45,8 @@ module ::ArJdbc
     end
 
     def add_version_specific_add_limit_offset
-      if sqlserver_version == "2000"
+      config[:sqlserver_version] = version = sqlserver_version
+      if version == "2000"
         extend LimitHelpers::SqlServer2000AddLimitOffset
       else
         extend LimitHelpers::SqlServerAddLimitOffset
@@ -110,7 +111,7 @@ module ::ArJdbc
       def type_cast(value)
         return nil if value.nil? || value == "(null)" || value == "(NULL)"
         case type
-        when :integer then value.to_i rescue unquote(value).to_i rescue value ? 1 : 0
+        when :integer then value.delete('()').to_i rescue unquote(value).to_i rescue value ? 1 : 0
         when :primary_key then value == true || value == false ? value == true ? 1 : 0 : value.to_i
         when :decimal   then self.class.value_to_decimal(unquote(value))
         when :datetime  then cast_to_datetime(value)
@@ -347,7 +348,7 @@ module ::ArJdbc
       table_name = table_name.gsub(/[\[\]]/, '')
 
       return [] if table_name =~ /^information_schema\./i
-      @table_columns = {} unless @table_columns
+      @table_columns ||= {}
       unless @table_columns[table_name]
         @table_columns[table_name] = super
         @table_columns[table_name].each do |col|
@@ -381,7 +382,8 @@ module ::ArJdbc
       end
     end
 
-    def select(sql, name = nil)
+    def select(sql, name = nil, binds = [])
+      sql = substitute_binds(sql, binds)
       log(sql, name) do
         @connection.execute_query(sql)
       end

data/lib/arjdbc/mssql/connection_methods.rb

@@ -5,6 +5,7 @@ class ActiveRecord::Base
       config[:host] ||= "localhost"
       config[:port] ||= 1433
       config[:driver] ||= "net.sourceforge.jtds.jdbc.Driver"
+      config[:adapter_spec] = ::ArJdbc::MsSQL
 
       url = "jdbc:jtds:sqlserver://#{config[:host]}:#{config[:port]}/#{config[:database]}"
 

data/lib/arjdbc/mssql/limit_helpers.rb

@@ -31,10 +31,13 @@ module ::ArJdbc
               rest = rest_of_query[/FROM/i=~ rest_of_query.. -1]
               #need the table name for avoiding amiguity
               table_name = LimitHelpers.get_table_name(sql)
-              primary_key = order[/(\w*id\w*)/i]
+              primary_key = order[/(\w*id\w*)/i] || "id"
               #I am not sure this will cover all bases.  but all the tests pass
-              new_order = "ORDER BY #{order}, #{table_name}.#{primary_key}" if order.index("#{table_name}.#{primary_key}").nil?
-              new_order ||= order
+              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 (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} "
@@ -69,7 +72,7 @@ module ::ArJdbc
             find_select = /\b(SELECT(?:\s+DISTINCT)?)\b(.*)/im
             whole, select, rest_of_query = find_select.match(sql).to_a
             rest_of_query.strip!
-            if rest_of_query[0] == "1"
+            if rest_of_query[0...1] == "1" && rest_of_query !~ /1 AS/i
               rest_of_query[0] = "*"
             end
             if rest_of_query[0] == "*"

data/lib/arjdbc/mysql/adapter.rb

@@ -98,14 +98,18 @@ module ::ArJdbc
       'MySQL'
     end
 
-    def arel2_visitors
-      {'jdbcmysql' => ::Arel::Visitors::MySQL}
+    def self.arel2_visitors(config)
+      {}.tap {|v| %w(mysql mysql2 jdbcmysql).each {|a| v[a] = ::Arel::Visitors::MySQL } }
     end
 
     def case_sensitive_equality_operator
       "= BINARY"
     end
 
+    def case_sensitive_modifier(node)
+      Arel::Nodes::Bin.new(node)
+    end
+
     def limited_update_conditions(where_sql, quoted_table_name, quoted_primary_key)
       where_sql
     end
@@ -338,6 +342,19 @@ module ::ArJdbc
     end
 
     protected
+    def quoted_columns_for_index(column_names, options = {})
+      length = options[:length] if options.is_a?(Hash)
+
+      case length
+        when Hash
+          column_names.map { |name| length[name] ? "#{quote_column_name(name)}(#{length[name]})" : quote_column_name(name) }
+        when Fixnum
+          column_names.map { |name| "#{quote_column_name(name)}(#{length})" }
+        else
+          column_names.map { |name| quote_column_name(name) }
+      end
+    end
+
     def translate_exception(exception, message)
       return super unless exception.respond_to?(:errno)
 
@@ -397,10 +414,6 @@ module ActiveRecord::ConnectionAdapters
       configure_connection
     end
 
-    def adapter_spec(config)
-      # return nil to avoid extending ArJdbc::MySQL, which we've already done
-    end
-
     def jdbc_connection_class(spec)
       ::ArJdbc::MySQL.jdbc_connection_class
     end
@@ -410,6 +423,17 @@ module ActiveRecord::ConnectionAdapters
     end
 
     alias_chained_method :columns, :query_cache, :jdbc_columns
+
+    protected
+    def exec_insert(sql, name, binds)
+      binds = binds.dup
+
+      # Pretend to support bind parameters
+      execute sql.gsub('?') { quote(*binds.shift.reverse) }, name
+    end
+    alias :exec_update :exec_insert
+    alias :exec_delete :exec_insert
+
   end
 end
 

data/lib/arjdbc/mysql/connection_methods.rb

@@ -15,6 +15,7 @@ class ActiveRecord::Base
       config[:url] ||= "jdbc:mysql://#{config[:host]}:#{config[:port]}/#{config[:database]}"
       config[:driver] ||= "com.mysql.jdbc.Driver"
       config[:adapter_class] = ActiveRecord::ConnectionAdapters::MysqlAdapter
+      config[:adapter_spec] = ::ArJdbc::MySQL
       connection = jdbc_connection(config)
       ::ArJdbc::MySQL.kill_cancel_timer(connection.raw_connection)
       connection

data/lib/arjdbc/oracle/adapter.rb

@@ -5,7 +5,7 @@ end
 module ::ArJdbc
   module Oracle
     def self.extended(mod)
-      unless @lob_callback_added
+      unless defined?(@lob_callback_added)
         ActiveRecord::Base.class_eval do
           def after_save_with_oracle_lob
             self.class.columns.select { |c| c.sql_type =~ /LOB\(|LOB$/i }.each do |c|
@@ -21,8 +21,12 @@ module ::ArJdbc
         ActiveRecord::Base.after_save :after_save_with_oracle_lob
         @lob_callback_added = true
       end
-      require 'arjdbc/jdbc/quoted_primary_key'
-      ActiveRecord::Base.extend ArJdbc::QuotedPrimaryKeyExtension
+
+      unless ActiveRecord::ConnectionAdapters::AbstractAdapter.instance_methods(false).detect {|m| m.to_s == "prefetch_primary_key?"}
+        require 'arjdbc/jdbc/quoted_primary_key'
+        ActiveRecord::Base.extend ArJdbc::QuotedPrimaryKeyExtension
+      end
+
       (class << mod; self; end).class_eval do
         alias_chained_method :insert, :query_dirty, :ora_insert
         alias_chained_method :columns, :query_cache, :ora_columns
@@ -110,14 +114,13 @@ module ::ArJdbc
       'Oracle'
     end
 
-    def arel2_visitors
+    def self.arel2_visitors(config)
       { 'oracle' => Arel::Visitors::Oracle }
     end
 
-    # TODO: use this instead of the QuotedPrimaryKey logic and execute_id_insert?
-    # def prefetch_primary_key?(table_name = nil)
-    #   columns(table_name).detect {|c| c.primary } if table_name
-    # end
+    def prefetch_primary_key?(table_name = nil)
+      columns(table_name).detect {|c| c.primary } if table_name
+    end
 
     def table_alias_length
       30
@@ -163,12 +166,12 @@ module ::ArJdbc
       defined?(::Arel::SqlLiteral) && ::Arel::SqlLiteral === value
     end
 
-    def ora_insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
+    def ora_insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = []) #:nodoc:
       if (id_value && !sql_literal?(id_value)) || pk.nil?
         # Pre-assigned id or table without a primary key
         # Presence of #to_sql means an Arel literal bind variable
         # that should use #execute_id_insert below
-        execute sql, name
+        execute sql, name, binds
       else
         # Assume the sql contains a bind-variable for the id
         # Extract the table from the insert sql. Yuck.
@@ -406,8 +409,8 @@ module ::ArJdbc
       end
     end
 
-    def select(sql, name=nil)
-      records = execute(sql,name)
+    def select(sql, name = nil, binds = [])
+      records = execute(sql, name, binds)
       records.each do |col|
           col.delete('raw_rnum_')
       end

data/lib/arjdbc/oracle/connection_methods.rb

@@ -4,6 +4,7 @@ class ActiveRecord::Base
       config[:port] ||= 1521
       config[:url] ||= "jdbc:oracle:thin:@#{config[:host]}:#{config[:port]}:#{config[:database]}"
       config[:driver] ||= "oracle.jdbc.driver.OracleDriver"
+      config[:adapter_spec] = ::ArJdbc::Oracle
       jdbc_connection(config)
     end
   end

data/lib/arjdbc/postgresql/adapter.rb

@@ -101,8 +101,9 @@ module ::ArJdbc
       'PostgreSQL'
     end
 
-    def arel2_visitors
-      {'jdbcpostgresql' => ::Arel::Visitors::PostgreSQL}
+
+    def self.arel2_visitors(config)
+      {}.tap {|v| %w(postgresql pg jdbcpostgresql).each {|a| v[a] = ::Arel::Visitors::PostgreSQL } }
     end
 
     def postgresql_version
@@ -245,7 +246,9 @@ module ::ArJdbc
       nil
     end
 
-    def pg_insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
+    def pg_insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [])
+      sql = substitute_binds(sql, binds)
+
       # Extract the table from the insert sql. Yuck.
       table = sql.split(" ", 4)[2].gsub('"', '')
 
@@ -253,6 +256,7 @@ module ::ArJdbc
       if supports_insert_with_returning? && id_value.nil?
         pk, sequence_name = *pk_and_sequence_for(table) unless pk
         if pk
+          sql = substitute_binds(sql, binds)
           id_value = select_value("#{sql} RETURNING #{quote_column_name(pk)}")
           clear_query_cache #FIXME: Why now?
           return id_value
@@ -260,7 +264,7 @@ module ::ArJdbc
       end
 
       # Otherwise, plain insert
-      execute(sql, name)
+      execute(sql, name, binds)
 
       # Don't need to look up id_value if we already have it.
       # (and can't in case of non-sequence PK)
@@ -302,35 +306,51 @@ module ::ArJdbc
       return @connection.columns_internal(table_name, name, s)
     end
 
-    # From postgresql_adapter.rb
+    # Sets the maximum number columns postgres has, default 32
+    def multi_column_index_limit=(limit)
+      @multi_column_index_limit = limit
+    end
+
+    # Gets the maximum number columns postgres has, default 32
+    def multi_column_index_limit
+      defined?(@multi_column_index_limit) && @multi_column_index_limit || 32
+    end
+
+    # 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
-          FROM pg_class t, pg_class i, pg_index d, pg_attribute a
+        SELECT i.relname, d.indisunique, a.attname, a.attnum, d.indkey
+          FROM pg_class t, pg_class i, pg_index d, pg_attribute a,
+          generate_series(0,#{multi_column_index_limit - 1}) AS s(i)
          WHERE i.relkind = 'i'
            AND d.indexrelid = i.oid
            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 a.attrelid = t.oid
-           AND ( d.indkey[0]=a.attnum OR d.indkey[1]=a.attnum
-              OR d.indkey[2]=a.attnum OR d.indkey[3]=a.attnum
-              OR d.indkey[4]=a.attnum OR d.indkey[5]=a.attnum
-              OR d.indkey[6]=a.attnum OR d.indkey[7]=a.attnum
-              OR d.indkey[8]=a.attnum OR d.indkey[9]=a.attnum )
+           AND d.indkey[s.i]=a.attnum
         ORDER BY i.relname
       SQL
 
       current_index = nil
       indexes = []
 
+      insertion_order = []
+      index_order = nil
+      
       result.each do |row|
         if current_index != row[0]
+        
+          (index_order = row[4].split(' ')).each_with_index{ |v, i| index_order[i] = v.to_i }
           indexes << ::ActiveRecord::ConnectionAdapters::IndexDefinition.new(table_name, row[0], row[1] == "t", [])
           current_index = row[0]
         end
-
-        indexes.last.columns << row[2]
+        insertion_order = row[3]
+        ind = index_order.index(insertion_order)
+        indexes.last.columns[ind] = row[2]
       end
 
       indexes
@@ -409,8 +429,7 @@ module ::ArJdbc
 
       # construct a clean list of column names from the ORDER BY clause, removing
       # any asc/desc modifiers
-      order_columns = order_by.split(',').collect { |s| s.split.first }
-      order_columns.delete_if(&:blank?)
+      order_columns = [order_by].flatten.map{|o| o.split(',').collect { |s| s.split.first } }.flatten.reject(&:blank?)
       order_columns = order_columns.zip((0...order_columns.size).to_a).map { |s,i| "#{s} AS alias_#{i}" }
 
       # return a DISTINCT ON() clause that's distinct on the columns we want but includes

data/lib/arjdbc/postgresql/connection_methods.rb

@@ -10,6 +10,7 @@ class ActiveRecord::Base
       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[:adapter_spec] = ::ArJdbc::PostgreSQL
       conn = jdbc_connection(config)
       conn.execute("SET SEARCH_PATH TO #{config[:schema_search_path]}") if config[:schema_search_path]
       conn

data/lib/arjdbc/sqlite3/adapter.rb

@@ -16,7 +16,7 @@ module ::ArJdbc
 
     module Column
       def init_column(name, default, *args)
-        @default = '' if default =~ /NULL/
+        @default = nil if default =~ /NULL/
       end
 
       def type_cast(value)
@@ -80,8 +80,8 @@ module ::ArJdbc
       'SQLite'
     end
 
-    def arel2_visitors
-      {'jdbcsqlite3' => ::Arel::Visitors::SQLite}
+    def self.arel2_visitors(config)
+      {}.tap {|v| %w(sqlite3 jdbcsqlite3).each {|x| v[x] = ::Arel::Visitors::SQLite } }
     end
 
     def supports_ddl_transactions?
@@ -145,7 +145,8 @@ module ::ArJdbc
       end
     end
 
-    def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
+    def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = []) #:nodoc:
+      sql = substitute_binds(sql, binds)
       @connection.execute_update(sql)
       id_value || last_insert_id
     end
@@ -194,8 +195,8 @@ module ::ArJdbc
       ActiveRecord::ConnectionAdapters::JdbcConnection::insert?(sql) ? last_insert_id : result
     end
 
-    def select(sql, name=nil)
-      execute(sql, name).map do |row|
+    def select(sql, name=nil, binds = [])
+      execute(sql, name, binds).map do |row|
         record = {}
         row.each_key do |key|
           if key.is_a?(String)
@@ -354,10 +355,6 @@ module ActiveRecord::ConnectionAdapters
   class SQLite3Adapter < JdbcAdapter
     include ArJdbc::SQLite3
 
-    def adapter_spec(config)
-      # return nil to avoid extending ArJdbc::SQLite3, which we've already done
-    end
-
     def jdbc_connection_class(spec)
       ::ArJdbc::SQLite3.jdbc_connection_class
     end
@@ -367,6 +364,12 @@ module ActiveRecord::ConnectionAdapters
     end
 
     alias_chained_method :columns, :query_cache, :jdbc_columns
+
+    protected
+
+    def last_inserted_id(result)
+      last_insert_id
+    end
   end
 
   SQLiteAdapter = SQLite3Adapter