activerecord-jdbc-adapter 5.0.pre1 → 51.0

data/rakelib/rails.rake

@@ -1,77 +1,76 @@
-namespace :rails do
-  
-  task :test do
-    raise "need a DRIVER e.g. DRIVER=mysql" unless driver = ENV['DRIVER'] || ENV['ADAPTER']
-    raise "need location of RAILS source code e.g. RAILS=../rails" unless rails_dir = ENV['RAILS']
-    rails_dir = File.join(rails_dir, '..') if rails_dir =~ /activerecord$/
-    activerecord_dir = File.join(rails_dir, 'activerecord') # rails/activerecord
+DEFAULT_RAILS_DIR = File.join('..', 'rails')
+DEFAULT_ADAPTERS = %w(MySQL SQLite3 Postgres)
 
-    ar_jdbc_dir = File.expand_path('..', File.dirname(__FILE__))
-    
-    ruby_lib = [ 
-      "#{ar_jdbc_dir}/lib",
-      "#{ar_jdbc_dir}/test/rails",
-      "#{ar_jdbc_dir}/jdbc-#{_driver(driver)}/lib",
-      "#{ar_jdbc_dir}/activerecord-jdbc#{_adapter(driver)}-adapter/lib"
-    ]
-    ruby_lib << File.expand_path('activesupport/lib', rails_dir)
-    ruby_lib << File.expand_path('activemodel/lib', rails_dir)
-    ruby_lib << File.expand_path(File.join(activerecord_dir, 'lib'))
-    requires = _requires(driver) || []
+namespace :rails do
+  namespace :test do
+    task :all do
+      driver = ENV['DRIVER'] || ENV['ADAPTER']
+      raise "need a DRIVER (DRIVER=mysql)" unless driver
+      rails_dir = _rails_dir
+      ENV['ARCONFIG'] = File.join(_ar_jdbc_dir, 'test', 'rails', 'config.yml')
 
-    Dir.chdir(activerecord_dir) do
-      ruby = FileUtils::RUBY
-      rubylib = ruby_lib.join(':') # i_lib = "-I#{rubylib}"
-      r_requires = requires.map { |feat| "-r#{feat}" }.join(' ')
-      sh "#{ruby} -S rake RUBYLIB=#{rubylib} RUBYOPT=\"#{r_requires}\" #{_target(driver)}"
+      sh "cd #{File.join(rails_dir, 'activerecord')}; #{FileUtils::RUBY} -S rake RUBYLIB=#{_ruby_lib(rails_dir, driver)} #{_target(driver)}"
     end
-  end
-  
-  %w(MySQL SQLite3 Postgres).each do |adapter|
-    desc "Run Rails' ActiveRecord tests with #{adapter} (JDBC)"
-    task "test_#{adapter.downcase}" do
-      ENV['ADAPTER'] = adapter; Rake::Task['rails:test'].invoke
+
+    DEFAULT_ADAPTERS.each do |adapter|
+      desc "Run Rails ActiveRecord tests with #{adapter} (JDBC)"
+      task adapter.downcase do
+        ENV['ADAPTER'] = adapter
+        Rake::Task['rails:test:all'].invoke
+      end
+
+      namespace adapter.downcase do
+        desc "Runs Rails ActiveRecord base_test.rb with #{adapter}"
+        task "base_test" do
+          ENV['TEST'] ||= "test/cases/base_test.rb"
+          ENV['ADAPTER'] = adapter
+          Rake::Task['rails:test:all'].invoke
+        end
+      end
     end
-  end
-  
-  private
-  
-  def _adapter(name)
-    case name
-    when /postgres/i
-      'postgresql'
-    else
-      name.downcase
+
+    private
+
+    def _ar_jdbc_dir
+      @ar_jdbc_dir ||= File.expand_path('..', File.dirname(__FILE__))
     end
-  end
 
-  def _driver(name)
-    case name
-    when /postgres/i
-      'postgres'
-    else
-      name.downcase
+    def _rails_dir
+      rails_dir = ENV['RAILS'] || DEFAULT_RAILS_DIR
+      unless File.directory? rails_dir
+        raise "can't find RAILS source '#{rails_dir}' (maybe set ENV['RAILS'])"
+      end
+      rails_dir = File.join(rails_dir, '..') if rails_dir =~ /activerecord$/
+      rails_dir
     end
-  end
 
-  def _target(name)
-    case name
-    when /postgres/i
-      'test_jdbcpostgresql'
-    else
-      "test_jdbc#{name.downcase}"
+    def _ruby_lib(rails_dir, driver)
+      ar_jdbc_dir = _ar_jdbc_dir
+
+      if driver =~ /postgres/i
+        adapter, driver = 'postgresql', 'postgres'
+      else
+        adapter = driver.downcase
+        driver = adapter
+      end
+
+      [File.join(ar_jdbc_dir, 'lib'),
+       File.join(ar_jdbc_dir, 'test', 'rails'),
+       File.join(ar_jdbc_dir, "jdbc-#{driver}", 'lib'),
+       File.join(ar_jdbc_dir, "activerecord-jdbc#{adapter}-adapter", 'lib'),
+       File.expand_path('activesupport/lib', rails_dir),
+       File.expand_path('activemodel/lib', rails_dir),
+       File.expand_path('activerecord/lib', rails_dir)
+      ].join(':')
     end
-  end
 
-  def _requires(name)
-    requires = []
-    requires << 'ubygems'
-    requires << 'active_support/json' # avoid uninitialized constant BasicsTest::JSON
-    case name
-    when /mysql/i
-      requires << 'mysql' # -rmysql - so Rails tests do not complain about Mysql
+    def _target(name)
+      case name
+      when /postgres/i
+        'test_postgresql'
+      else
+        "test_jdbc#{name.downcase}"
+      end
     end
-    requires
   end
-  
 end

data/src/java/arjdbc/firebird/FirebirdRubyJdbcConnection.java

@@ -70,27 +70,11 @@ public class FirebirdRubyJdbcConnection extends RubyJdbcConnection {
         return RubyString.newUnicodeString(runtime, value);
     }
 
-    @Override // booleans are emulated can not setNull(index, Types.BOOLEAN)
-    protected void setBooleanParameter(final ThreadContext context,
-        final Connection connection, final PreparedStatement statement,
-        final int index, final Object value,
-        final IRubyObject column, final int type) throws SQLException {
-        if ( value instanceof IRubyObject ) {
-            setBooleanParameter(context, connection, statement, index, (IRubyObject) value, column, type);
-        }
-        else {
-            if ( value == null ) statement.setNull(index, Types.CHAR);
-            else {
-                statement.setBoolean(index, ((Boolean) value).booleanValue());
-            }
-        }
-    }
-
     @Override // booleans are emulated can not setNull(index, Types.BOOLEAN)
     protected void setBooleanParameter(final ThreadContext context,
         final Connection connection, final PreparedStatement statement,
         final int index, final IRubyObject value,
-        final IRubyObject column, final int type) throws SQLException {
+        final IRubyObject attribute, final int type) throws SQLException {
         if ( value.isNil() ) statement.setNull(index, Types.CHAR);
         else {
             statement.setBoolean(index, value.isTrue());