activerecord-jdbc-adapter 1.2.9.1 → 1.3.0.beta1

data/lib/arjdbc/sqlite3/explain_support.rb

@@ -7,11 +7,8 @@ module ::ArJdbc
 
       def explain(arel, binds = [])
         sql = "EXPLAIN QUERY PLAN #{to_sql(arel, binds)}"
-        raw_result  = execute(sql, "EXPLAIN", binds)
-        # TODO we should refactor to exce_query once it returns Result ASAP :
-        keys = raw_result[0] ? raw_result[0].keys : {}
-        rows = raw_result.map { |hash| hash.values }
-        ExplainPrettyPrinter.new.pp ActiveRecord::Result.new(keys, rows)
+        result  = exec_query(sql, "EXPLAIN", binds)
+        ExplainPrettyPrinter.new.pp result
       end
 
       class ExplainPrettyPrinter # :nodoc:

data/lib/arjdbc/sybase.rb

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

data/lib/arjdbc/version.rb

@@ -1,8 +1,9 @@
 module ArJdbc
-  module Version
-    VERSION = "1.2.9.1"
+  VERSION = "1.3.0.beta1"
+  module Version # :nodoc:
+    VERSION = ArJdbc::VERSION # :nodoc: 1.2.x compatibility
   end
 end
 # Compatibility with older versions of ar-jdbc for other extensions out there
-JdbcAdapter = ArJdbc
-JdbcSpec = ArJdbc
+JdbcAdapter = ArJdbc # :nodoc:
+JdbcSpec = ArJdbc # :nodoc:

data/pom.xml

@@ -37,6 +37,14 @@
       <artifactId>jruby-complete</artifactId>
       <version>1.6.8</version>
     </dependency>
+    <!-- e.g.
+    mvn install:install-file -DgroupId=org.postgresql -DartifactId=pgjdbc -Dversion=9.2-1002 -Dpackaging=jar -Dfile=./jdbc-postgres/lib/postgresql-9.2-1002.jdbc4.jar
+    -->
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>pgjdbc</artifactId>
+      <version>9.2-1002</version>
+    </dependency>
   </dependencies>
 
   <build>

data/rakelib/02-test.rake

@@ -20,47 +20,67 @@ def set_compat_version(task)
   end
 end
 
-def declare_test_task_for(adapter, options = {})
-  driver = options[:driver] || adapter
-  prereqs = options[:prereqs] || []
-  prereqs = [ prereqs ].flatten
+%w(derby h2 hsqldb mysql sqlite3 postgres mssql oracle db2 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}'" + 
            " where version=(#{appraisals.join('|')})"
     end
-  end
+  end  
+end
+
+Rake::TestTask.class_eval { attr_reader :test_files }
+
+def declare_test_task_for(adapter, options = {}, &block)
+  driver = options[:driver] || adapter
+  prereqs = options[:prereqs] || []
+  prereqs = [ prereqs ].flatten
   prereqs << "test_#{adapter}_pre"
-  test_task = lambda do |t|
-    task_name = t.name.keys.first
-    files = FileList["test/#{adapter}*test.rb"]
-    files.unshift "test/db/#{task_name.sub('test_','')}.rb"
-    if adapter == "derby"
-      files << 'test/activerecord/connection_adapters/type_conversion_test.rb'
-    end
-    t.test_files = files
-    t.libs = []
-    set_compat_version(t)
+  Rake::TestTask.new("test_#{adapter}" => prereqs) do |task|
+    files = FileList["test/#{adapter}*_test.rb"]
+    files += FileList["test/db/#{adapter}/*_test.rb"]
+    #task_name = task.name.keys.first.to_s
+    #files.unshift "test/db/#{task_name.sub('test_','')}.rb"
+    task.test_files = files
+    task.libs = []
     if defined?(JRUBY_VERSION)
-      t.libs << "lib" << "jdbc-#{driver}/lib"
-      t.libs.push *FileList["activerecord-jdbc#{adapter}*/lib"]
+      task.libs << "lib" << "jdbc-#{driver}/lib"
+      task.libs.push *FileList["activerecord-jdbc#{adapter}*/lib"]
     end
