activerecord-jdbc-adapter 0.9.1 → 0.9.2

data/lib/jdbc_adapter/jdbc_db2.rb

@@ -2,7 +2,7 @@ module JdbcSpec
   module DB2
     def self.adapter_matcher(name, config)
       if name =~ /db2/i
-         return cfg[:url] =~ /^jdbc:derby:net:/ ? ::JdbcSpec::Derby : self
+         return config[:url] =~ /^jdbc:derby:net:/ ? ::JdbcSpec::Derby : self
       end
       false
     end
@@ -50,7 +50,7 @@ module JdbcSpec
     end
 
     def modify_types(tp)
-      tp[:primary_key] = 'int generated by default as identity (start with 42) primary key'
+      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][:limit] = nil

data/lib/jdbc_adapter/jdbc_derby.rb

@@ -3,6 +3,7 @@ require 'jdbc_adapter/missing_functionality_helper'
 module ::JdbcSpec
   module ActiveRecordExtensions
     def derby_connection(config)
+      require File.dirname(__FILE__) + "/../active_record/connection_adapters/derby_adapter"
       config[:url] ||= "jdbc:derby:#{config[:database]};create=true"
       config[:driver] ||= "org.apache.derby.jdbc.EmbeddedDriver"
       embedded_driver(config)
@@ -400,6 +401,16 @@ module ::JdbcSpec
       '0'
     end
 
+    def add_limit_offset!(sql, options) #:nodoc:
+      if options[:offset]
+        sql << " OFFSET #{options[:offset]} ROWS"
+      end
+      if options[:limit]
+        #ROWS/ROW and FIRST/NEXT mean the same
+        sql << " FETCH FIRST #{options[:limit]} ROWS ONLY"
+      end
+    end
+
     private
     # Derby appears to define schemas using the username
     def derby_schema

data/lib/jdbc_adapter/jdbc_hsqldb.rb

@@ -1,12 +1,14 @@
 module ::JdbcSpec
   module ActiveRecordExtensions
     def hsqldb_connection(config)
+      require File.dirname(__FILE__) + "/../active_record/connection_adapters/hsqldb_adapter"
       config[:url] ||= "jdbc:hsqldb:#{config[:database]}"
       config[:driver] ||= "org.hsqldb.jdbcDriver"
       embedded_driver(config)
     end
 
     def h2_connection(config)
+      require File.dirname(__FILE__) + "/../active_record/connection_adapters/h2_adapter"
       config[:url] ||= "jdbc:h2:#{config[:database]}"
       config[:driver] ||= "org.h2.Driver"
       embedded_driver(config)
@@ -82,10 +84,13 @@ module ::JdbcSpec
           "''"
         elsif column && column.type == :binary
           "'#{value.unpack("H*")}'"
+        elsif column.respond_to?(:primary) && column.primary
+          value.to_i.to_s
         else
           "'#{quote_string(value)}'"
         end
-      else super
+      else
+        super
       end
     end
 

data/lib/jdbc_adapter/jdbc_mimer.rb

@@ -73,13 +73,20 @@ module JdbcSpec
         return "X'#{quote_string(value.unpack("C*").collect {|v| v.to_s(16)}.join)}'"
       end
       case value
-      when String     : %Q{'#{quote_string(value)}'}
-      when NilClass   : 'NULL'
-      when TrueClass  : '1'
-      when FalseClass : '0'
-      when Numeric    : value.to_s
-      when Date, Time : %Q{TIMESTAMP '#{value.strftime("%Y-%m-%d %H:%M:%S")}'}
-      else              %Q{'#{quote_string(value.to_yaml)}'}
+      when String     
+        %Q{'#{quote_string(value)}'}
+      when NilClass   
+        'NULL'
+      when TrueClass  
+        '1'
+      when FalseClass 
+        '0'
+      when Numeric    
+        value.to_s
+      when Date, Time 
+        %Q{TIMESTAMP '#{value.strftime("%Y-%m-%d %H:%M:%S")}'}
+      else              
+        %Q{'#{quote_string(value.to_yaml)}'}
       end
     end
 

