activerecord-jdbc-adapter 1.2.5 → 1.2.8

data/src/java/arjdbc/sqlite3/Sqlite3RubyJdbcConnection.java

@@ -1,126 +1,40 @@
 /*
- **** BEGIN LICENSE BLOCK *****
- * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
- * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
- * Copyright (c) 2008-2009 Thomas E Enebo <enebo@acm.org>
+ * The MIT License
  *
- * 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
- * without limitation the rights to use, copy, modify, merge, publish,
- * 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:
+ * Copyright 2013 Karol Bucek.
  *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
+ * 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 without limitation the rights
+ * to use, copy, modify, merge, publish, 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 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
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- ***** END LICENSE BLOCK *****/
-
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 package arjdbc.sqlite3;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Types;
-
-import arjdbc.jdbc.RubyJdbcConnection;
-import arjdbc.jdbc.SQLBlock;
-
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.runtime.ObjectAllocator;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
 
 /**
- *
- * @author enebo
+ * @see SQLite3RubyJdbcConnection
+ * @deprecated only for Java API backwards-compatibility
  */
-public class Sqlite3RubyJdbcConnection extends RubyJdbcConnection {
+@Deprecated
+public class Sqlite3RubyJdbcConnection extends SQLite3RubyJdbcConnection {
+    
     protected Sqlite3RubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
     }
-
-    public static RubyClass createSqlite3JdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
-        RubyClass clazz = RubyJdbcConnection.getConnectionAdapters(runtime).defineClassUnder("Sqlite3JdbcConnection",
-                jdbcConnection, SQLITE3_JDBCCONNECTION_ALLOCATOR);
-        clazz.defineAnnotatedMethods(Sqlite3RubyJdbcConnection.class);
-
-        return clazz;
-    }
-
-    private static ObjectAllocator SQLITE3_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
-            return new Sqlite3RubyJdbcConnection(runtime, klass);
-        }
-    };
-
-    @JRubyMethod(name = "last_insert_row_id")
-    public IRubyObject getLastInsertRowId(final ThreadContext context) 
-        throws SQLException {
-        return (IRubyObject) withConnectionAndRetry(context, new SQLBlock() {
-                public Object call(Connection c) throws SQLException {
-                    Statement stmt = null;
-                    try {
-                        stmt = c.createStatement();
-                        return unmarshal_id_result(context.getRuntime(),
-                                                   stmt.getGeneratedKeys());
-                    } catch (SQLException sqe) {
-                        if (context.getRuntime().isDebug()) {
-                            System.out.println("Error SQL:" + sqe.getMessage());
-                        }
-                        throw sqe;
-                    } finally {
-                        close(stmt);
-                    }
-                }
-            });
-    }
-
-    @Override
-    protected IRubyObject tables(ThreadContext context, String catalog, String schemaPattern, String tablePattern, String[] types) {
-        return (IRubyObject) withConnectionAndRetry(context, tableLookupBlock(context.getRuntime(), catalog, schemaPattern, tablePattern, types, true));
-    }
-
-    @Override
-    protected IRubyObject jdbcToRuby(Ruby runtime, int column, int type, ResultSet resultSet)
-            throws SQLException {
-        try {
-            // This is rather gross, and only needed because the resultset metadata for SQLite tries to be overly
-            // clever, and returns a type for the column of the "current" row, so an integer value stored in a 
-            // decimal column is returned as Types.INTEGER.  Therefore, if the first row of a resultset was an
-            // integer value, all rows of that result set would get truncated.
-            if( resultSet instanceof ResultSetMetaData ) {
-                type = ((ResultSetMetaData)resultSet).getColumnType(column);
-            }
-            switch (type) {
-            case Types.BINARY:
-            case Types.BLOB:
-            case Types.LONGVARBINARY:
-            case Types.VARBINARY:
-                return streamToRuby(runtime, resultSet, new ByteArrayInputStream(resultSet.getBytes(column)));
-            case Types.LONGVARCHAR:
-                return runtime.is1_9() ?
-                    readerToRuby(runtime, resultSet, resultSet.getCharacterStream(column)) :
-                    streamToRuby(runtime, resultSet, new ByteArrayInputStream(resultSet.getBytes(column)));
-            default:
-                return super.jdbcToRuby(runtime, column, type, resultSet);
-            }
-        } catch (IOException ioe) {
-            throw (SQLException) new SQLException(ioe.getMessage()).initCause(ioe);
-        }
-    }
+    
 }

