ActiveRecord-JDBC 0.2.1 → 0.2.2

data/lib/active_record/connection_adapters/jdbc_adapter.rb

@@ -10,7 +10,7 @@ module ActiveRecord
     alias :attributes_with_quotes_pre_oracle :attributes_with_quotes
     def attributes_with_quotes(include_primary_key = true) #:nodoc:
       aq = attributes_with_quotes_pre_oracle(include_primary_key)
-      if connection.class == ConnectionAdapters::JdbcAdapter && connection.is_a?(JdbcSpec::Oracle)
+      if connection.class == ConnectionAdapters::JdbcAdapter && (connection.is_a?(JdbcSpec::Oracle) || connection.is_a?(JdbcSpec::Mimer))
         aq[self.class.primary_key] = "?" if include_primary_key && aq[self.class.primary_key].nil?
       end
       aq
@@ -18,6 +18,12 @@ module ActiveRecord
   end
 
   module ConnectionAdapters
+    module Java
+      include_class 'java.lang.Class'
+      include_class 'java.net.URL'
+      include_class 'java.net.URLClassLoader'
+    end
+
     module Jdbc
       require 'java'
       include_class 'java.sql.DriverManager'
@@ -41,16 +47,20 @@ module ActiveRecord
       AR_TO_JDBC_TYPES = {
         :string      => [ lambda {|r| Jdbc::Types::VARCHAR == r['data_type']},
                           lambda {|r| r['type_name'] =~ /^varchar/i},
-                          lambda {|r| r['type_name'] =~ /^varchar$/i}],
+                          lambda {|r| r['type_name'] =~ /^varchar$/i},
+                          lambda {|r| r['type_name'] =~ /varying/i}],
         :text        => [ lambda {|r| [Jdbc::Types::LONGVARCHAR, Jdbc::Types::CLOB].include?(r['data_type'])},
-                          lambda {|r| r['type_name'] =~ /^(text|clob)/i} ],
+                          lambda {|r| r['type_name'] =~ /^(text|clob)/i},
+                          lambda {|r| r['type_name'] =~ /^character large object$/i},
+                          lambda {|r| r['sql_data_type'] == 2005}],
         :integer     => [ lambda {|r| Jdbc::Types::INTEGER == r['data_type']},
                           lambda {|r| r['type_name'] =~ /^integer$/i},
                           lambda {|r| r['type_name'] =~ /^int4$/i},
                           lambda {|r| r['type_name'] =~ /^int$/i}],
         :float       => [ lambda {|r| [Jdbc::Types::FLOAT,Jdbc::Types::DOUBLE].include?(r['data_type'])},
                           lambda {|r| r['type_name'] =~ /^float/i},
-                          lambda {|r| r['type_name'] =~ /^double$/i} ],
+                          lambda {|r| r['type_name'] =~ /^double$/i},
+                          lambda {|r| r['precision'] == 15}],
         :datetime    => [ lambda {|r| Jdbc::Types::TIMESTAMP == r['data_type']},
                           lambda {|r| r['type_name'] =~ /^datetime/i},
                           lambda {|r| r['type_name'] =~ /^timestamp$/i}],
@@ -65,6 +75,7 @@ module ActiveRecord
         :binary      => [ lambda {|r| [Jdbc::Types::LONGVARBINARY,Jdbc::Types::BINARY,Jdbc::Types::BLOB].include?(r['data_type'])},
                           lambda {|r| r['type_name'] =~ /^blob/i},
                           lambda {|r| r['type_name'] =~ /sub_type 0$/i}, # For FireBird
+                          lambda {|r| r['type_name'] =~ /^varbinary$/i}, # We want this sucker for Mimer
                           lambda {|r| r['type_name'] =~ /^binary$/i}, ],
         :boolean     => [ lambda {|r| [Jdbc::Types::TINYINT].include?(r['data_type'])},
                           lambda {|r| r['type_name'] =~ /^bool/i},
@@ -95,7 +106,7 @@ module ActiveRecord
           return new_types.first if new_types.length == 1
           types = new_types if new_types.length > 0
         end
-        raise "unable to choose type from: #{types.collect{|t| t['type_name']}.inspect} for #{ar_type}"
+        raise "unable to choose type from: #{types.collect{|t| [t['type_name'],t]}.inspect} for #{ar_type}"
       end
     end
 
@@ -106,8 +117,7 @@ module ActiveRecord
           Jdbc.module_eval do
             include_class(driver) {|p,c| driver_class_const }
           end
-          driver_class = Jdbc.const_get(driver_class_const.to_sym)
-          Jdbc::DriverManager.registerDriver(driver_class.new)
+          Jdbc::DriverManager.registerDriver(Jdbc.const_get(driver_class_const).new)
         end
       end
     end
@@ -193,7 +203,7 @@ module ActiveRecord
       def execute_insert(sql, pk)
         stmt = @connection.createStatement
         stmt.executeUpdate(sql,Jdbc::Statement::RETURN_GENERATED_KEYS)
-        row = unmarshal_result(stmt.getGeneratedKeys)
+        row = unmarshal_id_result(stmt.getGeneratedKeys)
         row.first && row.first.values.first
       ensure
         stmt.close
@@ -256,6 +266,30 @@ module ActiveRecord
         results
       end
 
+      def unmarshal_id_result(resultset)
+        metadata = resultset.getMetaData
+        column_count = metadata.getColumnCount
+        column_types = ['']
+        column_scale = ['']
+
+        1.upto(column_count) do |i|
+          column_types << metadata.getColumnType(i)
+          column_scale << metadata.getScale(i)
+        end
+
+        results = []
+
+        while resultset.next
+          row = {}
+          1.upto(column_count) do |i|
+            row[i] = row[i.to_s] = convert_jdbc_type_to_ruby(i, column_types[i], column_scale[i], resultset)
+          end
+          results << row
+        end
+
+        results
+      end
+      
       def to_ruby_time(java_date)
         if java_date
           tm = java_date.getTime
@@ -283,7 +317,7 @@ module ActiveRecord
             to_ruby_time(resultset.getTime(row))
           when Jdbc::Types::DATE
             to_ruby_time(resultset.getDate(row))
-          when Jdbc::Types::LONGVARBINARY, Jdbc::Types::BLOB, Jdbc::Types::BINARY
+          when Jdbc::Types::LONGVARBINARY, Jdbc::Types::BLOB, Jdbc::Types::BINARY, Jdbc::Types::VARBINARY
             resultset.getString(row)
           else
             types = Jdbc::Types.constants
@@ -300,6 +334,7 @@ module ActiveRecord
         @config = config
         case config[:driver].to_s
           when /oracle/i: self.extend(JdbcSpec::Oracle)
+          when /mimer/i: self.extend(JdbcSpec::Mimer)
           when /postgre/i: self.extend(JdbcSpec::PostgreSQL)
           when /mysql/i: self.extend(JdbcSpec::MySQL)
           when /sqlserver|tds/i: self.extend(JdbcSpec::MsSQL)
@@ -444,6 +479,7 @@ module ActiveRecord
       rescue Exception => e
         # Log message and raise exception.
         message = "#{e.class.name}: #{e.message}: #{sql}"
+
         log_info(message, name, 0)
         raise ActiveRecord::StatementInvalid, message
       end