data/lib/jdbc_adapter/jdbc_mssql.rb

@@ -31,6 +31,10 @@ module ::JdbcSpec
       [/sqlserver|tds/i, lambda {|cfg,col| col.extend(::JdbcSpec::MsSQL::Column)}]
     end
 
+    def self.jdbc_connection_class
+      ::ActiveRecord::ConnectionAdapters::MssqlJdbcConnection
+    end
+
     module Column
       attr_accessor :identity, :is_special
 
@@ -69,7 +73,7 @@ module ::JdbcSpec
 
       # JRUBY-2011: Match balanced quotes and parenthesis - 'text',('text') or (text)
       def unquote_string(value)
-        value.sub(/^\((.*)\)$/,'\1').sub(/^'(.*)'$/,'\1')
+        value.to_s.sub(/^\((.*)\)$/,'\1').sub(/^'(.*)'$/,'\1')
       end
 
       def unquote(value)
@@ -116,7 +120,7 @@ module ::JdbcSpec
           value = column.type == :integer ? value.to_i : value.to_f
           value.to_s
         else
-          "'#{quote_string(value)}'" # ' (for ruby-mode)
+          "N'#{quote_string(value)}'" # ' (for ruby-mode)
         end
       when TrueClass             then '1'
       when FalseClass            then '0'
@@ -138,6 +142,14 @@ module ::JdbcSpec
       "[#{name}]"
     end
 
