activerecord-jdbc-adapter 0.7 → 0.7.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.7.1
+
+- Add adapter and driver for H2 courtesy of Caleb Land
+- Fix "undefined method `last' for {}:Hash" error introduced with new Rake 0.8.1 (JRUBY-1859)
+
 == 0.7
 
 - PLEASE NOTE: This release is not compatible with JRuby releases earlier than

data/Manifest.txt

@@ -22,6 +22,7 @@ lib/jdbc_adapter/jdbc_mysql.rb
 lib/jdbc_adapter/jdbc_oracle.rb
 lib/jdbc_adapter/jdbc_postgre.rb
 lib/jdbc_adapter/missing_functionality_helper.rb
+lib/jdbc_adapter/rake_tasks.rb
 lib/jdbc_adapter/version.rb
 lib/jdbc_adapter.rb
 lib/jdbc_adapter/jdbc_adapter_internal.jar
@@ -59,7 +60,6 @@ test/mysql_multibyte_test.rb
 test/mysql_simple_test.rb
 test/postgres_simple_test.rb
 test/simple.rb
-lib/tasks/jdbc_databases.rake
 src/java/jdbc_adapter/JdbcAdapterInternalService.java
 src/java/jdbc_adapter/JdbcConnectionFactory.java
 src/java/jdbc_adapter/JdbcDerbySpec.java

data/README.txt

@@ -25,6 +25,7 @@ What's there, and what is not there:
   * remove_column
   * rename_column
 * HSQLDB - Complete
