activerecord-jdbc-adapter 1.2.0 → 1.2.1

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - jruby
+branches:
+  only:
+    - master

data/Gemfile.lock

@@ -24,7 +24,7 @@ GEM
     mocha (0.9.8)
       rake
     multi_json (1.0.3)
-    rake (0.9.2)
+    rake (0.9.2.2)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)

data/History.txt

@@ -1,3 +1,13 @@
+== 1.2.1 (11/23/11)
+
+- #117: Skip ? substitution when no bind parameters are given
+- #115: Work around bug in ResultSetMetaData in SQLite
+- Enhance the 'change_column' in H2 adapter to support additional options
+- Deal with changes in RubyBigDecimal in trunk
+- Decimal with scale zero handling (George Murphy)
+- Fix blob handling for SQLite3 since SQLiteJDBC does not support
+  getBinary (Jean-Dominique Morani)
+
 == 1.2.0 (09/13/11)
 
 - Support for Rails 3.1

data/Rakefile

@@ -6,11 +6,11 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 require 'bundler/setup'
 
-task :default => [:java_compile, :test]
+task :default => [:jar, :test]
 
 #ugh, bundler doesn't use tasks, so gotta hook up to both tasks.
-task :build => :java_compile
-task :install => :java_compile
+task :build => :jar
+task :install => :jar
 
 ADAPTERS = %w[derby h2 hsqldb mssql mysql postgresql sqlite3].map {|a| "activerecord-jdbc#{a}-adapter" }
 DRIVERS  = %w[derby h2 hsqldb jtds mysql postgres sqlite3].map {|a| "jdbc-#{a}" }
@@ -44,13 +44,13 @@ end
   end
 end
 
-desc "Build all adapters"
+desc "Release all adapters"
 task "all:release" => ["release", *ADAPTERS.map { |f| "#{f}:release" }]
 
 desc "Install all adapters"
 task "all:install" => ["install", *ADAPTERS.map { |f| "#{f}:install" }]
 
-desc "Release all adapters"
+desc "Build all adapters"
 task "all:build"   => ["build", *ADAPTERS.map { |f| "#{f}:build" }]
 
 task :filelist do

data/lib/arel/visitors/firebird.rb

@@ -4,12 +4,19 @@ module Arel
   module Visitors
     class Firebird < Arel::Visitors::ToSql
       def visit_Arel_Nodes_SelectStatement o
-        [
+        lim_off = [
+          ("FIRST #{visit(o.limit.expr)}" if o.limit),
+          ("SKIP #{visit(o.offset.expr)}" if o.offset)
+        ].compact.join(' ').strip
+
+        sql = [
          o.cores.map { |x| visit_Arel_Nodes_SelectCore x }.join,
          ("ORDER BY #{o.orders.map { |x| visit x }.join(', ')}" unless o.orders.empty?),
-         ("ROWS #{limit_for(o.limit)} " if o.limit),
-         ("TO #{o.offset} " if o.offset),
         ].compact.join ' '
+
+        sql.sub!(/\A(\s*SELECT\s)/i, '\&' + lim_off + ' ') unless lim_off.empty?
+
+        sql
       end
 
     end

data/lib/arjdbc/derby/adapter.rb

@@ -40,7 +40,6 @@ module ::ArJdbc
         case field_type
         when /smallint/i  then :boolean
         when /real/i      then :float
-        when /decimal/i   then :decimal
         else
           super
         end

data/lib/arjdbc/h2/adapter.rb

@@ -29,7 +29,24 @@ module ArJdbc
       @connection.columns_internal(table_name.to_s, name, h2_schema)
     end
 
+    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])}"
+      change_column_default(table_name, column_name, options[:default]) if options_include_default?(options)
+      change_column_null(table_name, column_name, options[:null], options[:default]) if options.key?(:null)
+    end
+
     private
+    def change_column_null(table_name, column_name, null, default = nil)
+      if !null && !default.nil?
+        execute("UPDATE #{table_name} SET #{column_name}=#{quote(default)} WHERE #{column_name} IS NULL")
+      end
+      if null
+        execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET NULL"
+      else
+        execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET NOT NULL"
+      end
+    end
+
     def h2_schema
       @config[:schema] || ''
     end

data/lib/arjdbc/hsqldb/adapter.rb

