activerecord-jdbc-adapter 0.9.0.1 → 0.9.1

data/lib/jdbc_adapter/jdbc_cachedb.rb

@@ -13,12 +13,12 @@ module ::JdbcSpec
   module CacheDB
     include TSqlMethods
 
-    def self.column_selector
-      [ /cache/i, lambda {  | cfg, col | col.extend( ::JdbcSpec::CacheDB::Column ) } ]
+    def self.adapter_matcher(name, *)
+     name =~ /cache/i ? self : false
     end
 
-    def self.adapter_selector
-      [ /cache/i, lambda {  | cfg, adapt | adapt.extend( ::JdbcSpec::CacheDB ) } ]
+    def self.column_selector
+      [ /cache/i, lambda {  | cfg, col | col.extend( ::JdbcSpec::CacheDB::Column ) } ]
     end
 
     module Column

data/lib/jdbc_adapter/jdbc_db2.rb

@@ -1,12 +1,10 @@
 module JdbcSpec
   module DB2
-    def self.column_selector
-      [/db2/i, lambda {|cfg,col|
-         if cfg[:url] =~ /^jdbc:derby:net:/
-           col.extend(::JdbcSpec::Derby::Column)
-         else
-           col.extend(::JdbcSpec::DB2::Column)
-         end }]
+    def self.adapter_matcher(name, config)
+      if name =~ /db2/i
+         return cfg[:url] =~ /^jdbc:derby:net:/ ? ::JdbcSpec::Derby : self
+      end
+      false
     end
 
     def self.adapter_selector

data/lib/jdbc_adapter/jdbc_derby.rb

@@ -10,12 +10,12 @@ module ::JdbcSpec
   end
 
   module Derby
-    def self.column_selector
-      [/derby/i, lambda {|cfg,col| col.extend(::JdbcSpec::Derby::Column)}]
+    def self.adapter_matcher(name, *)
+      name =~ /derby/i ? self : false
     end
 
-    def self.adapter_selector
-      [/derby/i, lambda {|cfg,adapt| adapt.extend(::JdbcSpec::Derby)}]
+    def self.column_selector
+      [/derby/i, lambda {|cfg,col| col.extend(::JdbcSpec::Derby::Column)}]
     end
 
     def self.monkey_rails
@@ -48,37 +48,36 @@ module ::JdbcSpec
     end
 
     module Column
-      def value_to_binary(value)
-        value.scan(/[0-9A-Fa-f]{2}/).collect {|v| v.to_i(16)}.pack("C*")
-      end
-
-      def cast_to_date_or_time(value)
-        return value if value.is_a? Date
-        return nil if value.blank?
-        guess_date_or_time((value.is_a? Time) ? value : cast_to_time(value))
-      end
-
-      def cast_to_time(value)
-        return value if value.is_a? Time
-        time_array = ParseDate.parsedate value
-        time_array[0] ||= 2000; time_array[1] ||= 1; time_array[2] ||= 1;
-        Time.send(ActiveRecord::Base.default_timezone, *time_array) rescue nil
-      end
-
-      def guess_date_or_time(value)
-        (value.hour == 0 and value.min == 0 and value.sec == 0) ?
-        Date.new(value.year, value.month, value.day) : value
-      end
-
       def simplified_type(field_type)
         return :boolean if field_type =~ /smallint/i
         return :float if field_type =~ /real/i
         super
       end
+
+      # Post process default value from JDBC into a Rails-friendly format (columns{-internal})
+      def default_value(value)
+        # jdbc returns column default strings with actual single quotes around the value.
+        return $1 if value =~ /^'(.*)'$/
+
+        value
+      end
+    end
+
+    def adapter_name #:nodoc:
+      'Derby'
     end
 
     include JdbcSpec::MissingFunctionalityHelper
 
+    # Convert the speficied column type to a SQL string.  In Derby, :integers cannot specify
+    # a limit.
+    def type_to_sql(type, limit = nil, precision = nil, scale = nil) #:nodoc:
+      return super unless type == :integer
+
+      native = native_database_types[type.to_s.downcase.to_sym]
+      native.is_a?(Hash) ? native[:name] : native
+    end
+
     def modify_types(tp)
       tp[:primary_key] = "int generated by default as identity NOT NULL PRIMARY KEY"
       tp[:integer][:limit] = nil