-    t.libs << "test"
-    t.verbose = true if $VERBOSE
+    task.libs << "test"
+    set_compat_version(task)
+    task.verbose = true if $VERBOSE    
+    yield(task) if block_given?
   end
-  Rake::TestTask.new("test_#{adapter}" => prereqs) { |t| test_task.call t }
-  Rake::TestTask.new("test_jdbc_#{adapter}" => prereqs) { |t| test_task.call t }
 end
 
-declare_test_task_for :derby
+declare_test_task_for :derby do |task|
+  task.test_files << 'test/activerecord/connection_adapters/type_conversion_test.rb'
+end
 declare_test_task_for :h2
 declare_test_task_for :hsqldb
 declare_test_task_for :mssql, :driver => :jtds
 declare_test_task_for :mysql, :prereqs => "db:mysql"
 declare_test_task_for :postgres, :prereqs => "db:postgres"
+task :test_postgresql => :test_postgres # alias
+task :test_pgsql => :test_postgres # alias
 declare_test_task_for :sqlite3
 
+# ensure driver for these DBs is on your class-path
+[ :oracle, :db2, :informix, :cachedb ].each do |adapter|
+  Rake::TestTask.new("test_#{adapter}") do |task|
+    test_files = FileList["test/#{adapter}*_test.rb"]
+    test_files += FileList["test/db/#{adapter}/*_test.rb"]
+    task.test_files = test_files
+    task.libs = []
+    task.libs << 'lib' if defined?(JRUBY_VERSION)
+    task.libs << 'test'
+    set_compat_version(task)
+  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'
@@ -73,37 +93,23 @@ Rake::TestTask.new(:test_jndi => 'tomcat-jndi:check') do |t|
   set_compat_version(t)
 end
 
-task :test_postgresql => [:test_postgres]
-task :test_pgsql => [:test_postgres]
-
-# Ensure driver for these DBs is on your classpath
-%w(oracle db2 cachedb informix).each do |d|
-  Rake::TestTask.new("test_#{d}") do |t|
-    t.test_files = FileList["test/#{d}*_test.rb"]
-    t.libs = []
-    t.libs << 'lib' if defined?(JRUBY_VERSION)
-    t.libs << 'test'
-    set_compat_version(t)
-  end
+# tests for JDBC adapters that don't require a database :
+Rake::TestTask.new(:test_jdbc_adapters) do |task|
+  task.test_files = FileList[ 'test/jdbc_adapter/jdbc_sybase_test.rb' ]
+  task.libs << 'test'
+  set_compat_version(task)
 end
 
-# Tests for JDBC adapters that don't require a database.
-Rake::TestTask.new(:test_jdbc_adapters) do | t |
-  t.test_files = FileList[ 'test/jdbc_adapter/jdbc_sybase_test.rb' ]
-  t.libs << 'test'
-  set_compat_version(t)
+# ensure that the jTDS driver is in your class-path
+Rake::TestTask.new(:test_sybase_jtds) do |task|
+  task.test_files = FileList['test/sybase_jtds_simple_test.rb']
+  task.libs << 'test'
+  set_compat_version(task)
 end
 
-# Ensure that the jTDS driver is in your classpath before launching rake
-Rake::TestTask.new(:test_sybase_jtds) do |t|
-  t.test_files = FileList['test/sybase_jtds_simple_test.rb']
-  t.libs << 'test'
-  set_compat_version(t)
-end
-
-# Ensure that the jConnect driver is in your classpath before launching rake
-Rake::TestTask.new(:test_sybase_jconnect) do |t|
-  t.test_files = FileList['test/sybase_jconnect_simple_test.rb']
-  t.libs << 'test'
-  set_compat_version(t)
+# ensure that the jConnect driver is in your class-path
+Rake::TestTask.new(:test_sybase_jconnect) do |task|
+  task.test_files = FileList['test/sybase_jconnect_simple_test.rb']
+  task.libs << 'test'
+  set_compat_version(task)
 end