@@ -11,7 +11,6 @@ module ::ArJdbc
         when /longvarchar/i then :text
         when /tinyint/i  then :boolean
         when /real/i     then :float
-        when /decimal/i  then :decimal
         else
           super
         end
@@ -71,7 +70,7 @@ module ::ArJdbc
         if respond_to?(:h2_adapter) && value.empty?
           "''"
         elsif column && column.type == :binary
-          "'#{value.unpack("H*")}'"
+          "'#{value.unpack("H*")[0]}'"
         elsif column && (column.type == :integer ||
                          column.respond_to?(:primary) && column.primary && column.klass != String)
           value.to_i.to_s

data/lib/arjdbc/jdbc/type_converter.rb

@@ -34,7 +34,7 @@ module ActiveRecord
                           lambda {|r| r['type_name'] =~ /^number$/i},
                           lambda {|r| r['type_name'] =~ /^real$/i},
                           lambda {|r| r['precision'] == '38'},
-                          lambda {|r| r['data_type'] == '2'}],
+                          lambda {|r| r['data_type'].to_i == Jdbc::Types::DECIMAL}],
         :float       => [ lambda {|r| [Jdbc::Types::FLOAT,Jdbc::Types::DOUBLE, Jdbc::Types::REAL].include?(r['data_type'].to_i)},
                           lambda {|r| r['data_type'].to_i == Jdbc::Types::REAL}, #Prefer REAL to DOUBLE for Postgresql
                           lambda {|r| r['type_name'] =~ /^float/i},
@@ -67,7 +67,7 @@ module ActiveRecord
                           lambda {|r| r['type_name'] =~ /^binary$/i}, ],
         :boolean     => [ lambda {|r| [Jdbc::Types::TINYINT].include?(r['data_type'].to_i)},
                           lambda {|r| r['type_name'] =~ /^bool/i},
-                          lambda {|r| r['data_type'] == '-7'},
+                          lambda {|r| r['data_type'].to_i == Jdbc::Types::BIT},
                           lambda {|r| r['type_name'] =~ /^tinyint$/i},
                           lambda {|r| r['type_name'] =~ /^decimal$/i},
                           lambda {|r| r['type_name'] =~ /^integer$/i}]

data/lib/arjdbc/mysql/adapter.rb

@@ -3,7 +3,7 @@ require 'active_record/connection_adapters/abstract/schema_definitions'
 module ::ArJdbc
   module MySQL
     def self.column_selector
-      [/mysql/i, lambda {|cfg,col| col.extend(::ArJdbc::MySQL::Column)}]
+      [/mysql/i, lambda {|cfg,col| col.extend(::ArJdbc::MySQL::ColumnExtensions)}]
     end
 
     def self.extended(adapter)
@@ -18,7 +18,7 @@ module ::ArJdbc
       ::ActiveRecord::ConnectionAdapters::MySQLJdbcConnection
     end
 
-    module Column
+    module ColumnExtensions
       def extract_default(default)
         if sql_type =~ /blob/i || type == :text
           if default.blank?
@@ -42,7 +42,7 @@ module ::ArJdbc
         case field_type
         when /tinyint\(1\)|bit/i then :boolean
         when /enum/i             then :string
-        when /decimal/i          then :decimal
+        when /year/i             then :integer
         else
           super
         end
@@ -61,6 +61,7 @@ module ::ArJdbc
           else
             nil # we could return 65535 here, but we leave it undecorated by default
           end
+        when /^enum/i;     255
         when /^bigint/i;    8
         when /^int/i;       4
         when /^mediumint/i; 3
@@ -131,30 +132,16 @@ module ::ArJdbc
       end
     end
 
+    def quote_column_name(name)
+      "`#{name.to_s.gsub('`', '``')}`"
+    end
+    
     def quoted_true
-        "1"
+      "1"
     end
 
     def quoted_false
-        "0"
-    end
-
-    def begin_db_transaction #:nodoc:
-      @connection.begin
-    rescue Exception
-      # Transactions aren't supported
-    end
-
-    def commit_db_transaction #:nodoc:
-      @connection.commit
-    rescue Exception
-      # Transactions aren't supported
-    end
-
-    def rollback_db_transaction #:nodoc:
-      @connection.rollback
-    rescue Exception
-      # Transactions aren't supported
+      "0"
     end
 
     def supports_savepoints? #:nodoc:
