activerecord-jdbc-adapter 0.9.2 → 1.1.0

data/lib/arjdbc/version.rb

@@ -0,0 +1,8 @@
+module ArJdbc
+  module Version
+    VERSION = "1.1.0"
+  end
+end
+# Compatibility with older versions of ar-jdbc for other extensions out there
+JdbcAdapter = ArJdbc
+JdbcSpec = ArJdbc

data/lib/generators/jdbc/jdbc_generator.rb

@@ -0,0 +1,9 @@
+class JdbcGenerator < Rails::Generators::Base
+  def self.source_root
+    @source_root ||= File.expand_path('../../../../rails_generators/templates', __FILE__)
+  end
+
+  def create_jdbc_files
+    directory '.', '.'
+  end
+end

data/lib/jdbc_adapter.rb

@@ -1,27 +1,2 @@
-if defined?(JRUBY_VERSION)
-  begin
-    tried_gem ||= false
-    require 'active_record/version'
-  rescue LoadError
-    raise if tried_gem
-    require 'rubygems'
-    gem 'activerecord'
-    tried_gem = true
-    retry
-  end
-  if ActiveRecord::VERSION::MAJOR < 2
-    if defined?(RAILS_CONNECTION_ADAPTERS)
-      RAILS_CONNECTION_ADAPTERS << %q(jdbc)
-    else
-      RAILS_CONNECTION_ADAPTERS = %w(jdbc)
-    end
-    if ActiveRecord::VERSION::MAJOR == 1 && ActiveRecord::VERSION::MINOR == 14
-      require 'active_record/connection_adapters/jdbc_adapter'
-    end
-  else
-    require 'active_record'
-    require 'active_record/connection_adapters/jdbc_adapter'
-  end
-else
-  warn "ActiveRecord-JDBC is for use with JRuby only"
-end
+warn "DEPRECATED: require 'arjdbc' instead of 'jdbc_adapter'."
+require 'arjdbc'

data/lib/jdbc_adapter/rake_tasks.rb

@@ -1,10 +1,3 @@
-if defined?(Rake.application) && Rake.application && ENV["SKIP_AR_JDBC_RAKE_REDEFINES"].nil?
-  jdbc_rakefile = File.dirname(__FILE__) + "/jdbc.rake"
-  if Rake.application.lookup("db:create")
-    # rails tasks already defined; load the override tasks now
-    load jdbc_rakefile
-  else
-    # rails tasks not loaded yet; load as an import
-    Rake.application.add_import(jdbc_rakefile)
-  end
-end
+warn "DEPRECATED: require 'arjdbc/rake_tasks' instead of 'jdbc_adapter/rake_tasks'."
+require 'arjdbc/jdbc/rake_tasks'
+

data/lib/jdbc_adapter/version.rb

@@ -1,5 +1,3 @@
-module JdbcAdapter
-  module Version
-    VERSION = "0.9.2"
-  end
-end
+warn "DEPRECATED: require 'arjdbc/version' instead of 'jdbc_adapter/version'."
+require 'arjdbc/version'
+

data/lib/pg.rb

@@ -1,4 +1,26 @@
 # Stub library for postgresql -- allows Rails to load
-# postgresql_adapter without error Other than postgres-pr, there's no
+# postgresql_adapter without error. Other than postgres-pr, there's no
 # other way to use PostgreSQL on JRuby anyway, right? If you've
 # installed ar-jdbc you probably want to use that to connect to pg.
+#
+# If by chance this library is installed in another Ruby and this file
+# got required then we'll just continue to try to load the next pg.rb
+# in the $LOAD_PATH.
+
+unless defined?(JRUBY_VERSION)
+  gem 'pg' if respond_to?(:gem)   # make sure pg gem is activated
+  after_current_file = false
+  $LOAD_PATH.each do |p|
+    require_file = File.join(p, 'pg.rb')
+
+    if File.expand_path(require_file) == File.expand_path(__FILE__)
+      after_current_file = true
+      next
+    end
+
+    if after_current_file && File.exist?(require_file)
+      load require_file
+      break
+    end
+  end
+end

data/rails_generators/jdbc_generator.rb

@@ -2,9 +2,9 @@ class JdbcGenerator < Rails::Generator::Base
   def manifest
     record do |m|
       m.directory 'config/initializers'
-      m.template 'jdbc.rb', File.join('config', 'initializers', 'jdbc.rb')
+      m.template 'config/initializers/jdbc.rb', File.join('config', 'initializers', 'jdbc.rb')
       m.directory 'lib/tasks'
