activerecord-jdbc-adapter 1.3.0.beta1 → 1.3.0.beta2

data/rails_generators/jdbc_generator.rb

@@ -10,6 +10,6 @@ class JdbcGenerator < Rails::Generator::Base
 
   protected
   def banner
-    "Usage: #{$0} jdbc\nGenerate JDBC bootstrapping files for your Rails application."
+    "Usage: #{$0} jdbc\nGenerate JDBC bootstrapping files for your Rails (2.x) application."
   end
 end

data/rails_generators/templates/config/initializers/jdbc.rb

@@ -1,7 +1,10 @@
-# This file was generated by the "jdbc" generator, which is provided
-# by the activerecord-jdbc-adapter gem.
+# This file was generated by the "jdbc" generator, which is provided by the 
+# activerecord-jdbc-adapter gem.
 #
-# This file allows the JDBC drivers to be hooked into ActiveRecord
-# such that you don't have to change anything else in your Rails
-# application.
+# This file allows the JDBC adapters to be hooked into ActiveRecord such that 
+# you don't have to change anything else in your Rails application.
+# 
+# NOTE: This is only needed on Rails 2.x - without Bundler since when you're
+# using Bundler than `gem 'activerecord-jdbc-adapter'` will automatically 
+# `require 'arjdbc'` by default (unless you set it to `require: false`).
 require 'arjdbc' if defined?(JRUBY_VERSION)

data/rails_generators/templates/lib/tasks/jdbc.rake

@@ -1,8 +1,11 @@
-# This file was generated by the "jdbc" generator, which is provided
-# by the activerecord-jdbc-adapter gem.
+# This file was generated by the "jdbc" generator, which is provided by the 
+# activerecord-jdbc-adapter gem.
 #
-# This file allows you to use Rails' various db:* tasks with JDBC.
+# This file allows you to use Rails' various db:* tasks with the JDBC adapters.
+# 
+# NOTE: Only needed on Rails 2.x and it's fine to delete this file otherwise,
+# since on Rails 3.x AR-JDBC provides a Railtie that loads the Rake tasks.
 if defined?(JRUBY_VERSION)
   require 'arjdbc'
-  require 'arjdbc/jdbc/rake_tasks'
+  require 'arjdbc/tasks'
 end

data/rakelib/02-test.rake

@@ -1,4 +1,5 @@
-require File.expand_path('../../test/helper', __FILE__)
+require File.expand_path('../../test/shared_helper', __FILE__)
+
 if defined?(JRUBY_VERSION)
   databases = [ :test_mysql, :test_sqlite3, :test_derby, :test_hsqldb, :test_h2 ]
   databases << :test_postgres if PostgresHelper.have_postgres?(false)
@@ -20,9 +21,8 @@ def set_compat_version(task)
   end
 end
 
-%w(derby h2 hsqldb mysql sqlite3 postgres mssql oracle db2 informix sybase).each do 
-  |adapter| 
-  task "test_#{adapter}_pre" do
+%w(derby h2 hsqldb mysql sqlite3 postgres mssql oracle db2 as400 informix sybase).each do 
+  |adapter| task "test_#{adapter}_pre" do
     unless (ENV['BUNDLE_GEMFILE'] rescue '') =~ /gemfiles\/.*?\.gemfile/
       appraisals = []; Appraisal::File.each { |file| appraisals << file.name }
       puts "Specify AR version with `rake appraisal:{version} test_#{adapter}'" + 
@@ -56,9 +56,7 @@ def declare_test_task_for(adapter, options = {}, &block)
   end
 end
 
-declare_test_task_for :derby do |task|
-  task.test_files << 'test/activerecord/connection_adapters/type_conversion_test.rb'
-end
+declare_test_task_for :derby
 declare_test_task_for :h2
 declare_test_task_for :hsqldb
 declare_test_task_for :mssql, :driver => :jtds
@@ -81,16 +79,26 @@ declare_test_task_for :sqlite3
   end
 end
 
-Rake::TestTask.new(:test_jdbc) do |t|
-  t.test_files = FileList['test/generic_jdbc_connection_test.rb']
-  t.libs << 'test' << 'jdbc-mysql/lib' << 'jdbc-derby/lib'
-  set_compat_version(t)
+Rake::TestTask.new(:test_as400) do |task|
+  test_files = FileList["test/db2*_test.rb"]
+  test_files += FileList["test/db/db2/*_test.rb"]
+  task.test_files = test_files
+  task.libs = []
+  task.libs << 'lib' if defined?(JRUBY_VERSION)
+  task.libs << 'test'
+  set_compat_version(task)
+end
+
+Rake::TestTask.new(:test_jdbc) do |task|
+  task.test_files = FileList['test/*jdbc_*test.rb']
+  task.libs << 'test' << 'jdbc-mysql/lib' << 'jdbc-derby/lib'
+  set_compat_version(task)
 end
 
