kb-activerecord-jdbc-adapter 0.9.7.1-java → 1.0.0.beta1-java

data/lib/{jdbc_adapter/jdbc_sqlite3.rb → arjdbc/sqlite3/adapter.rb}

@@ -1,47 +1,13 @@
-module ::JdbcSpec
-  # Don't need to load native postgres adapter
-  $LOADED_FEATURES << "active_record/connection_adapters/sqlite3_adapter.rb"
+require 'arjdbc/jdbc/missing_functionality_helper'
 
-  module ActiveRecordExtensions
-    add_method_to_remove_from_ar_base(:sqlite3_connection)
-
-    def sqlite3_connection(config)
-      require File.dirname(__FILE__) + "/../active_record/connection_adapters/sqlite3_adapter"
-
-      parse_sqlite3_config!(config)
-
-      config[:url] ||= "jdbc:sqlite:#{config[:database]}"
-      config[:driver] ||= "org.sqlite.JDBC"
-      jdbc_connection(config)
-    end
-
-    def parse_sqlite3_config!(config)
-      config[:database] ||= config[:dbfile]
-
-      # Allow database path relative to RAILS_ROOT, but only if
-      # the database path is not the special path that tells
-      # Sqlite to build a database only in memory.
-      rails_root_defined = defined?(Rails.root) || Object.const_defined?(:RAILS_ROOT)
-      if rails_root_defined && ':memory:' != config[:database]
-        rails_root = defined?(Rails.root) ? Rails.root : RAILS_ROOT
-        config[:database] = File.expand_path(config[:database], rails_root)
-      end
-    end
-  end
+module ActiveRecord::ConnectionAdapters
+  Sqlite3Adapter = Class.new(AbstractAdapter) unless const_defined?(:Sqlite3Adapter)
+end
 
+module ::ArJdbc
   module SQLite3
-    def self.extended(base)
-      base.class.class_eval do
-        alias_chained_method :insert, :query_dirty, :insert
-      end
-    end
-
-    def self.adapter_matcher(name, *)
-      name =~ /sqlite/i ? self : false
-    end
-
     def self.column_selector
-      [/sqlite/i, lambda {|cfg,col| col.extend(::JdbcSpec::SQLite3::Column)}]
+      [/sqlite/i, lambda {|cfg,col| col.extend(::ArJdbc::SQLite3::Column)}]
     end
 
     def self.jdbc_connection_class
@@ -57,12 +23,12 @@ module ::JdbcSpec
         return nil if value.nil?
         case type
         when :string   then value
-        when :integer  then JdbcSpec::SQLite3::Column.cast_to_integer(value)
+        when :integer  then ArJdbc::SQLite3::Column.cast_to_integer(value)
         when :primary_key then defined?(value.to_i) ? value.to_i : (value ? 1 : 0)
         when :float    then value.to_f
-        when :datetime then JdbcSpec::SQLite3::Column.cast_to_date_or_time(value)
-        when :date then JdbcSpec::SQLite3::Column.cast_to_date_or_time(value)
-        when :time     then JdbcSpec::SQLite3::Column.cast_to_time(value)
+        when :datetime then ArJdbc::SQLite3::Column.cast_to_date_or_time(value)
+        when :date then ArJdbc::SQLite3::Column.cast_to_date_or_time(value)
+        when :time     then ArJdbc::SQLite3::Column.cast_to_time(value)
         when :decimal  then self.class.value_to_decimal(value)
         when :boolean  then self.class.value_to_boolean(value)
         else value
@@ -71,10 +37,10 @@ module ::JdbcSpec
 
       def type_cast_code(var_name)
         case type
-          when :integer  then "JdbcSpec::SQLite3::Column.cast_to_integer(#{var_name})"
-          when :datetime then "JdbcSpec::SQLite3::Column.cast_to_date_or_time(#{var_name})"
-          when :date     then "JdbcSpec::SQLite3::Column.cast_to_date_or_time(#{var_name})"
-          when :time     then "JdbcSpec::SQLite3::Column.cast_to_time(#{var_name})"
+          when :integer  then "ArJdbc::SQLite3::Column.cast_to_integer(#{var_name})"
+          when :datetime then "ArJdbc::SQLite3::Column.cast_to_date_or_time(#{var_name})"
+          when :date     then "ArJdbc::SQLite3::Column.cast_to_date_or_time(#{var_name})"
+          when :time     then "ArJdbc::SQLite3::Column.cast_to_time(#{var_name})"
         else
           super
         end
