activerecord-jdbc-adapter 1.2.2.1 → 1.2.5

data/gemfiles/rails32.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "jruby-openssl", :platform=>:jruby
+gem "appraisal"
+gem "rake", :require=>nil
+gem "test-unit", :group=>:test
+gem "mocha", :group=>:test
+gem "activerecord", "~> 3.2.9"
+

data/gemfiles/rails32.gemfile.lock

@@ -0,0 +1,41 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
+      builder (~> 3.0.0)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.9)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (3.0.2)
+    bouncy-castle-java (1.5.0146.1)
+    builder (3.0.4)
+    i18n (0.6.1)
+    jruby-openssl (0.7.7)
+      bouncy-castle-java (>= 1.5.0146.1)
+    metaclass (0.0.1)
+    mocha (0.11.4)
+      metaclass (~> 0.0.1)
+    multi_json (1.3.7)
+    rake (10.0.3)
+    test-unit (2.5.3)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  activerecord (~> 3.2.9)
+  appraisal
+  jruby-openssl
+  mocha
+  rake
+  test-unit

data/lib/arel/visitors/sql_server.rb

@@ -37,6 +37,13 @@ module Arel
         add_lock!(sql, :lock => o.lock && true)
         sql
       end
+
+      # MS-SQL doesn't support "SELECT...FOR UPDATE".  Instead, it needs
+      # WITH(ROWLOCK,UPDLOCK) specified after each table in the FROM clause.
+      #
+      # So, we return nothing here and add the appropriate stuff using add_lock! above.
+      def visit_Arel_Nodes_Lock o
+      end
     end
 
     class SQLServer2000 < SQLServer

data/lib/arjdbc/db2/adapter.rb

@@ -8,7 +8,11 @@ module ArJdbc
               lobfields = self.class.columns.select { |c| c.sql_type =~ /blob|clob/i }
               lobfields.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?
                 connection.write_large_object(c.type == :binary, c.name, self.class.table_name, self.class.primary_key, quote_value(id), value)
               end
@@ -31,6 +35,32 @@ module ArJdbc
       ::ActiveRecord::ConnectionAdapters::DB2JdbcConnection
     end
 
+    NATIVE_DATABASE_TYPES = {
+      :double    => { :name => "double" },
+      :bigint    => { :name => "bigint" }
+    }
+
+    def native_database_types
+      super.merge(NATIVE_DATABASE_TYPES)
+    end
+
+    def explain(query, *binds)
+      # TODO: Explain this!
+    end
+
+    def prefetch_primary_key?(table_name = nil)
+      # TRUE if the table has no identity column
+      names = table_name.upcase.split(".")
+      sql = "SELECT 1 FROM SYSCAT.COLUMNS WHERE IDENTITY = 'Y' "
+      sql += "AND TABSCHEMA = '#{names.first}' " if names.size == 2
+      sql += "AND TABNAME = '#{names.last}'"
+      select_one(sql).nil?
+    end
+
+    def next_sequence_value(sequence_name)
+      select_value("select next value for #{sequence_name} from sysibm.sysdummy1")
+    end
+
     module Column
       def type_cast(value)
         return nil if value.nil? || value =~ /^\s*null\s*$/i
@@ -63,7 +93,10 @@ module ArJdbc
       def self.cast_to_date_or_time(value)
         return value if value.is_a? Date
         return nil if value.blank?
+        return Time.now if value =~ /^CURRENT/
         guess_date_or_time((value.is_a? Time) ? value : cast_to_time(value))
+      rescue
+        value
       end
 
       def self.cast_to_time(value)
@@ -82,21 +115,12 @@ module ArJdbc
       end
 
       private
-      # <b>DEPRECATED:</b> SMALLINT is now used for boolean field types. Please
-      # convert your tables using DECIMAL(5) for boolean values to SMALLINT instead.
-      def use_decimal5_for_boolean
-        warn "[DEPRECATION] using DECIMAL(5) for boolean is deprecated. Convert your columns to SMALLINT instead."
-        :boolean
-      end
-
       # http://publib.boulder.ibm.com/infocenter/db2luw/v9r7/topic/com.ibm.db2.luw.apdv.java.doc/doc/rjvjdata.html
       def simplified_type(field_type)
         case field_type