data/src/java/arjdbc/util/QuotingUtils.java

@@ -0,0 +1,104 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2013 Karol Bucek.
+ *
+ * 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 without limitation the rights
+ * to use, copy, modify, merge, publish, 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 NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package arjdbc.util;
+
+import org.jruby.Ruby;
+import org.jruby.RubyString;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.ByteList;
+
+/**
+ * Shared (common) quoting helpers.
+ * 
+ * <br>
+ * NOTE: This is internal API !
+ * <br>
+ * 
+ * @author kares
+ */
+public abstract class QuotingUtils {
+    
+    public static final ByteList BYTES_0 = new ByteList(new byte[] { '0' }, false);
+    
+    public static final ByteList BYTES_1 = new ByteList(new byte[] { '1' }, false);
+    
+    // e.g. string.gsub("'", "''") -> quoteCharWith(string, '\'', '\'');
+    public static RubyString quoteCharWith(
+            final ThreadContext context, 
+            final RubyString string, 
+            final char value, final char quote) {
+        
+        final ByteList stringBytes = string.getByteList();
+        final byte[] bytes = stringBytes.bytes; // unsafeBytes();
+        final int begin = stringBytes.begin; // getBegin();
+        final int realSize = stringBytes.realSize; // getRealSize();
+        
+        ByteList quotedBytes = null; int appendFrom = begin;
+        for ( int i = begin; i < begin + realSize; i++ ) {
+            if ( bytes[i] == value ) {
+                if ( quotedBytes == null ) {
+                    quotedBytes = new ByteList(
+                        new byte[realSize + 8], 
+                        stringBytes.encoding // getEncoding()
+                    );
+                    quotedBytes.begin = 0; // setBegin(0);
+                    quotedBytes.realSize = 0; // setRealSize(0);
+                }
+                quotedBytes.append(bytes, appendFrom, i - appendFrom);
+                quotedBytes.append(quote).append(value); // e.g. "'" => "''"
+                appendFrom = i + 1;
+            }
+        }
+        if ( quotedBytes != null ) { // append what's left in the end :
+            quotedBytes.append(bytes, appendFrom, begin + realSize - appendFrom);
+        }
+        else return string; // nothing changed, can return original
+
+        final Ruby runtime = context.getRuntime();
+        return runtime.newString(quotedBytes);
+    }
+    
+    static final ByteList SINGLE_Q = new ByteList(new byte[] { '\'' }, false);
+    static final ByteList QUOTED_SINGLE_Q = new ByteList(new byte[] { '\'', '\'' }, false);
+    
+    // string.gsub("'", "''") :
+    public static IRubyObject quoteSingleQuotesWithFallback(
+        final ThreadContext context, final IRubyObject string) { 
+        // string.gsub("'", "''") :
+        if ( string instanceof RubyString ) {
+            final char single = '\'';
+            return quoteCharWith(context, (RubyString) string, single, single);
+        }
+        else { // ActiveSupport::Multibyte::Chars
+            return string.callMethod(context, "gsub", 
+                new IRubyObject[] {
+                    context.getRuntime().newString(SINGLE_Q),
+                    context.getRuntime().newString(QUOTED_SINGLE_Q)
+                }
+            );
+        }
+    }
+    
+}

data/test/abstract_db_create.rb

@@ -37,7 +37,7 @@ module AbstractDbCreate
     setup_rails
     set_rails_constant("env", @env)
     set_rails_constant("root", ".")