-      m.template 'jdbc.rake', File.join('lib', 'tasks', 'jdbc.rake')
+      m.template 'lib/tasks/jdbc.rake', File.join('lib', 'tasks', 'jdbc.rake')
     end
   end
 

data/rails_generators/templates/{jdbc.rb → config/initializers/jdbc.rb}

@@ -4,4 +4,4 @@
 # 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.
-require 'jdbc_adapter' if defined?(JRUBY_VERSION)
+require 'arjdbc' if defined?(JRUBY_VERSION)

data/rails_generators/templates/{jdbc.rake → lib/tasks/jdbc.rake}

@@ -3,6 +3,6 @@
 #
 # This file allows you to use Rails' various db:* tasks with JDBC.
 if defined?(JRUBY_VERSION)
-  require 'jdbc_adapter'
-  require 'jdbc_adapter/rake_tasks'
+  require 'arjdbc'
+  require 'arjdbc/jdbc/rake_tasks'
 end

data/rakelib/compile.rake

@@ -12,12 +12,14 @@ def java_classpath_arg # myriad of ways to discover JRuby classpath
   jruby_cpath ? "-cp \"#{jruby_cpath}\"" : ""
 end
 
+jar_name = File.join(*%w(lib arjdbc jdbc adapter_java.jar))
+
 desc "Compile the native Java code."
 task :java_compile do
+  debug = ENV['DEBUG'] ? '-g' : ''
   pkg_classes = File.join(*%w(pkg classes))
-  jar_name = File.join(*%w(lib jdbc_adapter jdbc_adapter_internal.jar))
   mkdir_p pkg_classes
-  sh "javac -target 1.5 -source 1.5 -d pkg/classes #{java_classpath_arg} #{FileList['src/java/**/*.java'].join(' ')}"
+  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} ."
 end
-file "lib/jdbc_adapter/jdbc_adapter_internal.jar" => :java_compile
+file jar_name => :java_compile

data/rakelib/db.rake

@@ -0,0 +1,19 @@
+namespace :db do
+  task :load_arjdbc do
+    $LOAD_PATH.unshift 'test'
+    $LOAD_PATH.unshift 'lib'
+    require 'abstract_db_create'
+  end
+
+  desc "Creates the test database for MySQL."
+  task :mysql => :load_arjdbc do
+    load 'test/db/mysql.rb' rescue nil
+    def db_config
+      MYSQL_CONFIG
+    end
+    extend AbstractDbCreate
+    do_setup('arjdbc', nil)
+    Rake::Task['db:drop'].invoke rescue nil
+    Rake::Task['db:create'].invoke
+  end
+end

data/rakelib/package.rake

@@ -1,5 +1,5 @@
 MANIFEST = FileList["History.txt", "Manifest.txt", "README.txt",
-  "Rakefile", "LICENSE.txt", "lib/**/*.rb", "lib/jdbc_adapter/jdbc_adapter_internal.jar", "test/**/*.rb",
+  "Rakefile", "LICENSE.txt", "lib/**/*.rb", "lib/arjdbc/jdbc/adapter_java.jar", "test/**/*.rb",
    "lib/**/*.rake", "src/**/*.java", "rakelib/*.rake", "rails_generators/**/*"]
 
 file "Manifest.txt" => :manifest
@@ -8,11 +8,13 @@ task :manifest do
 end
 Rake::Task['manifest'].invoke # Always regen manifest, so Hoe has up-to-date list of files
 
-require File.dirname(__FILE__) + "/../lib/jdbc_adapter/version"
+require File.dirname(__FILE__) + "/../lib/arjdbc/version"
 begin
   require 'hoe'
+  Hoe.plugin :gemcutter
   hoe = Hoe.spec("activerecord-jdbc-adapter") do |p|
-    p.version = JdbcAdapter::Version::VERSION
+    p.version = ArJdbc::Version::VERSION
+    p.spec_extras[:files] = MANIFEST
     p.rubyforge_name = "jruby-extras"
     p.url = "http://jruby-extras.rubyforge.org/activerecord-jdbc-adapter"
     p.author = "Nick Sieger, Ola Bini and JRuby contributors"
@@ -21,9 +23,12 @@ begin
     p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
     p.description = p.paragraphs_of('README.txt', 0...1).join("\n\n")
   end
-  hoe.spec.files = MANIFEST
-  hoe.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
+  hoe.spec.rdoc_options += ["-SHN", "-f", "darkfish"]
 