-Rake::TestTask.new(:test_jndi => 'tomcat-jndi:check') do |t|
-  t.test_files = FileList['test/jndi_test.rb']
-  t.libs << 'test' << 'jdbc-derby/lib'
-  set_compat_version(t)
+Rake::TestTask.new(:test_jndi => 'tomcat-jndi:check') do |task|
+  task.test_files = FileList['test/*jndi_*test.rb']
+  task.libs << 'test' << 'jdbc-derby/lib'
+  set_compat_version(task)
 end
 
 # tests for JDBC adapters that don't require a database :
@@ -113,3 +121,22 @@ Rake::TestTask.new(:test_sybase_jconnect) do |task|
   task.libs << 'test'
   set_compat_version(task)
 end
+
+Rake::TraceOutput.module_eval do
+
+  # NOTE: avoid TypeError: String can't be coerced into Fixnum
+  # due this method gettings a strings == [ 1 ] argument ...
+  def trace_on(out, *strings)
+    sep = $\ || "\n"
+    if strings.empty?
+      output = sep
+    else
+      output = strings.map { |s|
+        next if s.nil?; s = s.to_s
+        s =~ /#{sep}$/ ? s : s + sep
+      }.join
+    end
+    out.print(output)
+  end
+  
+end

data/rakelib/compile.rake

@@ -15,7 +15,34 @@ begin
       :classpath => "${java.class.path}:${sun.boot.class.path}:#{driver_jars.join(':')}",
       :includeantRuntime => false
 
-    ant.jar :basedir => "pkg/classes", :destfile => jar_file, :includes => "**/*.class"
+    ant.tstamp do |ts|
+      ts.format(:property => 'TODAY', :pattern => 'yyyy-MM-dd HH:mm:ss')
+    end
+    
+    require 'arjdbc/version'
+    gem_version = Gem::Version.create(ArJdbc::VERSION)
+    if gem_version.segments.last == 'DEV'
+      version = gem_version.segments[0...-1] # 1.3.0.DEV -> 1.3.0
+    else
+      version = gem_version.segments.dup
+    end
+    version = version.join('.')
+    
+    ant.manifest :file => 'MANIFEST.MF' do |mf|
+      mf.attribute :name => 'Built-By', :value => '${user.name}'
+      mf.attribute :name => 'Built-Time', :value => '${TODAY}'
+      mf.attribute :name => 'Built-Jdk', :value => '${java.version}'
+      mf.attribute :name => 'Built-JRuby', :value => JRUBY_VERSION
+      
+      mf.attribute :name => 'Specification-Title', :value => 'ActiveRecord-JDBC'
+      mf.attribute :name => 'Specification-Version', :value => '1.3'
+      mf.attribute :name => 'Specification-Vendor', :value => 'JRuby'
+      mf.attribute :name => 'Implementation-Version', :value => version
+      mf.attribute :name => 'Implementation-Vendor', :value => 'The JRuby Team'
+    end
+    
+    ant.jar :basedir => "pkg/classes", :includes => "**/*.class", 
+            :destfile => jar_file, :manifest => 'MANIFEST.MF'
   end
 
   desc "Compile the native Java code."
@@ -23,7 +50,7 @@ begin
   
   namespace :jar do
     task :force do
-      rm jar_file
+      rm jar_file if File.exist?(jar_file)
       Rake::Task['jar'].invoke
     end
   end

data/rakelib/db.rake

@@ -1,4 +1,5 @@
-require File.expand_path '../../test/helper', __FILE__
+require File.expand_path('../../test/shared_helper', __FILE__)
+
 namespace :db do
   desc "Creates the test database for MySQL."
   task :mysql do

data/rakelib/rails.rake

@@ -8,17 +8,23 @@ namespace :rails do
 
     ar_jdbc_dir = File.expand_path('..', File.dirname(__FILE__))
     
-    rubylib = [ 
+    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"
     ]
-    rubylib << File.expand_path('activesupport/lib', rails_dir)
-    rubylib << File.expand_path('activemodel/lib', rails_dir)
-    rubylib << File.expand_path(File.join(activerecord_dir, 'lib'))
-    #rubylib << File.expand_path('actionpack/lib', rails_dir)
+    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) || []
 