-    load File.dirname(__FILE__) + '/../lib/arjdbc/jdbc/jdbc.rake' if jruby?
+    load File.dirname(__FILE__) + '/../lib/arjdbc/jdbc/jdbc.rake' if defined?(JRUBY_VERSION)
     task :environment do
       ActiveRecord::Base.configurations = configurations
       @full_env_loaded = true
@@ -66,11 +66,11 @@ module AbstractDbCreate
   end
 
   def configurations
-    the_db_name = @db_name
-    the_db_config = db_config
-    the_db_config = the_db_config.merge({:database => the_db_name}) if the_db_name
-    the_db_config.stringify_keys!
-    @configs = { @env => the_db_config }
+    db_name = @db_name
+    db_config = self.db_config
+    db_config = db_config.merge({:database => db_name}) if db_name
+    db_config.stringify_keys!
+    @configs = { @env => db_config }
     @configs["test"] = @configs[@env].dup
     @configs
   end

data/test/activerecord/connection_adapters/type_conversion_test.rb

@@ -19,12 +19,12 @@ class TypeConversionTest < Test::Unit::TestCase
   end
   
   def test_timestamp
-    types = DbType.find(:first)
+    types = DbType.first
     assert_equal TEST_TIME, types.sample_timestamp.getutc
   end
   
   def test_decimal
-    types = DbType.find(:first)
+    types = DbType.first
     assert_equal((JInteger::MAX_VALUE + 1), types.sample_decimal)
   end
 end

data/test/binary.rb

@@ -0,0 +1,67 @@
+# encoding: utf-8
+require 'test_helper'
+require 'models/binary'
+
+# Kindly borrowed from Rails's AR test cases !
+
+# Without using prepared statements, it makes no sense to test
+# BLOB data with DB2 or Firebird, because the length of a statement
+# is limited to 32KB.
+#unless current_adapter?(:SybaseAdapter, :DB2Adapter, :FirebirdAdapter)
+
+module BinaryTestMethods
+
+  def self.included(base)
+    base.extend UpAndDown
+  end
+
+  module UpAndDown
+
+    def startup
+      super
+      BinaryMigration.up
+    end
+
+    def shutdown
+      super
+      BinaryMigration.down
+    end
+
+  end
+
+  FIXTURES = %w(flowers.jpg example.log test.txt)
+
+  def test_mixed_encoding
+    str = "\x80"
+    str.force_encoding('ASCII-8BIT') if str.respond_to?(:force_encoding)
+
+    binary = Binary.new :name => 'いただきます！', :data => str
+    binary.save!
+    binary.reload
+    assert_equal str, binary.data
+
+    name = binary.name
+
+    assert_equal 'いただきます！', name
+  end
+
+  def test_load_save
+    Binary.delete_all
+    assets_root = File.expand_path('assets', File.dirname(__FILE__))
+    FIXTURES.each do |filename|
+      data = File.read("#{assets_root}/#{filename}")
+      data.force_encoding('ASCII-8BIT') if data.respond_to?(:force_encoding)
+      data.freeze
+
+      bin = Binary.new(:data => data)
+      assert_equal data, bin.data, 'Newly assigned data differs from original'
+
+      bin.save!
+      assert_equal data, bin.data, 'Data differs from original after save'
+
+      assert_equal data, bin.reload.data, 'Reloaded data differs from original'
+    end
+  end
+end
+
+#end

data/test/db/db2.rb

@@ -1,13 +1,36 @@
 require 'jdbc_common'
 