@@ -208,7 +195,7 @@ module ::ArJdbc
     def jdbc_columns(table_name, name = nil)#:nodoc:
       sql = "SHOW FIELDS FROM #{quote_table_name(table_name)}"
       execute(sql, :skip_logging).map do |field|
-        ::ActiveRecord::ConnectionAdapters::MysqlColumn.new(field["Field"], field["Default"], field["Type"], field["Null"] == "YES")
+        ::ActiveRecord::ConnectionAdapters::MysqlAdapter::Column.new(field["Field"], field["Default"], field["Type"], field["Null"] == "YES")
       end
     end
 
@@ -308,8 +295,8 @@ module ::ArJdbc
 
     def show_variable(var)
       res = execute("show variables like '#{var}'")
-      row = res.detect {|row| row["Variable_name"] == var }
-      row && row["Value"]
+      result_row = res.detect {|row| row["Variable_name"] == var }
+      result_row && result_row["Value"]
     end
 
     def charset
@@ -391,21 +378,6 @@ module ActiveRecord::ConnectionAdapters
   remove_const(:MysqlColumn) if const_defined?(:MysqlColumn)
   remove_const(:MysqlAdapter) if const_defined?(:MysqlAdapter)
 
-  class MysqlColumn < JdbcColumn
-    include ArJdbc::MySQL::Column
-
-    def initialize(name, *args)
-      if Hash === name
-        super
-      else
-        super(nil, name, *args)
-      end
-    end
-
-    def call_discovered_column_callbacks(*)
-    end
-  end
-
   class MysqlAdapter < JdbcAdapter
     include ArJdbc::MySQL
 
@@ -419,17 +391,36 @@ module ActiveRecord::ConnectionAdapters
     end
 
     def jdbc_column_class
-      ActiveRecord::ConnectionAdapters::MysqlColumn
+      ActiveRecord::ConnectionAdapters::MysqlAdapter::Column
     end
 
     alias_chained_method :columns, :query_cache, :jdbc_columns
 
+    remove_const(:Column) if const_defined?(:Column)
+    class Column < JdbcColumn
+      include ArJdbc::MySQL::ColumnExtensions
+
+      def initialize(name, *args)
+        if Hash === name
+          super
+        else
+          super(nil, name, *args)
+        end
+      end
+
+      def call_discovered_column_callbacks(*)
+      end
+    end
+    
     protected
     def exec_insert(sql, name, binds)
       binds = binds.dup
 
       # Pretend to support bind parameters
-      execute sql.gsub('?') { quote(*binds.shift.reverse) }, name
+      unless binds.empty?
+        sql = sql.gsub('?') { quote(*binds.shift.reverse) }
+      end
+      execute sql, name
     end
     alias :exec_update :exec_insert
     alias :exec_delete :exec_insert

data/lib/arjdbc/postgresql/adapter.rb

@@ -44,6 +44,7 @@ module ::ArJdbc
         return :integer if field_type =~ /^(big|)serial/i
         return :string if field_type =~ /\[\]$/i || field_type =~ /^interval/i
         return :string if field_type =~ /^(?:point|lseg|box|"?path"?|polygon|circle)/i
+        return :string if field_type =~ /^uuid/i
         return :datetime if field_type =~ /^timestamp/i
         return :float if field_type =~ /^(?:real|double precision)$/i
         return :binary if field_type =~ /^bytea/i
@@ -494,7 +495,7 @@ module ::ArJdbc
     end
 
     def quote_column_name(name)
-      %("#{name}")
+      %("#{name.to_s.gsub("\"", "\"\"")}")
     end
 
     def quoted_date(value) #:nodoc:
@@ -615,3 +616,36 @@ module ::ArJdbc
   end
 end
 