+  task :gemspec do
+    File.open("#{hoe.name}.gemspec", "w") {|f| f << hoe.spec.to_ruby }
+  end
+  task :package => :gemspec
 rescue LoadError => le
   puts le.to_s, *le.backtrace
   puts "Problem loading Hoe; please check the error above to ensure that Hoe is installed correctly"
@@ -38,12 +43,13 @@ end
 %w(test package install_gem release clean).each do |task|
   desc "Run rake #{task} on all available adapters and drivers"
   task "all:#{task}" => task
+  task "adapters:#{task}" => task
 end
 
 (Dir["drivers/*/Rakefile"] + Dir["adapters/*/Rakefile"]).each do |rakefile|
   dir = File.dirname(rakefile)
   prefix = dir.sub(%r{/}, ':')
-  tasks = %w(package install_gem debug_gem clean)
+  tasks = %w(package install_gem debug_gem clean gemspec)
   tasks << "test" if File.directory?(File.join(dir, "test"))
   tasks.each do |task|
     desc "Run rake #{task} on #{dir}"

data/rakelib/test.rake

@@ -1,41 +1,51 @@
-require File.dirname(__FILE__) + '/../test/helper'
+require File.expand_path('../../test/helper', __FILE__)
 if defined?(JRUBY_VERSION)
-  databases = [:test_mysql, :test_jdbc, :test_derby, :test_hsqldb, :test_h2, :test_sqlite3]
+  databases = [:test_mysql, :test_jdbc, :test_sqlite3, :test_derby, :test_hsqldb, :test_h2]
   if find_executable?("psql") && `psql -c '\\l'` && $?.exitstatus == 0
     databases << :test_postgres
   end
+  if File.exist?('test/fscontext.jar')
+    databases << :test_jndi
+  end
   task :test => databases
 else
   task :test => [:test_mysql]
 end
 
-FileList['drivers/*'].each do |d|
-  next unless File.directory?(d)
-  driver = File.basename(d)
-  Rake::TestTask.new("test_#{driver}") do |t|
-    files = FileList["test/#{driver}*test.rb"]
-    if driver == "derby"
+def declare_test_task_for(adapter, options = {})
+  driver = options[:driver] || adapter
+  Rake::TestTask.new("test_#{adapter}") do |t|
+    files = FileList["test/#{adapter}*test.rb"]
+    if adapter == "derby"
       files << 'test/activerecord/connection_adapters/type_conversion_test.rb'
     end
     t.test_files = files
     t.libs = []
     if defined?(JRUBY_VERSION)
       t.ruby_opts << "-rjdbc/#{driver}"
-      t.libs << "lib" << "#{d}/lib"
-      t.libs.push *FileList["adapters/#{driver}*/lib"]
+      t.libs << "lib" << "drivers/#{driver}/lib"
+      t.libs.push *FileList["adapters/#{adapter}*/lib"]
     end
     t.libs << "test"
     t.verbose = true
   end
 end
 
+declare_test_task_for :derby
+declare_test_task_for :h2
+declare_test_task_for :hsqldb
+declare_test_task_for :mssql, :driver => :jtds
+declare_test_task_for :mysql
+declare_test_task_for :postgres
+declare_test_task_for :sqlite3
+
 Rake::TestTask.new(:test_jdbc) do |t|
-  t.test_files = FileList['test/generic_jdbc_connection_test.rb', 'test/jndi_callbacks_test.rb']
+  t.test_files = FileList['test/generic_jdbc_connection_test.rb']
   t.libs << 'test' << 'drivers/mysql/lib'
 end
 
 Rake::TestTask.new(:test_jndi) do |t|
-  t.test_files = FileList['test/jndi_test.rb']
+  t.test_files = FileList['test/jndi*_test.rb']
   t.libs << 'test' << 'drivers/derby/lib'
 end
 
@@ -43,9 +53,9 @@ task :test_postgresql => [:test_postgres]
 task :test_pgsql => [:test_postgres]
 
 # Ensure driver for these DBs is on your classpath
-%w(oracle db2 cachedb mssql informix).each do |d|
+%w(oracle db2 cachedb informix).each do |d|
   Rake::TestTask.new("test_#{d}") do |t|
-    t.test_files = FileList["test/#{d}_simple_test.rb"]
+    t.test_files = FileList["test/#{d}*_test.rb"]
     t.libs = []
     t.libs << 'lib' if defined?(JRUBY_VERSION)
     t.libs << 'test'

data/src/java/{jdbc_adapter/JdbcDerbySpec.java → arjdbc/derby/DerbyModule.java}