-        # old jdbc_db2.rb used decimal(5,0) as boolean
-        when /^smallint/i           then :boolean
-        when /^decimal\(5\)$/i      then use_decimal5_for_boolean
-        when /^real/i               then :float
-        when /^timestamp/i          then :datetime
+        when /^decimal\(1\)$/i  then :boolean
+        when /^real/i           then :float
+        when /^timestamp/i      then :datetime
         else
           super
         end
@@ -148,9 +172,7 @@ module ArJdbc
 
     def last_insert_id(sql)
       table_name = sql.split(/\s/)[2]
-      result = select(ActiveRecord::Base.send(:sanitize_sql,
-          %[select IDENTITY_VAL_LOCAL() as last_insert_id from #{table_name}],
-          nil))
+      result = select(ActiveRecord::Base.send(:sanitize_sql, %[select IDENTITY_VAL_LOCAL() as last_insert_id from #{table_name}], nil))
       result.last['last_insert_id']
     end
 
@@ -158,7 +180,7 @@ module ArJdbc
       tp[:primary_key] = 'int not null generated by default as identity (start with 1) primary key'
       tp[:string][:limit] = 255
       tp[:integer][:limit] = nil
-      tp[:boolean] = {:name => "smallint"}
+      tp[:boolean] = {:name => "decimal(1)"}
       tp
     end
 
@@ -204,7 +226,7 @@ module ArJdbc
         create_sql << "#{quote_table_name(name)} ("
         create_sql << table_definition.to_sql
         create_sql << ") #{options[:options]}"
-        create_sql << " IN #{@config[:database]}.#{@config[:tablespace]}"
+        create_sql << " IN #{@config[:database]}.#{@config[:tablespace]}" if @config[:database] && @config[:tablespace]
 
         execute create_sql
 
@@ -229,7 +251,7 @@ module ArJdbc
           end
         else
           offset = offset.to_i
-          sql.gsub!(/SELECT/i, 'SELECT B.* FROM (SELECT A.*, row_number() over () AS internal$rownum FROM (SELECT')
+          sql.sub!(/SELECT/i, 'SELECT B.* FROM (SELECT A.*, row_number() over () AS internal$rownum FROM (SELECT')
           sql << ") A ) B WHERE B.internal$rownum > #{offset} AND B.internal$rownum <= #{limit + offset}"
         end
       end
@@ -247,7 +269,7 @@ module ArJdbc
     end
 
     def quote_column_name(column_name)
-      column_name
+      column_name.to_s
     end
 
     def quote(value, column = nil) # :nodoc:
@@ -290,12 +312,17 @@ module ArJdbc
       end
     end
 
-    def recreate_database(name)
+    def runstats_for_table(tablename, priority=10)
+      @connection.execute_update "call sysproc.admin_cmd('RUNSTATS ON TABLE #{tablename} WITH DISTRIBUTION AND DETAILED INDEXES ALL UTIL_IMPACT_PRIORITY #{priority}')"
+    end
+
+    def recreate_database(name, options = {})
       tables.each {|table| drop_table("#{db2_schema}.#{table}")}
     end
 
     def add_index(table_name, column_name, options = {})
       if (!zos? || (table_name.to_s ==  ActiveRecord::Migrator.schema_migrations_table_name.to_s))
+        column_name = column_name.to_s if column_name.is_a?(Symbol)
         super
       else
         statement ="CREATE"
@@ -326,19 +353,21 @@ module ArJdbc
 
     def change_column_null(table_name, column_name, null)
       if null
-        execute_and_auto_confirm "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} DROP NOT NULL"
+        sql = "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} DROP NOT NULL"
       else
-        execute_and_auto_confirm "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET NOT NULL"
+        sql = "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET NOT NULL"
       end
+      as400? ? execute_and_auto_confirm(sql) : execute(sql)
       reorg_table(table_name)
     end
 
     def change_column_default(table_name, column_name, default)
       if default.nil?
-        execute_and_auto_confirm "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} DROP DEFAULT"
+        sql = "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} DROP DEFAULT"
       else
-        execute_and_auto_confirm "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET WITH DEFAULT #{quote(default)}"
+        sql = "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET WITH DEFAULT #{quote(default)}"
       end
+      as400? ? execute_and_auto_confirm(sql) : execute(sql)
       reorg_table(table_name)
     end
 
@@ -434,11 +463,12 @@ module ArJdbc
 
     def structure_dump #:nodoc:
       definition=""
-      rs = @connection.connection.meta_data.getTables(nil,db2_schema.upcase,nil,["TABLE"].to_java(:string))
+      schema_name = db2_schema.upcase if db2_schema.present?
+      rs = @connection.connection.meta_data.getTables(nil,schema_name,nil,["TABLE"].to_java(:string))
       while rs.next
         tname = rs.getString(3)
         definition << "CREATE TABLE #{tname} (\n"
-        rs2 = @connection.connection.meta_data.getColumns(nil,db2_schema.upcase,tname,nil)
+        rs2 = @connection.connection.meta_data.getColumns(nil,schema_name,tname,nil)
         first_col = true
         while rs2.next
           col_name = add_quotes(rs2.getString(4));
@@ -461,13 +491,15 @@ module ArJdbc
             col_size = "(#{col_precision})"
           end
           nulling = (rs2.getString(18) == 'NO' ? " NOT NULL" : "")
+          autoincrement = (rs2.getString(23) == 'YES' ? " GENERATED ALWAYS AS IDENTITY" : "")
           create_col_string = add_quotes(expand_double_quotes(strip_quotes(col_name))) +
             " " +
             type +
             col_size +
             "" +
             nulling +
-            default
+            default +
+            autoincrement
           if !first_col
             create_col_string = ",\n #{create_col_string}"
           else
@@ -479,17 +511,30 @@ module ArJdbc
           first_col = false
         end
         definition << ");\n\n"
+
+        pkrs = @connection.connection.meta_data.getPrimaryKeys(nil,schema_name,tname)
+        primary_key = {}
+        while pkrs.next
+          name = pkrs.getString(6)
+          primary_key[name] = [] unless primary_key[name]
+          primary_key[name] << pkrs.getString(4)
+        end
+        primary_key.each do |name, cols|
+          definition << "ALTER TABLE #{tname}\n"
+          definition << "  ADD CONSTRAINT #{name}\n"
+          definition << "      PRIMARY KEY (#{cols.join(', ')});\n\n"
+        end
       end
       definition
     end
 
     def zos?
-      @config[:driver] == "com.ibm.db2.jcc.DB2Driver"
+      @config[:url] =~ /^jdbc:db2j:net:/ && @config[:driver] == "com.ibm.db2.jcc.DB2Driver"
     end
 
     private
     def as400?
-        @config[:url] =~ /^jdbc:as400:/
+      @config[:url] =~ /^jdbc:as400:/
     end
 
     def db2_schema
@@ -498,9 +543,14 @@ module ArJdbc
           # AS400 implementation takes schema from library name (last part of url)
           schema = @config[:url].split('/').last.strip
           (schema[-1..-1] == ";") ? schema.chop : schema
-        else
+        elsif @config[:username].present?
           # LUW implementation uses schema name of username by default
-          @config[:username] or ENV['USER']
+          @config[:username]
+        elsif @config[:jndi].present?
+          # let jndi worry about schema
+          nil
+        else
+          ENV['USER']
         end
       else
         @config[:schema]

data/lib/arjdbc/derby.rb

@@ -1,7 +1,3 @@
 require 'arjdbc/jdbc'
-jdbc_require_driver 'jdbc/derby'
 require 'arjdbc/derby/connection_methods'
 require 'arjdbc/derby/adapter'
-
-
-

data/lib/arjdbc/derby/adapter.rb

@@ -315,7 +315,7 @@ module ::ArJdbc
       @connection.tables(nil, derby_schema)
     end
 
-    def recreate_database(db_name)
+    def recreate_database(db_name, options = {})
       tables.each do |t|
         drop_table t
       end

data/lib/arjdbc/derby/connection_methods.rb

@@ -2,8 +2,10 @@ module ActiveRecord
   class Base
     class << self
       def derby_connection(config)
+        require 'active_record/connection_adapters/jdbcderby_adapter'
+
         config[:url] ||= "jdbc:derby:#{config[:database]};create=true"
-        config[:driver] ||= "org.apache.derby.jdbc.EmbeddedDriver"
+        config[:driver] ||= defined?(::Jdbc::Derby.driver_name) ? ::Jdbc::Derby.driver_name : 'org.apache.derby.jdbc.EmbeddedDriver'
         config[:adapter_spec] = ::ArJdbc::Derby
         conn = embedded_driver(config)
         md = conn.jdbc_connection.meta_data
@@ -12,7 +14,6 @@ module ActiveRecord
         end
         conn
       end
-
       alias_method :jdbcderby_connection, :derby_connection
     end
   end

data/lib/arjdbc/discover.rb

@@ -27,9 +27,24 @@ module ::ArJdbc
     end
   end
 
-  extension :Derby do |name|
+  extension :Derby do |name, config|
     if name =~ /derby/i
       require 'arjdbc/derby'
+
+      # Derby-specific hack
+      if config && ! config[:username] && ( config[:jndi] || config[:data_source] )
+        # Needed to set the correct database schema name (:username)
+        begin
+          data_source = config[:data_source] || Java::JavaxNaming::InitialContext.new.lookup(config[:jndi])
+          connection = data_source.getConnection
+          config[:username] = connection.getMetaData.getUserName
+        rescue Java::JavaSql::SQLException => e
+          warn "failed to set (derby) database :username from connection meda-data (#{e})"
+        ensure
+          ( connection.close rescue nil ) if connection # return to the pool
+        end
+      end
+
       true
     end
   end

data/lib/arjdbc/firebird/adapter.rb

@@ -7,7 +7,11 @@ module ::ArJdbc
           def after_save_with_firebird_blob
             self.class.columns.select { |c| c.sql_type =~ /blob/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?
               connection.write_large_object(c.type == :binary, c.name, self.class.table_name, self.class.primary_key, quote_value(id), value)
             end

data/lib/arjdbc/h2.rb

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

data/lib/arjdbc/h2/connection_methods.rb

@@ -2,8 +2,10 @@ module ActiveRecord
   class Base
     class << self
       def h2_connection(config)
+        require 'active_record/connection_adapters/jdbch2_adapter'
+
         config[:url] ||= "jdbc:h2:#{config[:database]}"
-        config[:driver] ||= "org.h2.Driver"
+        config[:driver] ||= defined?(::Jdbc::H2.driver_name) ? ::Jdbc::H2.driver_name : 'org.h2.Driver'
         config[:adapter_spec] = ::ArJdbc::H2
         embedded_driver(config)
       end

data/lib/arjdbc/hsqldb.rb

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

data/lib/arjdbc/hsqldb/adapter.rb

@@ -70,7 +70,7 @@ module ::ArJdbc
         if respond_to?(:h2_adapter) && value.empty?
           "''"
         elsif column && column.type == :binary
-          "'#{value.unpack("H*")[0]}'"
+          "X'#{value.unpack("H*")[0]}'"
         elsif column && (column.type == :integer ||
                          column.respond_to?(:primary) && column.primary && column.klass != String)
           value.to_i.to_s
@@ -133,7 +133,8 @@ module ::ArJdbc
     end
 
     def last_insert_id
-      Integer(select_value("CALL IDENTITY()"))
+      identity = select_value("CALL IDENTITY()")
+      Integer(identity.nil? ? 0 : identity)
     end
 
     def _execute(sql, name = nil)
@@ -167,7 +168,7 @@ module ::ArJdbc
       execute "DROP INDEX #{quote_column_name(index_name(table_name, options))}"
     end
 
-    def recreate_database(name)
+    def recreate_database(name, options = {})
       drop_database(name)
     end