@@ -98,11 +64,11 @@ module ::JdbcSpec
 
       def extract_precision(sql_type)
         case sql_type
-          when /^(real)\((\d+)(,\d+)?\)/i then $2.to_i 
+          when /^(real)\((\d+)(,\d+)?\)/i then $2.to_i
           else super
-        end 
+        end
       end
-      
+
       def extract_scale(sql_type)
         case sql_type
           when /^(real)\((\d+)\)/i then 0
@@ -190,14 +156,7 @@ module ::JdbcSpec
     end
 
     def quote_column_name(name) #:nodoc:
-      name = name.to_s
-      # Did not find reference on values needing quoting, but these
-      # happen in AR unit tests
-      if name == "references" || name =~ /-/
-        %Q("#{name}") 
-      else
-        name
-      end
+      %Q("#{name}")
     end
 
     def quote_string(str)
@@ -262,23 +221,13 @@ module ::JdbcSpec
       execute "ALTER TABLE #{name} RENAME TO #{new_name}"
     end
 
-    def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
-      log(sql,name) do
-        @connection.execute_update(sql)
-      end
-      table = sql.split(" ", 4)[2]
-      id_value || last_insert_id(table, nil)
-    end
-
-    def last_insert_id(table, sequence_name)
-      Integer(select_value("SELECT SEQ FROM SQLITE_SEQUENCE WHERE NAME = '#{table}'"))
+    def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
+      @connection.execute_update(sql)
+      id_value || last_insert_id
     end
 
-    def add_limit_offset!(sql, options) #:nodoc:
-      if options[:limit]
-        sql << " LIMIT #{options[:limit]}"
-        sql << " OFFSET #{options[:offset]}" if options[:offset]
-      end
+    def last_insert_id
+      Integer(select_value("SELECT last_insert_rowid()"))
     end
 
     def tables(name = nil) #:nodoc:
@@ -304,11 +253,13 @@ module ::JdbcSpec
         name = row[0]
         index_sql = row[1]
         unique = (index_sql =~ /unique/i)
-        cols = index_sql.match(/\((.*)\)/)[1].gsub(/,/,' ').split
+        cols = index_sql.match(/\((.*)\)/)[1].gsub(/,/,' ').split.map do |c|
+          match = /^"(.+)"$/.match(c); match ? match[1] : c
+        end
         ::ActiveRecord::ConnectionAdapters::IndexDefinition.new(table_name, name, unique, cols)
       end
     end
-    
+
     def primary_key(table_name) #:nodoc:
       column = table_structure(table_name).find {|field| field['pk'].to_i == 1}
       column ? column['name'] : nil
@@ -319,14 +270,10 @@ module ::JdbcSpec
     end
 
     def _execute(sql, name = nil)
-      if ActiveRecord::ConnectionAdapters::JdbcConnection::select?(sql)
-        @connection.execute_query(sql)
-      else
-        affected_rows = @connection.execute_update(sql)
-        ActiveRecord::ConnectionAdapters::JdbcConnection::insert?(sql) ? last_insert_id(sql.split(" ", 4)[2], nil) : affected_rows
-      end
+      result = super
+      ActiveRecord::ConnectionAdapters::JdbcConnection::insert?(sql) ? last_insert_id : result
     end
-    
+
     def select(sql, name=nil)
       execute(sql, name).map do |row|
         record = {}
@@ -338,49 +285,104 @@ module ::JdbcSpec
         record
       end
     end
-    
+
     def table_structure(table_name)
       structure = @connection.execute_query("PRAGMA table_info(#{quote_table_name(table_name)})")
       raise ActiveRecord::StatementInvalid, "Could not find table '#{table_name}'" if structure.empty?
       structure
     end
-    
-    def columns(table_name, name = nil) #:nodoc:        
+
+    def columns(table_name, name = nil) #:nodoc:
       table_structure(table_name).map do |field|
         ::ActiveRecord::ConnectionAdapters::JdbcColumn.new(@config, field['name'], field['dflt_value'], field['type'], field['notnull'] == 0)
       end
     end
