JRuby fixes for test suite.

Gemfile

@@ -2,4 +2,14 @@ source :rubygems
 
 gemspec
 
-gem 'rcov', '0.9.8', :platform => :mri_18
+gem 'rcov',       '0.9.8',     :platform => :mri_18
+
+platforms :ruby do
+  gem 'mysql2', '~> 0.2.11'
+  gem 'pg',     '0.9.0'
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter',      '~> 1.1.3'
+  gem 'activerecord-jdbcpostgresql-adapter', '~> 1.1.3'
+end

Rakefile

@@ -21,7 +21,7 @@ end
 namespace :cucumber do
   def add_task(name, description)
     Cucumber::Rake::Task.new(name, description) do |t|
-      t.cucumber_opts = "--format pretty features/*.feature DATABASE=#{name}"
+      t.cucumber_opts = "--format pretty DATABASE=#{name}"
     end
   end
 

lib/thinking_sphinx/adapters/abstract_adapter.rb

@@ -3,12 +3,12 @@ class AbstractAdapter
     def initialize(model)
       @model = model
     end
-    
+
     def setup
       # Deliberately blank - subclasses should do something though. Well, if
       # they need to.
     end
-      
+
     def self.detect(model)
       adapter = adapter_for_model model
       case adapter
@@ -22,7 +22,7 @@ def self.detect(model)
         raise "Invalid Database Adapter: Sphinx only supports MySQL and PostgreSQL, not #{adapter}"
       end
     end
-    
+
     def self.adapter_for_model(model)
       case ThinkingSphinx.database_adapter
       when String
@@ -35,7 +35,7 @@ def self.adapter_for_model(model)
         ThinkingSphinx.database_adapter
       end
     end
-    
+
     def self.standard_adapter_for_model(model)
       case model.connection.class.name
       when "ActiveRecord::ConnectionAdapters::MysqlAdapter",
@@ -52,34 +52,34 @@ def self.standard_adapter_for_model(model)
         when "jdbcpostgresql"
           :postgresql
         else
-          model.connection.config[:adapter]
+          model.connection.config[:adapter].to_sym
         end
       else
         model.connection.class.name
       end
     end
-    
+
     def quote_with_table(column)
       "#{@model.quoted_table_name}.#{@model.connection.quote_column_name(column)}"
     end
-    
+
     def bigint_pattern
       /bigint/i
     end
-    
+
     def downcase(clause)
       "LOWER(#{clause})"
     end
-    
+
     def case(expression, pairs, default)
       "CASE #{expression} " +
       pairs.keys.inject('') { |string, key|
         string + "WHEN '#{key}' THEN #{pairs[key]} "
       } + "ELSE #{default} END"
     end
-    
+
     protected
-    
+
     def connection
       @connection ||= @model.connection
     end

lib/thinking_sphinx/adapters/postgresql_adapter.rb

@@ -4,11 +4,11 @@ def setup
       create_array_accum_function
       create_crc32_function
     end
-    
+
     def sphinx_identifier
       "pgsql"
     end
-    
+
     def concatenate(clause, separator = ' ')
       if clause[/^COALESCE/]
         clause.split('), ').join(") || '#{separator}' || ")
@@ -18,31 +18,31 @@ def concatenate(clause, separator = ' ')
         }.join(" || '#{separator}' || ")
       end
     end
-    
+
     def group_concatenate(clause, separator = ' ')
       "array_to_string(array_accum(COALESCE(#{clause}, '0')), '#{separator}')"
     end
-    
+
     def cast_to_string(clause)
       clause
     end
-    
+
     def cast_to_datetime(clause)
       if ThinkingSphinx::Configuration.instance.use_64_bit
         "cast(extract(epoch from #{clause}) as bigint)"
       else
         "cast(extract(epoch from #{clause}) as int)"
       end
     end
-    
+
     def cast_to_unsigned(clause)
       clause
     end
-    
+
     def cast_to_int(clause)
       "#{clause}::INT8"
     end
-    
+
     def convert_nulls(clause, default = '')
       default = case default
       when String
@@ -54,34 +54,44 @@ def convert_nulls(clause, default = '')
       else
         default
       end
-      
+
       "COALESCE(#{clause}, #{default})"
     end
-    
+
     def boolean(value)
       value ? 'TRUE' : 'FALSE'
     end
-    
+
     def crc(clause, blank_to_null = false)
       clause = "NULLIF(#{clause},'')" if blank_to_null
       "crc32(#{clause})"
     end
-    
+
     def utf8_query_pre
       nil
     end
-    
+
     def time_difference(diff)
       "current_timestamp - interval '#{diff} seconds'"
     end
-    
+
     def utc_query_pre
       "SET TIME ZONE 'UTC'"
     end
-    
+
     private
-    
+
     def execute(command, output_error = false)
+      if RUBY_PLATFORM == 'java'
+        connection.transaction do
+          execute_command command, output_error
+        end
+      else
+        execute_command command, output_error
+      end
+    end
+
+    def execute_command(command, output_error = false)
       connection.execute "begin"
       connection.execute "savepoint ts"
       begin
@@ -93,7 +103,7 @@ def execute(command, output_error = false)
       connection.execute "release savepoint ts"
       connection.execute "commit"
     end
-    
+
     def create_array_accum_function
       if connection.raw_connection.respond_to?(:server_version) && connection.raw_connection.server_version > 80200
         execute <<-SQL
@@ -116,7 +126,7 @@ def create_array_accum_function
         SQL
       end
     end
-    
+
     def create_crc32_function
       execute "CREATE LANGUAGE 'plpgsql';"
       function = <<-SQL
@@ -131,7 +141,7 @@ def create_crc32_function
             IF COALESCE(word, '') = '' THEN
               return 0;
             END IF;
-          
+
             i = 0;
             tmp = 4294967295;
             byte_length = bit_length(word) / 8;

spec/thinking_sphinx/active_record_spec.rb

@@ -54,7 +54,7 @@
       lambda {
         Alpha.define_indexes
       }.should_not raise_error
-    end
+    end unless RUBY_PLATFORM == 'java'
 
     it "should die noisily if there is a non-database error" do
       ThinkingSphinx::Index::Builder.stub(:generate) { raise StandardError }