data/rakelib/compile.rake

@@ -1,14 +1,18 @@
 jar_file = File.join(*%w(lib arjdbc jdbc adapter_java.jar))
 begin
   require 'ant'
-  directory "pkg/classes"
-  CLEAN << "pkg"
+  directory classes = "pkg/classes"
+  CLEAN << classes
 
+  driver_jars = []
+  # PostgreSQL driver :
+  driver_jars << Dir.glob("jdbc-postgres/lib/*.jar").sort.last
+  
   file jar_file => FileList['src/java/**/*.java', 'pkg/classes'] do
-    rm_rf FileList['pkg/classes/**/*']
+    rm_rf FileList["#{classes}/**/*"]
     ant.javac :srcdir => "src/java", :destdir => "pkg/classes",
-      :source => "1.5", :target => "1.5", :debug => true,
-      :classpath => "${java.class.path}:${sun.boot.class.path}",
+      :source => "1.6", :target => "1.6", :debug => true, :deprecation => true,
+      :classpath => "${java.class.path}:${sun.boot.class.path}:#{driver_jars.join(':')}",
       :includeantRuntime => false
 
     ant.jar :basedir => "pkg/classes", :destfile => jar_file, :includes => "**/*.class"
@@ -16,6 +20,14 @@ begin
 
   desc "Compile the native Java code."
   task :jar => jar_file
+  
+  namespace :jar do
+    task :force do
+      rm jar_file
+      Rake::Task['jar'].invoke
+    end
+  end
+  
 rescue LoadError
   task :jar do
     puts "Run 'jar' with JRuby to re-compile the agent extension class"

data/rakelib/rails.rake

@@ -1,39 +1,13 @@
 namespace :rails do
-  def _adapter(n)
-    case n
-    when /postgres/
-      'postgresql'
-    else
-      n
-    end
-  end
-
-  def _driver(n)
-    case n
-    when /postgres/
-      'postgres'
-    else
-      n
-    end
-  end
-
-  def _target(n)
-    case n
-    when /postgres/
-      'test_jdbcpostgresql'
-    else
-      "test_jdbc#{n}"
-    end
-  end
-
-  task :test => :jar do
-    raise "need a DRIVER" unless driver = ENV['DRIVER']
-    raise "need location of RAILS source code" unless rails_dir = ENV['RAILS']
+  
+  task :test do
+    raise "need a DRIVER e.g. DRIVER=mysql" unless driver = ENV['DRIVER'] || ENV['ADAPTER']
+    raise "need location of RAILS source code e.g. RAILS=../rails" unless rails_dir = ENV['RAILS']
     rails_dir = File.join(rails_dir, '..') if rails_dir =~ /activerecord$/
     activerecord_dir = File.join(rails_dir, 'activerecord') # rails/activerecord
 
     ar_jdbc_dir = File.expand_path('..', File.dirname(__FILE__))