-    
+
      # SELECT ... FOR UPDATE is redundant since the table is locked.
     def add_lock!(sql, options) #:nodoc:
       sql
     end
-    
+
     protected
-      include JdbcSpec::MissingFunctionalityHelper
+    include ArJdbc::MissingFunctionalityHelper
+
+    def translate_exception(exception, message)
+      case exception.message
+      when /column(s)? .* (is|are) not unique/
+        ActiveRecord::RecordNotUnique.new(message, exception)
+      else
+        super
+      end
+    end
   end
 end
 
-module ActiveRecord
-  module ConnectionAdapters
-    class JdbcColumn < Column
-      def self.string_to_binary(value)
-        value.gsub(/\0|%/n) do |b|
-          case b
-            when "\0" then "%00"
-            when "\%"  then "%25"
-          end
+module ActiveRecord::ConnectionAdapters
+  class SQLiteColumn < JdbcColumn
+    include ArJdbc::SQLite3::Column
+
+    def initialize(name, *args)
+      if Hash === name
+        super
+      else
+        super(nil, name, *args)
+      end
+    end
+
+    def call_discovered_column_callbacks(*)
+    end
+
+    def self.string_to_binary(value)
+      value.gsub(/\0|%/n) do |b|
+        case b
+        when "\0" then "%00"
+        when "\%"  then "%25"
         end
       end
+    end
 
-      def self.binary_to_string(value)
-        value.gsub(/%00|%25/n) do |b|
-          case b
-            when "%00" then "\0"
-            when "%25" then "%"
-          end
+    def self.binary_to_string(value)
+      value.gsub(/%00|%25/n) do |b|
+        case b
+        when "%00" then "\0"
+        when "%25" then "%"
         end
       end
     end
+
+    def self.cast_to_integer(value)
+      return nil if value =~ /NULL/ or value.to_s.empty? or value.nil?
+      return (value.to_i) ? value.to_i : (value ? 1 : 0)
+    end
+
+    def self.cast_to_date_or_time(value)
+      return value if value.is_a? Date
+      return nil if value.blank?
+      guess_date_or_time((value.is_a? Time) ? value : cast_to_time(value))
+    end
+
+    def self.cast_to_time(value)
+      return value if value.is_a? Time
+      time_array = ParseDate.parsedate value
+      time_array[0] ||= 2000; time_array[1] ||= 1; time_array[2] ||= 1;
+      Time.send(ActiveRecord::Base.default_timezone, *time_array) rescue nil
+    end
+
+    def self.guess_date_or_time(value)
+      (value.hour == 0 and value.min == 0 and value.sec == 0) ?
+      Date.new(value.year, value.month, value.day) : value
+    end
+  end
+
+  class SQLite3Adapter < JdbcAdapter
+    include ArJdbc::SQLite3
+
+    def adapter_spec(config)
+      # return nil to avoid extending ArJdbc::SQLite3, which we've already done
+    end
+
+    def jdbc_column_class
+      ActiveRecord::ConnectionAdapters::SQLiteColumn
+    end
   end
 end

data/lib/arjdbc/sqlite3/connection_methods.rb

@@ -0,0 +1,33 @@
+# Don't need to load native sqlite3 adapter
+$LOADED_FEATURES << "active_record/connection_adapters/sqlite_adapter.rb"
+$LOADED_FEATURES << "active_record/connection_adapters/sqlite3_adapter.rb"
+
+class ActiveRecord::Base
+  class << self
+    def sqlite3_connection(config)
+      require "arjdbc/sqlite3"
+
+      parse_sqlite3_config!(config)
+
+      config[:url] ||= "jdbc:sqlite:#{config[:database]}"
+      config[:driver] ||= "org.sqlite.JDBC"
+      config[:adapter_class] = ActiveRecord::ConnectionAdapters::SQLite3Adapter
+      jdbc_connection(config)
+    end
+
+    def parse_sqlite3_config!(config)
+      config[:database] ||= config[:dbfile]
+
+      # Allow database path relative to RAILS_ROOT, but only if
+      # the database path is not the special path that tells
+      # Sqlite to build a database only in memory.
+      rails_root_defined = defined?(Rails.root) || Object.const_defined?(:RAILS_ROOT)
+      if rails_root_defined && ':memory:' != config[:database]
+        rails_root = defined?(Rails.root) ? Rails.root : RAILS_ROOT
+        config[:database] = File.expand_path(config[:database], rails_root)
+      end
+    end
+
+    alias_method :jdbcsqlite3_connection, :sqlite3_connection
+  end
+end