@@ -100,8 +99,8 @@ module ::JdbcSpec
 
     # Set the sequence to the max value of the table's column.
     def reset_sequence!(table, column, sequence = nil)
-      mpk = select_value("SELECT MAX(#{quote_column_name column}) FROM #{table}")
-      execute("ALTER TABLE #{table} ALTER COLUMN #{quote_column_name column} RESTART WITH #{mpk.to_i + 1}")
+      mpk = select_value("SELECT MAX(#{quote_column_name(column)}) FROM #{quote_table_name(table)}")
+      execute("ALTER TABLE #{quote_table_name(table)} ALTER COLUMN #{quote_column_name(column)} RESTART WITH #{mpk.to_i + 1}")
     end
 
     def reset_pk_sequence!(table, pk = nil, sequence = nil)
@@ -216,6 +215,19 @@ module ::JdbcSpec
       end
     end
 
+    def execute(sql, name = nil)
+      if sql =~ /^\s*(UPDATE|INSERT)/i
+        i = sql =~ /\swhere\s/im
+        if i
+          sql[i..-1] = sql[i..-1].gsub(/!=\s*NULL/, 'IS NOT NULL').gsub(/=\sNULL/i, 'IS NULL')
+        end
+      else
+        sql.gsub!(/= NULL/i, 'IS NULL')
+      end
+      super
+    end
+
+
     # I don't think this method is ever called ??? (stepheneb)
     def create_column(name, refid, colno)
       stmt = COLUMN_TYPE_STMT % [refid, strip_quotes(name)]
@@ -350,6 +362,14 @@ module ::JdbcSpec
       @connection.primary_keys table_name.to_s.upcase
     end
 
+    def columns(table_name, name=nil)
+      @connection.columns_internal(table_name.to_s, name, derby_schema)
+    end
+
+    def tables
+      @connection.tables(nil, derby_schema)
+    end
+
     def recreate_database(db_name)
       tables.each do |t|
         drop_table t
@@ -359,11 +379,11 @@ module ::JdbcSpec
     # For DDL it appears you can quote "" column names, but in queries (like insert it errors out?)
     def quote_column_name(name) #:nodoc:
       name = name.to_s
-      if /^references$/i =~ name
+      if /^(references|integer|key|group|year)$/i =~ name
         %Q{"#{name.upcase}"}
       elsif /[A-Z]/ =~ name && /[a-z]/ =~ name
         %Q{"#{name}"}
-      elsif name =~ /\s/
+      elsif name =~ /[\s-]/
         %Q{"#{name.upcase}"}
       elsif name =~ /^[_\d]/
         %Q{"#{name.upcase}"}
@@ -379,6 +399,13 @@ module ::JdbcSpec
     def quoted_false
       '0'
     end
+
+    private
+    # Derby appears to define schemas using the username
+    def derby_schema
+      @config[:username].to_s
+    end
   end
 end
 
+

data/lib/jdbc_adapter/jdbc_firebird.rb

@@ -1,7 +1,7 @@
 module ::JdbcSpec
   module FireBird
-    def self.adapter_selector
-      [/firebird/i, lambda{|cfg,adapt| adapt.extend(::JdbcSpec::FireBird)}]
+    def self.adapter_matcher(name, *)
+      name =~ /firebird/i ? self : false
     end
 
     def modify_types(tp)

data/lib/jdbc_adapter/jdbc_hsqldb.rb

@@ -14,56 +14,22 @@ module ::JdbcSpec
   end
 
   module HSQLDB
-    def self.column_selector
-      [/hsqldb|\.h2\./i, lambda {|cfg,col| col.extend(::JdbcSpec::HSQLDB::Column)}]
+    def self.adapter_matcher(name, *)
+      name =~ /hsqldb/i ? self : false
     end
 
-    def self.adapter_selector
-      [/hsqldb|\.h2\./i, lambda do |cfg,adapt|
-         adapt.extend(::JdbcSpec::HSQLDB)
-         def adapt.h2_adapter; true; end if cfg[:driver] =~ /\.h2\./
-       end]
+    def self.column_selector
+      [/hsqldb|\.h2\./i, lambda {|cfg,col| col.extend(::JdbcSpec::HSQLDB::Column)}]
     end
 
     module Column