-
+    
     rubylib = [ 
       "#{ar_jdbc_dir}/lib",
       "#{ar_jdbc_dir}/jdbc-#{_driver(driver)}/lib",
@@ -46,4 +20,41 @@ namespace :rails do
 
     Dir.chdir(activerecord_dir) { rake "RUBYLIB=#{rubylib.join(':')}", "#{_target(driver)}" }
   end
+  
+  %w(MySQL SQLite3 Postgres).each do |adapter|
+    desc "Run Rails' ActiveRecord tests with #{adapter} (JDBC)"
+    task "test_#{adapter.downcase}" do
+      ENV['ADAPTER'] = adapter; Rake::Task['rails:test'].invoke
+    end
+  end
+  
+  private
+  
+  def _adapter(name)
+    case name
+    when /postgres/i
+      'postgresql'
+    else
+      name.downcase
+    end
+  end
+
+  def _driver(name)
+    case name
+    when /postgres/i
+      'postgres'
+    else
+      name.downcase
+    end
+  end
+
+  def _target(name)
+    case name
+    when /postgres/i
+      'test_jdbcpostgresql'
+    else
+      "test_jdbc#{name.downcase}"
+    end
+  end
+  
 end

data/src/java/arjdbc/db2/DB2RubyJdbcConnection.java

@@ -25,19 +25,20 @@
  ***** END LICENSE BLOCK *****/
 package arjdbc.db2;
 
+import arjdbc.jdbc.RubyJdbcConnection;
+
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.builtin.IRubyObject;
 
-import arjdbc.jdbc.RubyJdbcConnection;
-
 /**
  *
  * @author mikestone
  */
 public class DB2RubyJdbcConnection extends RubyJdbcConnection {
-    private static final String[] TABLE_TYPES = new String[]{"TABLE", "VIEW", "SYNONYM", "MATERIALIZED QUERY TABLE", "ALIAS"};
+    
+    private static final String[] TABLE_TYPES = new String[]{ "TABLE", "VIEW", "SYNONYM", "MATERIALIZED QUERY TABLE", "ALIAS" };
 
     protected DB2RubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);

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

@@ -38,6 +38,7 @@ import org.jruby.RubyObjectAdapter;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.javasupport.JavaEmbedUtils;
+import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
@@ -105,40 +106,43 @@ public class DerbyModule {
     }
 
     @JRubyMethod(name = "quote", required = 1, optional = 1)
-    public static IRubyObject quote(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        Ruby runtime = recv.getRuntime();
+    public static IRubyObject quote(final ThreadContext context, final IRubyObject self, 
+        final IRubyObject[] args) {
+        final Ruby runtime = self.getRuntime();
         IRubyObject value = args[0];
-        if (args.length > 1) {
-            IRubyObject col = args[1];
-            String type = col.isNil() ? "" : rubyApi.callMethod(col, "type").toString();
+        if ( args.length > 1 ) {
+            final IRubyObject column = args[1];
+            final String columnType = column.isNil() ? "" : rubyApi.callMethod(column, "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 ( columnType.equals("text") || columnType.equals("string") ) {
+            	value = make_ruby_string_for_text_column(context, self, runtime, value);
             }
-            String metaClass = value.getMetaClass().getName();
-
-            if (value instanceof RubyString) {
-                if (type.equals("string")) {
-                    return quote_string_with_surround(runtime, "'", (RubyString)value, "'");
-                } else if (type.equals("text")) {
-                    return quote_string_with_surround(runtime, "CAST('", (RubyString)value, "' AS CLOB)");
-                } else if (type.equals("binary")) {
-                    return hexquote_string_with_surround(runtime, "CAST(X'", (RubyString)value, "' AS BLOB)");
-                } else {
-                    // column type :integer or other numeric or date version
-                    if (only_digits((RubyString)value)) {
-                        return value;
-                    } else {
-                        return super_quote(context, recv, runtime, value, col);
-                    }
+            final String metaClass = value.getMetaClass().getName();
+
+            if ( value instanceof RubyString ) {
+                if ( columnType.equals("string") ) {
+                    return quote_string_with_surround(runtime, "'", (RubyString) value, "'");
+                }
+                else if ( columnType.equals("text") ) {
+                    return quote_string_with_surround(runtime, "CAST('", (RubyString) value, "' AS CLOB)");
+                }
+                else if ( columnType.equals("binary") ) {
+                    return hexquote_string_with_surround(runtime, "CAST(X'", (RubyString) value, "' AS BLOB)");
                 }
-            } else if (metaClass.equals("Float") || metaClass.equals("Fixnum") || metaClass.equals("Bignum")) {
-                if (type.equals("string")) {
+                else if ( columnType.equals("xml") ) {
+                    return quote_string_with_surround(runtime, "XMLPARSE(DOCUMENT '", (RubyString) value, "' PRESERVE WHITESPACE)");
+                }
+                else { // column type :integer or other numeric or date version
+                    return only_digits((RubyString) value) ? value : super_quote(context, self, runtime, value, column);
+                }
+            }
+            else if ( metaClass.equals("Float") || metaClass.equals("Fixnum") || metaClass.equals("Bignum") ) {
+                if ( columnType.equals("string") ) {
                     return quote_string_with_surround(runtime, "'", RubyString.objAsString(context, value), "'");
                 }
             }
         }
-        return super_quote(context, recv, runtime, value, runtime.getNil());
+        return super_quote(context, self, runtime, value, runtime.getNil());
     }
 
     /*
@@ -146,8 +150,7 @@ public class DerbyModule {
      * 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");
+    	final RubyModule multibyteChars = getMultibyteChars(runtime);
         if (value instanceof RubyString || rubyApi.isKindOf(value, multibyteChars) || value.isNil()) {
             return value;
         }
@@ -179,8 +182,7 @@ public class DerbyModule {
         String metaClass = value.getMetaClass().getName();
 
         IRubyObject type = (col.isNil()) ? col : rubyApi.callMethod(col, "type");
-        RubyModule multibyteChars = (RubyModule)
-            ((RubyModule) ((RubyModule) runtime.getModule("ActiveSupport")).getConstant("Multibyte")).getConstantAt("Chars");
+        final RubyModule multibyteChars = getMultibyteChars(runtime);
         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")) {
@@ -211,52 +213,57 @@ public class DerbyModule {
 
     private final static ByteList TWO_SINGLE = new ByteList(new byte[]{'\'','\''});
 
-    private static IRubyObject quote_string_with_surround(Ruby runtime, String before, RubyString string, String after) {
-        ByteList input = string.getByteList();
-        ByteList output = new ByteList(before.getBytes(), input.encoding);
-        for(int i = input.begin; i< input.begin + input.realSize; i++) {
-            switch(input.bytes[i]) {
-            case '\'':
-                output.append(input.bytes[i]);
-                //FALLTHROUGH
-            default:
-                output.append(input.bytes[i]);
+    private static IRubyObject quote_string_with_surround(final Ruby runtime, 
+        final String before, final RubyString string, final String after) {
+        
+        final ByteList input = string.getByteList();
+        final ByteList output = new ByteList(before.getBytes(), input.getEncoding());
+        final byte[] inputBytes = input.unsafeBytes();
+        
+        for(int i = input.getBegin(); i< input.getBegin() + input.getRealSize(); i++) {
+            switch ( inputBytes[i] ) {
+                case '\'': output.append(inputBytes[i]); // FALLTHROUGH
+                default: output.append(inputBytes[i]);
             }
 
         }
 
         output.append(after.getBytes());
-
         return runtime.newString(output);
     }
 
     private final static byte[] HEX = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
 
-    private static IRubyObject hexquote_string_with_surround(Ruby runtime, String before, RubyString string, String after) {
-        ByteList input = string.getByteList();
-        ByteList output = new ByteList(before.getBytes());
+    private static IRubyObject hexquote_string_with_surround(final Ruby runtime, 
+        final String before, final RubyString string, final String after) {
+        
+        final ByteList input = string.getByteList();
+        final ByteList output = new ByteList(before.getBytes());
+        final byte[] inputBytes = input.unsafeBytes();
+        
         int written = 0;
-        for(int i = input.begin; i< input.begin + input.realSize; i++) {
-            byte b1 = input.bytes[i];
+        for(int i = input.getBegin(); i< input.getBegin() + input.getRealSize(); i++) {
+            byte b1 = inputBytes[i];
             byte higher = HEX[(((char)b1)>>4)%16];
             byte lower = HEX[((char)b1)%16];
             output.append(higher);
             output.append(lower);
             written += 2;
-            if(written >= 16334) { // max hex length = 16334
+            if (written >= 16334) { // max hex length = 16334
                 output.append("'||X'".getBytes());
                 written = 0;
             }
         }
 
         output.append(after.getBytes());
-        return runtime.newStringShared(output);
+        return RubyString.newStringShared(runtime, output);
     }
 
-    private static boolean only_digits(RubyString inp) {
-        ByteList input = inp.getByteList();
-        for(int i = input.begin; i< input.begin + input.realSize; i++) {
-            if(input.bytes[i] < '0' || input.bytes[i] > '9') {
+    private static boolean only_digits(final RubyString string) {
+        final ByteList input = string.getByteList();
+        final byte[] inputBytes = input.unsafeBytes();
+        for ( int i = input.getBegin(); i< input.getBegin() + input.getRealSize(); i++ ) {
+            if ( inputBytes[i] < '0' || inputBytes[i] > '9' ) {
                 return false;
             }
         }
@@ -264,31 +271,26 @@ public class DerbyModule {
     }
 
     @JRubyMethod(name = "quote_string", required = 1)
-    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;
+    public static IRubyObject quote_string(final IRubyObject self, IRubyObject string) {
+        ByteList bytes = ((RubyString) string).getByteList();
+        
+        boolean replacement = false;
+        for ( int i = 0; i < bytes.length(); i++ ) {
+            switch ( bytes.get(i) ) {
+                case '\'': break;
+                default: continue;
             }
-
-            // On first replacement allocate a different bytelist so we don't manip original
-            if(!replacementFound) {
-                i-= bl.begin;
-                bl = new ByteList(bl);
-                replacementFound = true;
+            // on first replacement allocate so we don't manip original
+            if ( ! replacement ) {
+                bytes = new ByteList(bytes);
+                replacement = true;
             }
 
-            bl.replace(i, 1, TWO_SINGLE);
-            i+=1;
-        }
-        if(replacementFound) {
-            return recv.getRuntime().newStringShared(bl);
-        } else {
-            return string;
+            bytes.replace(i, 1, TWO_SINGLE);
+            i += 1;
         }
+        
+        return replacement ? RubyString.newStringShared(self.getRuntime(), bytes) : string;
     }
 
     @JRubyMethod(name = "quoted_true", required = 0, frame = false)
@@ -325,19 +327,30 @@ public class DerbyModule {
     }
 
     @JRubyMethod(name = "_execute", required = 1, optional = 1)
-    public static IRubyObject _execute(ThreadContext context, IRubyObject recv, IRubyObject[] args) throws SQLException, java.io.IOException {
-        Ruby runtime = recv.getRuntime();
-        RubyJdbcConnection conn = (RubyJdbcConnection) rubyApi.getInstanceVariable(recv, "@connection");
-        String sql = args[0].toString().trim().toLowerCase();
-        if (sql.charAt(0) == '(') {
-            sql = sql.substring(1).trim();
+    public static IRubyObject _execute(final ThreadContext context, final IRubyObject self, final IRubyObject[] args) 
+        throws SQLException, java.io.IOException {
+        final IRubyObject sql = args[0];
+        
+        String sqlStr = sql.toString().trim();
+        if ( sqlStr.charAt(0) == '(' ) sqlStr = sqlStr.substring(1).trim();
+        sqlStr = sqlStr.substring( 0, Math.min(6, sqlStr.length()) ).toLowerCase();
+        
+        final RubyJdbcConnection connection = (RubyJdbcConnection) rubyApi.getInstanceVariable(self, "@connection");
+        
+        if (sqlStr.startsWith("insert")) {
+            return connection.execute_insert(context, sql);
         }
-        if (sql.startsWith("insert")) {
-            return conn.execute_insert(context, args[0]);
-        } 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]);
+        else if (sqlStr.startsWith("select") || sqlStr.startsWith("show") || sqlStr.startsWith("values")) {
+            return connection.execute_query_raw(context, sql, Block.NULL_BLOCK);
         }
+        else {
+            return connection.execute_update(context, sql);
+        }
+    }
+    
+    private static RubyModule getMultibyteChars(final Ruby runtime) {
+        return (RubyModule) ((RubyModule) runtime.getModule("ActiveSupport").
+                getConstant("Multibyte")).getConstantAt("Chars");
     }
+    
 }