-    Dir.chdir(activerecord_dir) { rake "RUBYLIB=#{rubylib.join(':')}", "#{_target(driver)}" }
+    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)}"
+    end
   end
   
   %w(MySQL SQLite3 Postgres).each do |adapter|
@@ -56,5 +62,16 @@ namespace :rails do
       "test_jdbc#{name.downcase}"
     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
+    end
+    requires
+  end
   
 end

data/src/java/arjdbc/ArJdbcModule.java

@@ -0,0 +1,175 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2013 Karol Bucek.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package arjdbc;
+
+import arjdbc.jdbc.RubyJdbcConnection;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+
+import org.jruby.NativeException;
+import org.jruby.Ruby;
+import org.jruby.RubyArray;
+import org.jruby.RubyClass;
+import org.jruby.RubyModule;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.exceptions.RaiseException;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+
+/**
+ * ::ArJdbc
+ * 
+ * @author kares
+ */
+public class ArJdbcModule {
+    
+    public static RubyModule load(final Ruby runtime) {
+        final RubyModule arJdbc = runtime.getOrCreateModule("ArJdbc");
+        arJdbc.defineAnnotatedMethods( ArJdbcModule.class );
+        return arJdbc;
+    }
+
+    /**
+     * Load the Java parts for the given adapter spec module, e.g. to load 
+     * ArJdbc::MySQL's Java part: <code>ArJdbc.load_java_part :MySQL</code>
+     * 
+     * NOTE: this method is not intended to be called twice for a given adapter !
+     * @param context
+     * @param self
+     * @param args ( moduleName, [ connectionClass, moduleClass ] )
+     * @return true
+     */
+    @JRubyMethod(name = "load_java_part", meta = true, required = 1, optional = 2)
+    public static IRubyObject load_java_part(final ThreadContext context, 
+        final IRubyObject self, final IRubyObject[] args) {
+        
+        String connectionClass = args.length > 1 ? args[1].toString() : null;
+        String moduleClass = args.length > 2 ? args[2].toString() : null;
+        
+        final String moduleName = args[0].toString(); // e.g. 'MySQL'
+        final String packagePrefix = "arjdbc." + moduleName.toLowerCase() + "."; // arjdbc.mysql
+        
+        // NOTE: due previous (backwards compatible) conventions there are
+        // 2 things we load, the adapter spec module's Java implemented methods
+        // and a custom JdbcConnection class (both are actually optional) e.g. :
+        //
+        //   MySQLModule.load(RubyModule); // 'arjdbc.mysql' package is assumed
+        //   MySQLRubyJdbcConnection.createMySQLJdbcConnectionClass(Ruby, RubyClass);
+        //
+        
+        String connectionClass2 = null;
+        if (connectionClass == null) {
+             // 'arjdbc.mysql.' + 'MySQL' + 'RubyJdbcConnection'
+            connectionClass = packagePrefix + moduleName + "RubyJdbcConnection";
+            connectionClass2 = packagePrefix + moduleName + "JdbcConnection";
+        }
+        if (moduleClass == null) {
+             // 'arjdbc.mysql.' + 'MySQL' + 'Module'
+            moduleClass = packagePrefix + moduleName + "Module";
+        }
+        
+        final Ruby runtime = context.getRuntime();
+        final RubyModule arJdbc = runtime.getModule("ArJdbc");
+        
+        try {
+            final Class<?> module = Class.forName(moduleClass);
+             // MySQLModule.load( arJdbc ) :
+            module.getMethod("load", RubyModule.class).invoke(null, arJdbc);
+        }
+        catch (ClassNotFoundException e) { /* ignored */ }
+        catch (NoSuchMethodException e) {
+            throw newNativeException(runtime, e);
+        }
+        catch (IllegalAccessException e) {
+            throw newNativeException(runtime, e);
+        }
+        catch (InvocationTargetException e) {
+            throw newNativeException(runtime, e);
+        }
+        
+        try {
+            Class<?> connection = null;
+            try {
+                connection = Class.forName(connectionClass);
+            }
+            catch (ClassNotFoundException e) {
+                if ( connectionClass2 != null ) {
+                    connection = Class.forName(connectionClass2);
+                }
+            }
+            if ( connection != null ) {
+                final String method = "create" + moduleName + "JdbcConnectionClass";
+                // MySQLRubyJdbcConnection.createMySQLJdbcConnectionClass(runtime, jdbcConnection)
+                connection.getMethod(method, Ruby.class, RubyClass.class).
+                    invoke(null, runtime, RubyJdbcConnection.getJdbcConnectionClass(runtime));
+            }
+        }
+        catch (ClassNotFoundException e) { /* ignored */ }
+        catch (NoSuchMethodException e) {
+            throw newNativeException(runtime, e);
+        }
+        catch (IllegalAccessException e) {
+            throw newNativeException(runtime, e);
+        }
+        catch (InvocationTargetException e) {
+            throw newNativeException(runtime, e);
+        }
+        
+        return runtime.getTrue();
+    }
+    
+    /**
+     * <code>ArJdbc.modules</code>
+     * @param context
+     * @param self
+     * @return nested constant values that are modules
+     */
+    @JRubyMethod(name = "modules", meta = true)
+    public static IRubyObject modules(final ThreadContext context, final IRubyObject self) {
+        final Ruby runtime = context.getRuntime();
+        final RubyModule arJdbc = (RubyModule) self;
+        
+        final Collection<String> constants = arJdbc.getConstantNames();
+        final RubyArray modules = runtime.newArray( constants.size() );
+        
+        for ( final String name : constants ) {
+           IRubyObject value = arJdbc.getConstant(name, false);
+           // isModule: return false for Ruby Classes
+           if ( value != null && value.isModule() ) {
+               if ( "MissingFunctionalityHelper".equals(name) ) continue;
+               if ( "Version".equals(name) ) continue;
+               modules.append(value);
+           }
+        }
+        return modules;
+    }
+    
+    private static RaiseException newNativeException(final Ruby runtime, final Throwable cause) {
+        RubyClass nativeClass = runtime.getClass(NativeException.CLASS_NAME);
+        NativeException nativeException = new NativeException(runtime, nativeClass, cause);
+        throw new RaiseException(cause, nativeException);
+    }
+    
+}