-      def type_cast(value)
-        return nil if value.nil? || value =~ /^\s*null\s*$/i
-        case type
-        when :string    then value
-        when :integer   then defined?(value.to_i) ? value.to_i : (value ? 1 : 0)
-        when :primary_key then defined?(value.to_i) ? value.to_i : (value ? 1 : 0)
-        when :float     then value.to_f
-        when :datetime  then cast_to_date_or_time(value)
-        when :timestamp then cast_to_time(value)
-        when :binary    then value.scan(/[0-9A-Fa-f]{2}/).collect {|v| v.to_i(16)}.pack("C*")
-        when :time      then cast_to_time(value)
-        else value
-        end
-      end
-      def cast_to_date_or_time(value)
-        return value if value.is_a? Date
-        return nil if value.blank?
-        guess_date_or_time((value.is_a? Time) ? value : cast_to_time(value))
-      end
-
-      def cast_to_time(value)
-        return value if value.is_a? Time
-        time_array = ParseDate.parsedate value
-        time_array[0] ||= 2000; time_array[1] ||= 1; time_array[2] ||= 1;
-        Time.send(ActiveRecord::Base.default_timezone, *time_array) rescue nil
-      end
-
-      def guess_date_or_time(value)
-        (value.hour == 0 and value.min == 0 and value.sec == 0) ?
-        Date.new(value.year, value.month, value.day) : value
-      end
-
-
       private
       def simplified_type(field_type)
         case field_type
         when /longvarchar/i
           :text
+        when /tinyint/i
+          :boolean
         else
           super(field_type)
         end
@@ -76,6 +42,18 @@ module ::JdbcSpec
         return nil if sql_type =~ /\(0\)/
         super
       end
+
+      # Post process default value from JDBC into a Rails-friendly format (columns{-internal})
+      def default_value(value)
+        # jdbc returns column default strings with actual single quotes around the value.
+        return $1 if value =~ /^'(.*)'$/
+
+        value
+      end
+    end
+
+    def adapter_name #:nodoc:
+      defined?(::Jdbc::H2) ? 'h2' : 'hsqldb'
     end
 
     def modify_types(tp)
@@ -84,13 +62,14 @@ module ::JdbcSpec
       tp[:boolean][:limit] = nil
       # set text and float limits so we don't see odd scales tacked on
       # in migrations
+      tp[:boolean] = { :name => "tinyint" }
       tp[:text][:limit] = nil
-      tp[:float][:limit] = 17
+      tp[:float][:limit] = 17 if defined?(::Jdbc::H2)
       tp[:string][:limit] = 255
       tp[:datetime] = { :name => "DATETIME" }
       tp[:timestamp] = { :name => "DATETIME" }
-      tp[:time] = { :name => "DATETIME" }
-      tp[:date] = { :name => "DATETIME" }
+      tp[:time] = { :name => "TIME" }
+      tp[:date] = { :name => "DATE" }
       tp
     end
 
@@ -100,9 +79,9 @@ module ::JdbcSpec
       case value
       when String
         if respond_to?(:h2_adapter) && value.empty?
-          "NULL"
+          "''"
         elsif column && column.type == :binary
-          "'#{quote_string(value).unpack("C*").collect {|v| v.to_s(16)}.join}'"
+          "'#{value.unpack("H*")}'"
         else
           "'#{quote_string(value)}'"
         end
@@ -110,6 +89,15 @@ module ::JdbcSpec
       end
     end
 
+    def quote_column_name(name) #:nodoc:
+      name = name.to_s
+      if name =~ /[-]/
+        %Q{"#{name.upcase}"}
+      else
+        name
+      end
+    end
+
     def quote_string(str)
       str.gsub(/'/, "''")
     end
@@ -146,6 +134,13 @@ module ::JdbcSpec
       execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} RENAME TO #{new_column_name}"
     end
 