-config = {
+config = { :adapter => "db2" }
+
+config[:host] = ENV['DB2HOST'] if ENV['DB2HOST']
+config[:port] = ENV['DB2PORT'] if ENV['DB2PORT']
 # DB2 uses $USER if running locally, just add
 # yourself to your db2 groups in /etc/group
-#  :username => "blog",
-#  :password => "",
-  :adapter  => "jdbc",
-  :driver => "com.ibm.db2.jcc.DB2Driver",
-  :url => "jdbc:db2:weblog_development"
-}
+config[:username] = ENV['DB2USER'] if ENV['DB2USER'] # db2inst1
+config[:password] = ENV['DB2PASS'] if ENV['DB2PASS']
+
+# DB2 does not like "_" in database names :
+# SQL0104N  An unexpected token "weblog_development" was found
+# create the sample database using `db2sampl` command
+database = ENV['DB2DATABASE'] || 'SAMPLE'
+if config[:host]
+  config[:database] = database
+else
+  config[:url] = "jdbc:db2:#{database}" # local instance
+end
+
+require 'jdbc/db2'
+# Download IBM DB2 JCC driver from :
+# https://www-304.ibm.com/support/docview.wss?rs=4020&uid=swg21385217
+begin
+  Java::JavaClass.for_name(Jdbc::DB2.driver_name)
+rescue NameError
+  begin
+    Jdbc::DB2.load_driver
+  rescue LoadError => e
+    puts "Please setup a JDBC driver to run the DB2 tests !"
+    raise e
+  end
+end
 
 ActiveRecord::Base.establish_connection(config)

data/test/db/jdbc.rb

@@ -4,10 +4,12 @@ require 'db/mysql_config'
 require 'jdbc/mysql' # driver not loaded for plain JDBC
 Jdbc::MySQL.load_driver
 
-ActiveRecord::Base.establish_connection({
+JDBC_CONFIG = {
   :adapter => 'jdbc',
   :driver => 'com.mysql.jdbc.Driver',
   :url => "jdbc:mysql://#{MYSQL_CONFIG[:host]}/#{MYSQL_CONFIG[:database]}",
   :username => MYSQL_CONFIG[:username],
   :password => MYSQL_CONFIG[:password],
-})
+}
+
+ActiveRecord::Base.establish_connection(JDBC_CONFIG)

data/test/db/oracle.rb

@@ -1,36 +1,27 @@
 require 'jdbc_common'
 
 config = {
-  :username => 'blog',
-  :password => 'blog',
   :adapter  => 'oracle',
+  :username => ENV["ORACLE_USER"] || 'blog',
+  :password => ENV["ORACLE_PASS"] || 'blog',
   :host => ENV["ORACLE_HOST"] || 'localhost',
-  :database => ENV["ORACLE_SID"] || 'XE' # XE is the default SID for oracle xe
+  :database => ENV["ORACLE_SID"] || 'XE'
 }
 
 ActiveRecord::Base.establish_connection(config)
 
-# Here are some notes of things I had to do to get running on Oracle
-# XE.
-#
-#   ON Linux:
-#   create tablespace weblog_development
-#     datafile '/usr/lib/oracle/xe/oradata/XE/weblog_development.dbf';
-#   ON Windows XP:
-#   create tablespace weblog_development 
-#     datafile 'C:\ORACLEXE\ORADATA\XE\WEBLOGD.DBF' size 16m;
-#
-#   create user blog identified by blog
-#     default tablespace weblog_development;
-#   grant all privileges to blog;
-#
-# You might need to up the number of processes and restart the
-# listener. (In my case, I had to reboot.) See
-# http://it.newinstance.it/2007/06/01/ora-12519-tnsno-appropriate-service-handler-found/
-#
-#   alter system set PROCESSES=150 scope=SPFILE;
-#
-# These might be helpful too (numbers are rather arbitrary...)
-#
-#   alter system set TRANSACTIONS=126 scope=SPFILE;
-#   alter system set SESSIONS=115 scope=SPFILE;
+require 'jdbc/oracle'
+# Download JDBC driverfrom :
+# http://www.oracle.com/technetwork/database/enterprise-edition/jdbc-112010-090769.html
+begin
+  Java::JavaClass.for_name(Jdbc::Oracle.driver_name)
+rescue NameError
+  begin
+    Jdbc::Oracle.load_driver
+  rescue LoadError => e
+    puts "Please setup a JDBC driver to run the Oracle tests !"
+    raise e
+  end
+end
+
+ActiveRecord::Base.establish_connection(config)