+    def quoted_true
+      quote true
+    end
+
+    def quoted_false
+      quote false
+    end
+
     def change_order_direction(order)
       order.split(",").collect {|fragment|
         case fragment
@@ -249,6 +261,10 @@ module ::JdbcSpec
         end
       end
 
+      #SELECT .. FOR UPDATE is not supported on Microsoft SQL Server
+      def add_lock!(sql, options)
+        sql
+      end
 
       private
       # Turns IDENTITY_INSERT ON for table during execution of the block

data/lib/jdbc_adapter/jdbc_mysql.rb

@@ -5,7 +5,10 @@ module ::JdbcSpec
   $LOADED_FEATURES << "active_record/connection_adapters/mysql_adapter.rb"
 
   module ActiveRecordExtensions
+    add_method_to_remove_from_ar_base(:mysql_connection)
+
     def mysql_connection(config)
+      require File.dirname(__FILE__) + "/../active_record/connection_adapters/mysql_adapter"
       config[:port] ||= 3306
       url_options = "zeroDateTimeBehavior=convertToNull&jdbcCompliantTruncation=false&useUnicode=true&characterEncoding="
       url_options << (config[:encoding] || 'utf8')

data/lib/jdbc_adapter/jdbc_oracle.rb

@@ -26,6 +26,9 @@ module ::JdbcSpec
         ActiveRecord::Base.after_save :after_save_with_oracle_lob
         @lob_callback_added = true
       end
+      mod.class_eval do
+        alias_chained_method :insert, :query_dirty, :jdbc_oracle_insert
+      end
     end
 
     def self.adapter_matcher(name, *)
@@ -67,14 +70,14 @@ module ::JdbcSpec
       private
       def simplified_type(field_type)
         case field_type
-        when /^number\(1\)$/i                  : :boolean
-        when /char/i                           : :string
-        when /float|double/i                   : :float
-        when /int/i                            : :integer
-        when /num|dec|real/i                   : @scale == 0 ? :integer : :decimal
-        when /date|time/i                      : :datetime
-        when /clob/i                           : :text
-        when /blob/i                           : :binary
+        when /^number\(1\)$/i                  then :boolean
+        when /char/i                           then :string
+        when /float|double/i                   then :float
+        when /int/i                            then :integer
+        when /num|dec|real/i                   then @scale == 0 ? :integer : :decimal
+        when /date|time/i                      then :datetime
+        when /clob/i                           then :text
+        when /blob/i                           then :binary
         end
       end
 
@@ -87,6 +90,9 @@ module ::JdbcSpec
 
         return nil if value == "null"
 
+        # sysdate default should be treated like a null value
+        return nil if value.downcase == "sysdate"
+
         # jdbc returns column default strings with actual single quotes around the value.
         return $1 if value =~ /^'(.*)'$/
 
@@ -132,8 +138,8 @@ module ::JdbcSpec
       recreate_database(name)
     end
 
-    def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
-      if id_value # Pre-assigned id
+    def jdbc_oracle_insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
+      if id_value || pk.nil? # Pre-assigned id or table without a primary key
         execute sql, name
       else # Assume the sql contains a bind-variable for the id
         # Extract the table from the insert sql. Yuck.
@@ -153,7 +159,7 @@ module ::JdbcSpec
 
     def _execute(sql, name = nil)
       case sql.strip
-        when /\A\(?\s*(select|show)/i:
+        when /\A\(?\s*(select|show)/i then
           @connection.execute_query(sql)
         else
           @connection.execute_update(sql)
@@ -308,13 +314,13 @@ module ::JdbcSpec
     # see: abstract/quoting.rb
 
     # Camelcase column names need to be quoted.
-    # Nonquoted identifiers can contain only alphanumeric characters from your 
+    # Nonquoted identifiers can contain only alphanumeric characters from your
     # database character set and the underscore (_), dollar sign ($), and pound sign (#).
     # Database links can also contain periods (.) and "at" signs (@).
     # Oracle strongly discourages you from using $ and # in nonquoted identifiers.
     # Source: http://download.oracle.com/docs/cd/B28359_01/server.111/b28286/sql_elements008.htm
     def quote_column_name(name) #:nodoc:
-      name.to_s =~ /^[a-z_$#]+$/ ? name.to_s : "\"#{name}\""
+      name.to_s =~ /^[a-z0-9_$#]+$/ ? name.to_s : "\"#{name}\""
     end
 
     def quote_string(string) #:nodoc:
@@ -329,6 +335,9 @@ module ::JdbcSpec
           %Q{empty_#{ column.sql_type.downcase rescue 'blob' }()}
         end
       else
+        if column.respond_to?(:primary) && column.primary
+          return value.to_i.to_s
+        end
         quoted = super
         if value.acts_like?(:date) || value.acts_like?(:time)
           quoted = "#{quoted_date(value)}"
@@ -353,7 +362,7 @@ module ::JdbcSpec
     # In Oracle, schemas are created under your username:
     # http://www.oracle.com/technology/obe/2day_dba/schema/schema.htm
     def oracle_schema
-      @config[:username].to_s
+      @config[:username].to_s if @config[:username]
     end
 
     def select(sql, name=nil)
@@ -365,3 +374,4 @@ module ::JdbcSpec
     end
   end
 end
+

data/lib/jdbc_adapter/jdbc_postgre.rb

@@ -4,7 +4,10 @@ module ::JdbcSpec
   $LOADED_FEATURES << "active_record/connection_adapters/postgresql_adapter.rb"
 
   module ActiveRecordExtensions
+    add_method_to_remove_from_ar_base(:postgresql_connection)
+
     def postgresql_connection(config)
+      require File.dirname(__FILE__) + "/../active_record/connection_adapters/postgresql_adapter"
       config[:host] ||= "localhost"
       config[:port] ||= 5432
       config[:url] ||= "jdbc:postgresql://#{config[:host]}:#{config[:port]}/#{config[:database]}"
@@ -87,10 +90,12 @@ module ::JdbcSpec
     def postgresql_version
       @postgresql_version ||=
         begin
-          select('SELECT version()').to_a[0][0] =~ /PostgreSQL (\d+)\.(\d+)\.(\d+)/
-          ($1.to_i * 10000) + ($2.to_i * 100) + $3.to_i
-        rescue
-          0
+          value = select_value('SELECT version()')
+          if value =~ /PostgreSQL (\d+)\.(\d+)\.(\d+)/
+            ($1.to_i * 10000) + ($2.to_i * 100) + $3.to_i
+          else
+            0
+          end
         end
     end
 
@@ -217,28 +222,36 @@ module ::JdbcSpec
       table = sql.split(" ", 4)[2].gsub('"', '')
 
       # Try an insert with 'returning id' if available (PG >= 8.2)
-      if supports_insert_with_returning?
+      if supports_insert_with_returning? && id_value.nil? && false # FIXME:
+        # Disabled, as it causes:
+        # ActiveRecord::ActiveRecordError: A result was returned when none was expected
+        # This was previously disabled because postgresql_version returned 0
         pk, sequence_name = *pk_and_sequence_for(table) unless pk
         if pk
-          id = select_value("#{sql} RETURNING #{quote_column_name(pk)}")
-          clear_query_cache
-          return id
+          id_value = select_value("#{sql} RETURNING #{quote_column_name(pk)}")
+          clear_query_cache #FIXME: Why now?
+          return id_value
         end
       end
 
-      # Otherwise, insert then grab last_insert_id.
+      # Otherwise, plain insert
       execute(sql, name)
 
-      # If neither pk nor sequence name is given, look them up.
-      unless pk || sequence_name
-        pk, sequence_name = *pk_and_sequence_for(table)
-      end
+      # Don't need to look up id_value if we already have it.
+      # (and can't in case of non-sequence PK)
+      unless id_value
+        # If neither pk nor sequence name is given, look them up.
+        unless pk || sequence_name
+          pk, sequence_name = *pk_and_sequence_for(table)
+        end
 
-      # If a pk is given, fallback to default sequence name.
-      # Don't fetch last insert id for a table without a pk.
-      if pk && sequence_name ||= default_sequence_name(table, pk)
-        last_insert_id(table, sequence_name)
+        # If a pk is given, fallback to default sequence name.
+        # Don't fetch last insert id for a table without a pk.
+        if pk && sequence_name ||= default_sequence_name(table, pk)
+          id_value = last_insert_id(table, sequence_name)
+        end
       end
+      id_value
     end
 
     def columns(table_name, name=nil)
@@ -332,7 +345,7 @@ module ::JdbcSpec
 
     def _execute(sql, name = nil)
         case sql.strip
-        when /\A\(?\s*(select|show)/i:
+        when /\A\(?\s*(select|show)/i then
           @connection.execute_query(sql)
         else
           @connection.execute_update(sql)
@@ -445,6 +458,13 @@ module ::JdbcSpec
       execute "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} SET DEFAULT '#{default}'"
     end
 
+    def change_column_null(table_name, column_name, null, default = nil)
+      unless null || default.nil?
+        execute("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL")
+      end
+      execute("ALTER TABLE #{quote_table_name(table_name)} ALTER #{quote_column_name(column_name)} #{null ? 'DROP' : 'SET'} NOT NULL")
+    end
+
     def rename_column(table_name, column_name, new_column_name) #:nodoc:
       execute "ALTER TABLE #{quote_table_name(table_name)} RENAME COLUMN #{quote_column_name(column_name)} TO #{quote_column_name(new_column_name)}"
     end

data/lib/jdbc_adapter/jdbc_sqlite3.rb

@@ -1,6 +1,13 @@
 module ::JdbcSpec
+  # Don't need to load native postgres adapter
+  $LOADED_FEATURES << "active_record/connection_adapters/sqlite3_adapter.rb"
+
   module ActiveRecordExtensions
+    add_method_to_remove_from_ar_base(:sqlite3_connection)
+
     def sqlite3_connection(config)
+      require File.dirname(__FILE__) + "/../active_record/connection_adapters/sqlite3_adapter"
+
       parse_sqlite3_config!(config)
 
       config[:url] ||= "jdbc:sqlite:#{config[:database]}"
@@ -34,12 +41,15 @@ module ::JdbcSpec
     end
 
     module Column
+      def init_column(name, default, *args)
+        @default = '' if default =~ /NULL/
+      end
 
       def type_cast(value)
         return nil if value.nil?
         case type
         when :string   then value
-        when :integer  then defined?(value.to_i) ? value.to_i : (value ? 1 : 0)
+        when :integer  then JdbcSpec::SQLite3::Column.cast_to_integer(value)
         when :primary_key then defined?(value.to_i) ? value.to_i : (value ? 1 : 0)
         when :float    then value.to_f
         when :datetime then JdbcSpec::SQLite3::Column.cast_to_date_or_time(value)
@@ -51,11 +61,23 @@ module ::JdbcSpec
         end
       end
 
+      def type_cast_code(var_name)
+        case type
+          when :integer  then "JdbcSpec::SQLite3::Column.cast_to_integer(#{var_name})"
+          when :datetime then "JdbcSpec::SQLite3::Column.cast_to_date_or_time(#{var_name})"
+          when :date     then "JdbcSpec::SQLite3::Column.cast_to_date_or_time(#{var_name})"
+          when :time     then "JdbcSpec::SQLite3::Column.cast_to_time(#{var_name})"
+        else
+          super
+        end
+      end
+
       private
       def simplified_type(field_type)
         case field_type
         when /boolean/i                        then :boolean
-        when /text/i                           then :string
+        when /text/i                           then :text
+        when /varchar/i                        then :string
         when /int/i                            then :integer
         when /float/i                          then :float
         when /real/i                           then @scale == 0 ? :integer : :decimal
@@ -89,6 +111,11 @@ module ::JdbcSpec
         value
       end
 
+      def self.cast_to_integer(value)
+        return nil if value =~ /NULL/ or value.to_s.empty? or value.nil?
+        return (value.to_i) ? value.to_i : (value ? 1 : 0)
+      end
+
       def self.cast_to_date_or_time(value)
         return value if value.is_a? Date
         return nil if value.blank?
@@ -125,7 +152,8 @@ module ::JdbcSpec
     end
 
     def modify_types(tp)
-      tp[:primary_key] = "INTEGER PRIMARY KEY AUTOINCREMENT"
+      tp[:primary_key] = "INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL"
+      tp[:string] = { :name => "VARCHAR", :limit => 255 }
       tp[:float] = { :name => "REAL" }
       tp[:decimal] = { :name => "REAL" }
       tp[:datetime] = { :name => "DATETIME" }
@@ -142,6 +170,10 @@ module ::JdbcSpec
       when String
         if column && column.type == :binary
           "'#{quote_string(column.class.string_to_binary(value))}'"
+        elsif column && [:integer, :float].include?(column.type)
+          (column.type == :integer ? value.to_i : value.to_f).to_s
+        elsif column && column.respond_to?(:primary) && column.primary
+          value.to_i.to_s
         else
           "'#{quote_string(value)}'"
         end
@@ -184,34 +216,38 @@ module ::JdbcSpec
       end
     end
 
-    def remove_column(table_name, column_name) #:nodoc:
-      cols = columns(table_name).collect {|col| col.name}
-      cols.delete(column_name)
-      cols = cols.join(', ')
-      table_backup = table_name + "_backup"
-
-      @connection.begin
-
-      execute "CREATE TEMPORARY TABLE #{table_backup}(#{cols})"
-      insert "INSERT INTO #{table_backup} SELECT #{cols} FROM #{table_name}"
-      execute "DROP TABLE #{table_name}"
-      execute "CREATE TABLE #{table_name}(#{cols})"
-      insert "INSERT INTO #{table_name} SELECT #{cols} FROM #{table_backup}"
-      execute "DROP TABLE #{table_backup}"
-
-      @connection.commit
+    def remove_column(table_name, *column_names) #:nodoc:
+      column_names.flatten.each do |column_name|
+        alter_table(table_name) do |definition|
+          definition.columns.delete(definition[column_name])
+        end
+      end
     end
+    alias :remove_columns :remove_column
 
     def change_column(table_name, column_name, type, options = {}) #:nodoc:
-      execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} #{type_to_sql(type, options[:limit])}"
+      alter_table(table_name) do |definition|
+        include_default = options_include_default?(options)
+        definition[column_name].instance_eval do
+          self.type    = type
+          self.limit   = options[:limit] if options.include?(:limit)
+          self.default = options[:default] if include_default
+          self.null    = options[:null] if options.include?(:null)
+        end
+      end
     end
 
     def change_column_default(table_name, column_name, default) #:nodoc:
-      execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET DEFAULT #{quote(default)}"
+      alter_table(table_name) do |definition|
+        definition[column_name].default = default
+      end
     end
 
     def rename_column(table_name, column_name, new_column_name) #:nodoc:
-      execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} RENAME TO #{new_column_name}"
+      unless columns(table_name).detect{|c| c.name == column_name.to_s }
+        raise ActiveRecord::ActiveRecordError, "Missing column #{table_name}.#{column_name}"
+      end
+      alter_table(table_name, :rename => {column_name.to_s => new_column_name.to_s})
     end
 
     def rename_table(name, new_name)
@@ -221,6 +257,7 @@ module ::JdbcSpec
     def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
       log(sql,name) do
         @connection.execute_update(sql)
+        clear_query_cache
       end
       table = sql.split(" ", 4)[2]
       id_value || last_insert_id(table, nil)
@@ -237,8 +274,16 @@ module ::JdbcSpec
       end
     end
 
-    def tables
-      @connection.tables.select {|row| row.to_s !~ /^sqlite_/i }
+    def tables(name = nil) #:nodoc:
+      sql = <<-SQL
+        SELECT name
+        FROM sqlite_master
+        WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+      SQL
+
+      select_rows(sql, name).map do |row|
+        row[0]
+      end
     end
 
     def remove_index(table_name, options = {})
@@ -256,6 +301,11 @@ module ::JdbcSpec
         ::ActiveRecord::ConnectionAdapters::IndexDefinition.new(table_name, name, unique, cols)
       end
     end
+    
+    def primary_key(table_name) #:nodoc:
+      column = table_structure(table_name).find {|field| field['pk'].to_i == 1}
+      column ? column['name'] : nil
+    end
 
     def recreate_database(name)
       tables.each{ |table| drop_table(table) }
@@ -269,7 +319,19 @@ module ::JdbcSpec
         ActiveRecord::ConnectionAdapters::JdbcConnection::insert?(sql) ? last_insert_id(sql.split(" ", 4)[2], nil) : affected_rows
       end
     end
-
+    
+    def select(sql, name=nil)
+      execute(sql, name).map do |row|
+        record = {}
+        row.each_key do |key|
+          if key.is_a?(String)
+            record[key.sub(/^"?\w+"?\./, '')] = row[key]
+          end
+        end
+        record
+      end
+    end
+    
     def table_structure(table_name)
       returning structure = @connection.execute_query("PRAGMA table_info(#{quote_table_name(table_name)})") do
         raise(ActiveRecord::StatementInvalid, "Could not find table '#{table_name}'") if structure.empty?
@@ -278,9 +340,17 @@ module ::JdbcSpec
     
     def columns(table_name, name = nil) #:nodoc:        
       table_structure(table_name).map do |field|
-        ::ActiveRecord::ConnectionAdapters::JdbcColumn.new(@config, field['name'], field['dflt_value'], field['type'], field['notnull'] == "0")
+        ::ActiveRecord::ConnectionAdapters::JdbcColumn.new(@config, field['name'], field['dflt_value'], field['type'], field['notnull'] == 0)
       end
     end
+    
+     # SELECT ... FOR UPDATE is redundant since the table is locked.
+    def add_lock!(sql, options) #:nodoc:
+      sql
+    end
+    
+    protected
+      include JdbcSpec::MissingFunctionalityHelper
   end
 end