+module ActiveRecord::ConnectionAdapters
+  remove_const(:PostgreSQLAdapter) if const_defined?(:PostgreSQLAdapter)
+
+  class PostgreSQLColumn < JdbcColumn
+    include ArJdbc::PostgreSQL::Column
+
+    def initialize(name, *args)
+      if Hash === name
+        super
+      else
+        super(nil, name, *args)
+      end
+    end
+
+    def call_discovered_column_callbacks(*)
+    end
+  end
+
+  class PostgreSQLAdapter < JdbcAdapter
+    include ArJdbc::PostgreSQL
+
+    def jdbc_connection_class(spec)
+      ::ArJdbc::PostgreSQL.jdbc_connection_class
+    end
+
+    def jdbc_column_class
+      ActiveRecord::ConnectionAdapters::PostgreSQLColumn
+    end
+    
+    alias_chained_method :insert, :query_dirty, :pg_insert
+    alias_chained_method :columns, :query_cache, :pg_columns
+  end
+end

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_class] = ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
       config[:adapter_spec] = ::ArJdbc::PostgreSQL
       conn = jdbc_connection(config)
       conn.execute("SET SEARCH_PATH TO #{config[:schema_search_path]}") if config[:schema_search_path]

data/lib/arjdbc/sqlite3/adapter.rb

@@ -120,7 +120,7 @@ module ::ArJdbc
     end
 
     def quote_column_name(name) #:nodoc:
-      %Q("#{name}")
+      %Q("#{name.to_s.gsub('"', '""')}")
     end
 
     def quote_string(str)
@@ -152,7 +152,7 @@ module ::ArJdbc
     end
 
     def last_insert_id
-      Integer(select_value("SELECT last_insert_rowid()"))
+      @connection.last_insert_row_id
     end
 
     def tables(name = nil) #:nodoc:

data/lib/arjdbc/version.rb

@@ -1,6 +1,6 @@
 module ArJdbc
   module Version
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end
 # Compatibility with older versions of ar-jdbc for other extensions out there

data/rakelib/bundler_ext.rb

@@ -0,0 +1,11 @@
+module Bundler
+  class GemHelper
+    def guard_already_tagged
+      # parent project performs the tag
+    end
+    def tag_version
+      Bundler.ui.confirm "Parent project tagged #{version_tag}"
+      yield if block_given?
+    end
+  end
+end

data/rakelib/compile.rake

@@ -1,25 +1,23 @@
-def java_classpath_arg # myriad of ways to discover JRuby classpath
-  begin
-    cpath  = Java::java.lang.System.getProperty('java.class.path').split(File::PATH_SEPARATOR)
-    cpath += Java::java.lang.System.getProperty('sun.boot.class.path').split(File::PATH_SEPARATOR)
-    jruby_cpath = cpath.compact.join(File::PATH_SEPARATOR)
-  rescue => e
-  end
-  unless jruby_cpath
-    jruby_cpath = ENV['JRUBY_PARENT_CLASSPATH'] || ENV['JRUBY_HOME'] &&
-      FileList["#{ENV['JRUBY_HOME']}/lib/*.jar"].join(File::PATH_SEPARATOR)
-  end
-  jruby_cpath ? "-cp \"#{jruby_cpath}\"" : ""
-end
+jar_file = File.join(*%w(lib arjdbc jdbc adapter_java.jar))
+begin
+  require 'ant'
+  directory "pkg/classes"
+  CLEAN << "pkg"
 
-jar_name = File.join(*%w(lib arjdbc jdbc adapter_java.jar))
+  file jar_file => FileList['src/java/**/*.java', 'pkg/classes'] do
+    rm_rf FileList['pkg/classes/**/*']
+    ant.javac :srcdir => "src/java", :destdir => "pkg/classes",
+      :source => "1.5", :target => "1.5", :debug => true,
+      :classpath => "${java.class.path}:${sun.boot.class.path}",
+      :includeantRuntime => false
 
-desc "Compile the native Java code."
-task :java_compile do
-  debug = ENV['DEBUG'] ? '-g' : ''
-  pkg_classes = File.join(*%w(pkg classes))
-  mkdir_p pkg_classes
-  sh "javac -target 1.5 -source 1.5 #{debug} -d pkg/classes #{java_classpath_arg} #{FileList['src/java/**/*.java'].join(' ')}"
-  sh "jar cf #{jar_name} -C #{pkg_classes} ."
+    ant.jar :basedir => "pkg/classes", :destfile => jar_file, :includes => "**/*.class"
+  end
+
+  desc "Compile the native Java code."
+  task :jar => jar_file
+rescue LoadError
+  task :jar do
+    puts "Run 'jar' with JRuby to re-compile the agent extension class"
+  end
 end
-file jar_name => :java_compile