@@ -1,7 +1,7 @@
 /***** BEGIN LICENSE BLOCK *****
- * Copyright (c) 2006-2007 Nick Sieger <nick@nicksieger.com>
+ * Copyright (c) 2006-2007, 2010 Nick Sieger <nick@nicksieger.com>
  * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
- * 
+ *
  * 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
@@ -9,10 +9,10 @@
  * 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
@@ -22,33 +22,33 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  ***** END LICENSE BLOCK *****/
 
-package jdbc_adapter;
+package arjdbc.derby;
+
+import java.sql.SQLException;
+
+import arjdbc.jdbc.RubyJdbcConnection;
 
 import org.jruby.Ruby;
-import org.jruby.RubyModule;
-import org.jruby.RubyString;
-import org.jruby.RubyFloat;
-import org.jruby.RubyFixnum;
+import org.jruby.RubyBigDecimal;
 import org.jruby.RubyBignum;
 import org.jruby.RubyBoolean;
-import org.jruby.RubyBigDecimal;
-import org.jruby.RubyRange;
+import org.jruby.RubyFixnum;
+import org.jruby.RubyFloat;
+import org.jruby.RubyModule;
 import org.jruby.RubyNumeric;
-
-import org.jruby.runtime.builtin.IRubyObject;
-
-import org.jruby.util.ByteList;
-
-import java.sql.SQLException;
 import org.jruby.RubyObjectAdapter;
+import org.jruby.RubyRange;
+import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.ByteList;
 