+    # Maps logical Rails types to MySQL-specific data types.
+    def type_to_sql(type, limit = nil, precision = nil, scale = nil)
+      return super if defined?(::Jdbc::H2) || type.to_s != 'integer' || limit == nil
+
+      type
+    end
+
     def rename_table(name, new_name)
       execute "ALTER TABLE #{name} RENAME TO #{new_name}"
     end
@@ -159,7 +154,7 @@ module ::JdbcSpec
     end
 
     def last_insert_id(table, sequence_name)
-      Integer(select_value("SELECT IDENTITY() FROM #{table}"))
+      Integer(select_value("CALL IDENTITY()"))
     end
 
     # Override normal #_execute: See Rubyforge #11567
@@ -197,4 +192,16 @@ module ::JdbcSpec
       execute "DROP INDEX #{quote_column_name(index_name(table_name, options))}"
     end
   end
+
+  module H2
+    include HSQLDB
+
+    def self.adapter_matcher(name, *)
+      name =~ /\.h2\./i ? self : false
+    end
+
+    def h2_adapter
+      true
+    end
+  end
 end

data/lib/jdbc_adapter/jdbc_informix.rb

@@ -40,14 +40,13 @@ module ::JdbcSpec
       @@db_major_version = base.select_one("SELECT dbinfo('version', 'major') version FROM systables WHERE tabid = 1")['version'].to_i
     end
 
-    def self.column_selector
-      [ /informix/i,
-        lambda { |cfg, column| column.extend(::JdbcSpec::Informix::Column) } ]
+    def self.adapter_matcher(name, *)
+      name =~ /informix/i ? self : false
     end
 
-    def self.adapter_selector
+    def self.column_selector
       [ /informix/i,
-        lambda { |cfg, adapter| adapter.extend(::JdbcSpec::Informix) } ]
+        lambda { |cfg, column| column.extend(::JdbcSpec::Informix::Column) } ]
     end
 
     module Column

data/lib/jdbc_adapter/jdbc_mimer.rb

@@ -1,7 +1,7 @@
 module JdbcSpec
   module Mimer
-    def self.adapter_selector
-      [/mimer/i, lambda {|cfg,adapt| adapt.extend(::JdbcSpec::Mimer)}]
+    def self.adapter_matcher(name, *)
+      name =~ /mimer/i ? self : false
     end
 
     def modify_types(tp)

data/lib/jdbc_adapter/jdbc_mssql.rb

@@ -1,36 +1,36 @@
 require 'jdbc_adapter/tsql_helper'
 
-module ::ActiveRecord
-  class Base
-    # After setting large objects to empty, write data back with a helper method
-    after_save :write_lobs
-    def write_lobs() #:nodoc:
-      if connection.is_a?(JdbcSpec::MsSQL)
-        self.class.columns.select { |c| c.sql_type =~ /image/i }.each { |c|
-          value = self[c.name]
-          value = value.to_yaml if unserializable_attribute?(c.name, c)
-          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)
-        }
+module ::JdbcSpec
+  module MsSQL
+    include TSqlMethods
+
+    def self.extended(mod)
+      unless @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|
+            value = self[c.name]
+            value = value.to_yaml if unserializable_attribute?(c.name, c)
+            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)
+          end
+          end
+        end
+
+        ActiveRecord::Base.after_save :after_save_with_mssql_lob
+        @lob_callback_added = true
       end
     end
-    private :write_lobs
-  end
-end
 
-module JdbcSpec
-  module MsSQL
-    include TSqlMethods
+    def self.adapter_matcher(name, *)
+      name =~ /sqlserver|tds/i ? self : false
+    end
 
     def self.column_selector
       [/sqlserver|tds/i, lambda {|cfg,col| col.extend(::JdbcSpec::MsSQL::Column)}]
     end
 
-    def self.adapter_selector
-      [/sqlserver|tds/i, lambda {|cfg,adapt| adapt.extend(::JdbcSpec::MsSQL)}]
-    end
-
     module Column
       attr_accessor :identity, :is_special
 
@@ -154,11 +154,13 @@ module JdbcSpec
     end
 
     def drop_database(name)
+      execute "USE master"
       execute "DROP DATABASE #{name}"
     end
 
     def create_database(name)
       execute "CREATE DATABASE #{name}"
+      execute "USE #{name}"
     end
 
       def rename_table(name, new_name)