data/lib/arjdbc/sqlite3.rb

@@ -0,0 +1,4 @@
+require 'arjdbc/jdbc'
+jdbc_require_driver 'jdbc/sqlite3'
+require 'arjdbc/sqlite3/connection_methods'
+require 'arjdbc/sqlite3/adapter'

data/lib/arjdbc/sybase/adapter.rb

@@ -0,0 +1,46 @@
+module ArJdbc
+  module Sybase
+    def add_limit_offset!(sql, options) # :nodoc:
+      @limit = options[:limit]
+      @offset = options[:offset]
+      if use_temp_table?
+        # Use temp table to hack offset with Sybase
+        sql.sub!(/ FROM /i, ' INTO #artemp FROM ')
+      elsif zero_limit?
+        # "SET ROWCOUNT 0" turns off limits, so we havesy
+        # to use a cheap trick.
+        if sql =~ /WHERE/i
+          sql.sub!(/WHERE/i, 'WHERE 1 = 2 AND ')
+        elsif sql =~ /ORDER\s+BY/i
+          sql.sub!(/ORDER\s+BY/i, 'WHERE 1 = 2 ORDER BY')
+        else
+          sql << 'WHERE 1 = 2'
+        end
+      end
+    end
+
+    # If limit is not set at all, we can ignore offset;
+    # if limit *is* set but offset is zero, use normal select
+    # with simple SET ROWCOUNT.  Thus, only use the temp table
+    # if limit is set and offset > 0.
+    def use_temp_table?
+      !@limit.nil? && !@offset.nil? && @offset > 0
+    end
+
+    def zero_limit?
+      !@limit.nil? && @limit == 0
+    end
+
+    def modify_types(tp) #:nodoc:
+      tp[:primary_key] = "NUMERIC(22,0) IDENTITY PRIMARY KEY"
+      tp[:integer][:limit] = nil
+      tp[:boolean] = {:name => "bit"}
+      tp[:binary] = {:name => "image"}
+      tp
+    end
+
+    def remove_index(table_name, options = {})
+      execute "DROP INDEX #{table_name}.#{index_name(table_name, options)}"
+    end
+  end
+end

data/lib/arjdbc/sybase.rb

@@ -0,0 +1,2 @@
+require 'arjdbc/jdbc'
+require 'arjdbc/sybase/adapter.rb'

data/lib/arjdbc/version.rb

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

data/lib/arjdbc.rb

@@ -0,0 +1,29 @@
+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 'arjdbc/jdbc'
+    end
+  else
+    require 'active_record'
+    require 'arjdbc/jdbc'
+  end
+else
+  warn "ActiveRecord-JDBC is for use with JRuby only"
+end
+
+require 'arjdbc/version'

data/lib/jdbc_adapter/version.rb

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

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/rails_generators/templates/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/rakelib/compile.rake

@@ -12,12 +12,13 @@ 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
   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 "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/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,13 +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.name = %q{kb-activerecord-jdbc-adapter}
-    p.version = JdbcAdapter::Version::VERSION
+    p.version = ArJdbc::Version::VERSION
     p.spec_extras[:platform] = Gem::Platform.new("java")
     p.spec_extras[:files] = MANIFEST
     p.rubyforge_name = "jruby-extras"

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;
@@ -131,7 +131,7 @@ public class JdbcDerbySpec {
                     return quote_string_with_surround(runtime, "'", RubyString.objAsString(context, value), "'");
                 }
             }
-        } 
+        }
         return super_quote(context, recv, runtime, value, runtime.getNil());
     }
 
@@ -141,25 +141,25 @@ public class JdbcDerbySpec {
         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 +167,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 +231,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);