data/src/java/arjdbc/db2/DB2Module.java

@@ -40,9 +40,10 @@ import org.jruby.runtime.builtin.IRubyObject;
  */
 public class DB2Module {
     
-    public static void load(final RubyModule arJdbc) {
+    public static RubyModule load(final RubyModule arJdbc) {
         RubyModule db2 = arJdbc.defineModuleUnder("DB2");
         db2.defineAnnotatedMethods( DB2Module.class );
+        return db2;
     }
     
     @JRubyMethod(name = "quote_string", required = 1, frame = false)

data/src/java/arjdbc/derby/DerbyModule.java

@@ -45,14 +45,14 @@ import org.jruby.util.ByteList;
 
 public class DerbyModule {
     
-    private static RubyObjectAdapter rubyApi;
+    static final RubyObjectAdapter rubyApi = JavaEmbedUtils.newObjectAdapter();
     
-    public static void load(final RubyModule arJdbc) {
+    public static RubyModule load(final RubyModule arJdbc) {
         RubyModule derby = arJdbc.defineModuleUnder("Derby");
-        derby.defineAnnotatedMethods(DerbyModule.class);
+        derby.defineAnnotatedMethods( DerbyModule.class );
         RubyModule column = derby.defineModuleUnder("Column");
         column.defineAnnotatedMethods(Column.class);
-        rubyApi = JavaEmbedUtils.newObjectAdapter();
+        return derby;
     }
 
     public static class Column {
@@ -306,29 +306,10 @@ public class DerbyModule {
             final IRubyObject self) {
         return RubyString.newString(context.getRuntime(), BYTES_0);
     }
-    
-    @JRubyMethod(name = "select_all", rest = true)
-    public static IRubyObject select_all(IRubyObject recv, IRubyObject[] args) {
-        return rubyApi.callMethod(recv, "execute", args);
-    }
-
-    @JRubyMethod(name = "select_one", rest = true)
-    public static IRubyObject select_one(IRubyObject recv, IRubyObject[] args) {
-        IRubyObject limit = rubyApi.getInstanceVariable(recv, "@limit");
-        if (limit == null || limit.isNil()) {
-            rubyApi.setInstanceVariable(recv, "@limit", recv.getRuntime().newFixnum(1));
-        }
-        try {
-            IRubyObject result = rubyApi.callMethod(recv, "execute", args);
-            return rubyApi.callMethod(result, "first");
-        } finally {
-            rubyApi.setInstanceVariable(recv, "@limit", recv.getRuntime().getNil());
-        }
-    }
 
     @JRubyMethod(name = "_execute", required = 1, optional = 1)
     public static IRubyObject _execute(final ThreadContext context, final IRubyObject self, final IRubyObject[] args) 
-        throws SQLException, java.io.IOException {
+        throws SQLException {
         final IRubyObject sql = args[0];
         
         String sqlStr = sql.toString().trim();