+* H2 - Complete
 
 Other databases will require testing and likely a custom configuration module. Please join the jruby-extras mailing-list[http://rubyforge.org/mail/?group_id=2014] to help us discover support for more databases.
 
@@ -41,6 +42,7 @@ To use ActiveRecord-JDBC with JRuby on Rails:
   * postgresql (<tt>activerecord-jdbcpostgresql-adapter</tt>)
   * derby (<tt>activerecord-jdbcderby-adapter</tt>)
   * hsqldb (<tt>activerecord-jdbchsqldb-adapter</tt>)
+  * h2 (<tt>activerecord-jdbch2-adapter</tt>)
 
 2. If you're using Rails 2.0, you may skip to the next step. For Rails prior to version 2.0, you'll need to add one-time setup to your config/environment.rb file in your Rails application. Add the following lines just before the <code>Rails::Initializer</code>. (If you're using ActiveRecord-JDBC under the old gem name used in versions 0.5 and earlier, replace 'activerecord-jdbc-adapter' with 'ActiveRecord-JDBC' below.)
 

data/Rakefile

@@ -18,9 +18,11 @@ end
 
 desc "Compile the native Java code."
 task :java_compile do
-  mkdir_p "pkg/classes"
+  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.4 -source 1.4 -d pkg/classes #{java_classpath_arg} #{FileList['src/java/**/*.java'].join(' ')}"
-  sh "jar cf lib/jdbc_adapter/jdbc_adapter_internal.jar -C pkg/classes/ ."
+  sh "jar cf #{jar_name} -C #{pkg_classes} ."
 end
 file "lib/jdbc_adapter/jdbc_adapter_internal.jar" => :java_compile
 
@@ -40,7 +42,7 @@ end
 
 if RUBY_PLATFORM =~ /java/
   # TODO: add more databases into the standard tests here.
-  task :test => [:test_mysql, :test_jdbc, :test_derby, :test_hsqldb]
+  task :test => [:test_mysql, :test_jdbc, :test_derby, :test_hsqldb, :test_h2]
 else
   task :test => [:test_mysql]
 end

data/lib/active_record/connection_adapters/jdbc_adapter.rb

@@ -4,6 +4,11 @@ require 'active_record/connection_adapters/jdbc_adapter_spec'
 require 'jdbc_adapter/jdbc_adapter_internal'
 require 'bigdecimal'
 
+begin
+  require 'jdbc_adapter/rake_tasks'
+rescue LoadError
+end if defined?(RAILS_ROOT)
+
 module ActiveRecord
   module ConnectionAdapters # :nodoc:
     module SchemaStatements

data/lib/jdbc_adapter.rb

@@ -19,14 +19,6 @@ if RUBY_PLATFORM =~ /java/
       require 'active_record/connection_adapters/jdbc_adapter'
     end
   end
-  if defined?(RAILS_ROOT)
-    to_file = File.expand_path(File.join(RAILS_ROOT, 'lib', 'tasks', 'jdbc_databases.rake'))
-    from_file = File.expand_path(File.join(File.dirname(__FILE__), 'tasks', 'jdbc_databases.rake'))
-    if !File.exist?(to_file) || (File.mtime(to_file) < File.mtime(from_file))
-      require 'fileutils'
-      FileUtils.cp from_file, to_file, :verbose => true
-    end
-  end
 else
   warn "ActiveRecord-JDBC is for use with JRuby only"
 end

data/lib/jdbc_adapter/jdbc_hsqldb.rb

@@ -164,5 +164,9 @@ module ::JdbcSpec
     def tables
       @connection.tables.select {|row| row.to_s !~ /^system_/i }
     end
+
+    def remove_index(table_name, options = {})
+      execute "DROP INDEX #{quote_column_name(index_name(table_name, options))}"
+    end
   end
 end

data/lib/jdbc_adapter/jdbc_mysql.rb

@@ -7,7 +7,11 @@ module ::JdbcSpec
         warn "AR-JDBC MySQL on JRuby does not support sockets"
       end
       config[:port] ||= 3306
-      config[:url] ||= "jdbc:mysql://#{config[:host]}:#{config[:port]}/#{config[:database]}?#{MySQL::URL_OPTIONS}"
+      if config[:url]
+        config[:url] = config[:url]['?'] ? "#{config[:url]}&#{MySQL::URL_OPTIONS}" : "#{config[:url]}?#{MySQL::URL_OPTIONS}"
+      else
+        config[:url] = "jdbc:mysql://#{config[:host]}:#{config[:port]}/#{config[:database]}?#{MySQL::URL_OPTIONS}"
+      end
       config[:driver] = "com.mysql.jdbc.Driver"
       jdbc_connection(config)
     end
@@ -207,4 +211,4 @@ module ::JdbcSpec
       false
     end
   end
-end
+end

data/lib/{tasks/jdbc_databases.rake → jdbc_adapter/rake_tasks.rb}

@@ -1,42 +1,21 @@
-
-# Task redefine code from public domain
-module Rake
-  module TaskManager
-    def redefine_task(task_class, args, &block)
-      task_name, deps = resolve_args(args)
-      task_name = task_class.scope_name(@scope, task_name)
-      deps = [deps] unless deps.respond_to?(:to_ary)
-      deps = deps.collect {|d| d.to_s }
-      task = @tasks[task_name.to_s] = task_class.new(task_name, self)
-      task.application = self
-      task.add_comment(@last_comment)
-      @last_comment = nil
-      task.enhance(deps, &block)
-      task
-    end
-  end
-  class Task
-    class << self
-      def redefine_task(args, &block)
-        Rake.application.redefine_task(self, args, &block)
-      end
-    end
+if defined?(namespace) && RUBY_PLATFORM =~ /java/ && ENV["SKIP_AR_JDBC_RAKE_REDEFINES"].nil?
+  def redefine_task(*args, &block)
+    task_name = Hash === args.first ? args.first.keys[0] : args.first
+    existing_task = Rake::Task[task_name]
+    class << existing_task; public :instance_variable_set; end
+    existing_task.instance_variable_set "@prerequisites", FileList[]
+    existing_task.instance_variable_set "@actions", []
+    task(*args, &block)
   end
-end
-
-def redefine_task(args, &block)
-  Rake::Task.redefine_task(args, &block)
-end
 
-if RUBY_PLATFORM =~ /java/
   namespace :db do
-    redefine_task :drop => :environment do 
-      begin 
+    redefine_task :drop => :environment do
+      begin
         config = ActiveRecord::Base.configurations[environment_name]
         ActiveRecord::Base.establish_connection(config)
         db = ActiveRecord::Base.connection.database_name
         ActiveRecord::Base.connection.recreate_database(db)
-      rescue  
+      rescue
       end
     end
 
@@ -66,7 +45,6 @@ if RUBY_PLATFORM =~ /java/
         db = ActiveRecord::Base.connection.database_name
         ActiveRecord::Base.connection.recreate_database(db)
       end
-    end  
+    end
   end
 end
-

data/lib/jdbc_adapter/version.rb

@@ -1,5 +1,5 @@
 module JdbcAdapter
   module Version
-    VERSION = "0.7"
+    VERSION = "0.7.1"
   end
 end

data/src/java/jdbc_adapter/JdbcAdapterInternalService.java

@@ -668,7 +668,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
             int[] col_scale = new int[col_count];
 
             for(int i=0;i<col_count;i++) {
-                col_names[i] = runtime.newString(metadata.getColumnName(i+1).toLowerCase());
+                col_names[i] = RubyString.newUnicodeString(runtime, metadata.getColumnName(i+1).toLowerCase());
                 col_types[i] = metadata.getColumnType(i+1);
                 col_scale[i] = metadata.getScale(i+1);
             }
@@ -707,7 +707,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
                 if(storesUpper && !HAS_SMALL.matcher(s1).find()) {
                     s1 = s1.toLowerCase();
                 }
-                col_names[i] = runtime.newString(s1);
+                col_names[i] = RubyString.newUnicodeString(runtime, s1);
                 col_types[i] = metadata.getColumnType(i+1);
                 col_scale[i] = metadata.getScale(i+1);
             }
@@ -741,7 +741,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
             int[] col_scale = new int[col_count];
 
             for (int i=0;i<col_count;i++) {
-                col_names[i] = runtime.newString(metadata.getColumnName(i+1));
+                col_names[i] = RubyString.newUnicodeString(runtime, metadata.getColumnName(i+1));
                 col_types[i] = metadata.getColumnType(i+1);
                 col_scale[i] = metadata.getScale(i+1);
             }

data/test/h2_simple_test.rb

@@ -1,6 +1,5 @@
 require 'jdbc_common'
 require 'db/h2'
-require 'db/logger'
 
 class H2SimpleTest < Test::Unit::TestCase
   include SimpleTestMethods

data/test/simple.rb

@@ -167,6 +167,18 @@ module MultibyteTestMethods
     super
   end
 
+  def test_multibyte_aliasing
+    str = "テスト"
+    quoted_alias = Entry.connection.quote_column_name(str)
+    sql = "SELECT title AS #{quoted_alias} from entries"
+    records = Entry.connection.select_all(sql)
+    records.each do |rec|
+      rec.keys.each do |key|
+        assert_equal str, key
+      end
+    end
+  end
+  
   def test_select_multibyte_string
     @java_con.createStatement().execute("insert into entries (title, content) values ('テスト', '本文')")
     entry = Entry.find(:first)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version 
-  version: "0.7"
-date: 2007-12-15 00:00:00 -06:00
+  version: 0.7.1
+date: 2008-01-06 00:00:00 -06:00
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.
 require_paths: 
 - lib
@@ -53,6 +53,7 @@ files:
 - lib/jdbc_adapter/jdbc_oracle.rb
 - lib/jdbc_adapter/jdbc_postgre.rb
 - lib/jdbc_adapter/missing_functionality_helper.rb
+- lib/jdbc_adapter/rake_tasks.rb
 - lib/jdbc_adapter/version.rb
 - lib/jdbc_adapter.rb
 - lib/jdbc_adapter/jdbc_adapter_internal.jar
@@ -90,7 +91,6 @@ files:
 - test/mysql_simple_test.rb
 - test/postgres_simple_test.rb
 - test/simple.rb
-- lib/tasks/jdbc_databases.rake
 - src/java/jdbc_adapter/JdbcAdapterInternalService.java
 - src/java/jdbc_adapter/JdbcConnectionFactory.java
 - src/java/jdbc_adapter/JdbcDerbySpec.java