-public class JdbcDerbySpec {
+public class DerbyModule {
     private static RubyObjectAdapter rubyApi;
-    public static void load(RubyModule jdbcSpec, RubyObjectAdapter adapter) {
-        RubyModule derby = jdbcSpec.defineModuleUnder("Derby");
-        derby.defineAnnotatedMethods(JdbcDerbySpec.class);
+    public static void load(RubyModule arJdbc, RubyObjectAdapter adapter) {
+        RubyModule derby = arJdbc.defineModuleUnder("Derby");
+        derby.defineAnnotatedMethods(DerbyModule.class);
         RubyModule column = derby.defineModuleUnder("Column");
         column.defineAnnotatedMethods(Column.class);
         rubyApi = adapter;
@@ -111,6 +111,10 @@ public class JdbcDerbySpec {
         if (args.length > 1) {
             IRubyObject col = args[1];
             String type = rubyApi.callMethod(col, "type").toString();
+            // intercept and change value, maybe, if the column type is :text or :string
+            if (type.equals("text") || type.equals("string")) {
+            	value = make_ruby_string_for_text_column(context, recv, runtime, value);
+            }
             if (value instanceof RubyString) {
                 if (type.equals("string")) {
                     return quote_string_with_surround(runtime, "'", (RubyString)value, "'");
@@ -131,35 +135,60 @@ public class JdbcDerbySpec {
                     return quote_string_with_surround(runtime, "'", RubyString.objAsString(context, value), "'");
                 }
             }
-        } 
+        }
         return super_quote(context, recv, runtime, value, runtime.getNil());
     }
 
-    private final static ByteList NULL = new ByteList("NULL".getBytes());
+    /* 
+     * Derby is not permissive like MySql. Try and send an Integer to a CLOB or VARCHAR column and Derby will vomit.
+     * This method turns non stringy things into strings.
+     */
+    private static IRubyObject make_ruby_string_for_text_column(ThreadContext context, IRubyObject recv, Ruby runtime, IRubyObject value) {
+    	RubyModule multibyteChars = (RubyModule) 
+        ((RubyModule) ((RubyModule) runtime.getModule("ActiveSupport")).getConstant("Multibyte")).getConstantAt("Chars");
+		if (value instanceof RubyString || rubyApi.isKindOf(value, multibyteChars) || value.isNil()) {
+			return value;
+		}
+		if (value instanceof RubyBoolean) {
+            return value.isTrue() ? runtime.newString("1") : runtime.newString("0");
+		} else if (value instanceof RubyFloat || value instanceof RubyFixnum || value instanceof RubyBignum) {
+			return RubyString.objAsString(context, value);
+		} else if ( value instanceof RubyBigDecimal) {
+			return rubyApi.callMethod(value, "to_s", runtime.newString("F"));
+		} else {
+			if (rubyApi.callMethod(value, "acts_like?", runtime.newString("date")).isTrue() || rubyApi.callMethod(value, "acts_like?", runtime.newString("time")).isTrue()) {
+	            return (RubyString)rubyApi.callMethod(recv, "quoted_date", value); 
+	        } else {
+	            return (RubyString)rubyApi.callMethod(value, "to_yaml");
+	        }
+		}
+	}
+
+	private final static ByteList NULL = new ByteList("NULL".getBytes());
 
     private static IRubyObject super_quote(ThreadContext context, IRubyObject recv, Ruby runtime, IRubyObject value, IRubyObject col) {
         if (value.respondsTo("quoted_id")) {
             return rubyApi.callMethod(value, "quoted_id");
         }
-        
+
         IRubyObject type = (col.isNil()) ? col : rubyApi.callMethod(col, "type");
-        RubyModule multibyteChars = (RubyModule) 
+        RubyModule multibyteChars = (RubyModule)
                 ((RubyModule) ((RubyModule) runtime.getModule("ActiveSupport")).getConstant("Multibyte")).getConstantAt("Chars");
         if (value instanceof RubyString || rubyApi.isKindOf(value, multibyteChars)) {
             RubyString svalue = RubyString.objAsString(context, value);
             if (type == runtime.newSymbol("binary") && col.getType().respondsTo("string_to_binary")) {
-                return quote_string_with_surround(runtime, "'", (RubyString)(rubyApi.callMethod(col.getType(), "string_to_binary", svalue)), "'"); 
+                return quote_string_with_surround(runtime, "'", (RubyString)(rubyApi.callMethod(col.getType(), "string_to_binary", svalue)), "'");
             } else if (type == runtime.newSymbol("integer") || type == runtime.newSymbol("float")) {
                 return RubyString.objAsString(context, ((type == runtime.newSymbol("integer")) ?
-                                               rubyApi.callMethod(svalue, "to_i") : 
+                                               rubyApi.callMethod(svalue, "to_i") :
                                                rubyApi.callMethod(svalue, "to_f")));
             } else {
-                return quote_string_with_surround(runtime, "'", svalue, "'"); 
+                return quote_string_with_surround(runtime, "'", svalue, "'");
             }
         } else if (value.isNil()) {
             return runtime.newString(NULL);
         } else if (value instanceof RubyBoolean) {
-            return (value.isTrue() ? 
+            return (value.isTrue() ?
                     (type == runtime.newSymbol(":integer")) ? runtime.newString("1") : rubyApi.callMethod(recv, "quoted_true") :
                     (type == runtime.newSymbol(":integer")) ? runtime.newString("0") : rubyApi.callMethod(recv, "quoted_false"));
         } else if((value instanceof RubyFloat) || (value instanceof RubyFixnum) || (value instanceof RubyBignum)) {
@@ -167,7 +196,7 @@ public class JdbcDerbySpec {
         } else if(value instanceof RubyBigDecimal) {
             return rubyApi.callMethod(value, "to_s", runtime.newString("F"));
         } else if (rubyApi.callMethod(value, "acts_like?", runtime.newString("date")).isTrue() || rubyApi.callMethod(value, "acts_like?", runtime.newString("time")).isTrue()) {
-            return quote_string_with_surround(runtime, "'", (RubyString)(rubyApi.callMethod(recv, "quoted_date", value)), "'"); 
+            return quote_string_with_surround(runtime, "'", (RubyString)(rubyApi.callMethod(recv, "quoted_date", value)), "'");
         } else {
             return quote_string_with_surround(runtime, "'", (RubyString)(rubyApi.callMethod(value, "to_yaml")), "'");
         }
@@ -231,14 +260,14 @@ public class JdbcDerbySpec {
     public static IRubyObject quote_string(IRubyObject recv, IRubyObject string) {
         boolean replacementFound = false;
         ByteList bl = ((RubyString) string).getByteList();
-        
+
         for(int i = bl.begin; i < bl.begin + bl.realSize; i++) {
             switch (bl.bytes[i]) {
             case '\'': break;
             default: continue;
             }
-            
-            // On first replacement allocate a different bytelist so we don't manip original 
+
+            // On first replacement allocate a different bytelist so we don't manip original
             if(!replacementFound) {
                 i-= bl.begin;
                 bl = new ByteList(bl);
@@ -284,7 +313,7 @@ public class JdbcDerbySpec {
         }
         if (sql.startsWith("insert")) {
             return conn.execute_insert(context, args[0]);
-        } else if (sql.startsWith("select") || sql.startsWith("show")) {
+        } else if (sql.startsWith("select") || sql.startsWith("show") || sql.startsWith("values")) {
             return conn.execute_query(context, args[0]);
         } else {
             return conn.execute_update(context, args[0]);