activerecord-jdbc-adapter 1.3.0.rc1 → 1.3.0

data/lib/arjdbc/tasks/oracle/enhanced_structure_dump.rb

@@ -44,15 +44,15 @@ module ActiveRecord #:nodoc:
 
       def structure_dump_column(column) #:nodoc:
         col = "\"#{column['column_name']}\" #{column['data_type']}"
-        if column['data_type'] =='NUMBER' and !column['data_precision'].nil?
+        if column['data_type'] =='NUMBER' && ! column['data_precision'].blank?
           col << "(#{column['data_precision'].to_i}"
-          col << ",#{column['data_scale'].to_i}" if !column['data_scale'].nil?
+          col << ",#{column['data_scale'].to_i}" unless column['data_scale'].blank?
           col << ')'
         elsif column['data_type'].include?('CHAR')
           length = column['char_used'] == 'C' ? column['char_length'].to_i : column['data_length'].to_i
           col <<  "(#{length})"
         end
-        col << " DEFAULT #{column['data_default']}" if !column['data_default'].nil?
+        col << " DEFAULT #{column['data_default']}" unless column['data_default'].blank?
         col << ' NOT NULL' if column['nullable'] == 'N'
         col
       end
@@ -60,9 +60,9 @@ module ActiveRecord #:nodoc:
       def structure_dump_virtual_column(column, data_default) #:nodoc:
         data_default = data_default.gsub(/"/, '')
         col = "\"#{column['column_name']}\" #{column['data_type']}"
-        if column['data_type'] =='NUMBER' and !column['data_precision'].nil?
+        if column['data_type'] =='NUMBER' && ! column['data_precision'].blank?
           col << "(#{column['data_precision'].to_i}"
-          col << ",#{column['data_scale'].to_i}" if !column['data_scale'].nil?
+          col << ",#{column['data_scale'].to_i}" unless column['data_scale'].blank?
           col << ')'
         elsif column['data_type'].include?('CHAR')
           length = column['char_used'] == 'C' ? column['char_length'].to_i : column['data_length'].to_i

data/lib/arjdbc/util/serialized_attributes.rb

@@ -0,0 +1,87 @@
+module ArJdbc
+  module Util
+    # Gets included into `ActiveRecord::Base` to support sending LOB values
+    # in a separate update SQL statement for DB adapters that need this.
+    module SerializedAttributes
+
+      # protected
+
+      def update_lob_columns
+        klass = self.class
+        return unless type = klass.lob_type # e.g. /blob/i
+        connection = klass.connection
+        if connection.respond_to?(:update_lob_values?)
+          return false unless connection.update_lob_values?
+        end
+        klass.columns.each do |column|
+          next if column.sql_type !~ type
+          next if ( value = dump_column_value(column) ).nil?
+          if connection.respond_to?(:update_lob_value?)
+            next unless connection.update_lob_value?(value, column)
+          end
+          connection.update_lob_value(self, column, value)
+        end
+      end
+
+      private
+
+      def dump_column_value(column)
+        SerializedAttributes.dump_column_value(self, column)
+      end
+
+      def self.dump_column_value(record, column)
+        value = record[ name = column.name.to_s ]
+        if record.class.respond_to?(:serialized_attributes)
+          if coder = record.class.serialized_attributes[name]
+            value = coder.respond_to?(:dump) ? coder.dump(value) : value.to_yaml
+          end
+        else
+          if record.respond_to?(:unserializable_attribute?)
+            value = value.to_yaml if record.unserializable_attribute?(name, column)
+          else
+            value = value.to_yaml if value.is_a?(Hash)
+          end
+        end
+        value
+      end
+
+      def self.setup(lob_type = nil, after_save_alias = nil)
+        ActiveRecord::Base.send :include, self # include SerializedAttributes
+        ActiveRecord::Base.lob_type = lob_type unless lob_type.nil?
+        if after_save_alias
+          ActiveRecord::Base.class_eval do
+            alias_method after_save_alias, 'update_lob_columns'
+          end
+          ActiveRecord::Base.after_save after_save_alias
+        else
+          ActiveRecord::Base.after_save 'update_lob_columns'
+        end
+      end
+
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+
+        def lob_type
+          @lob_type ||= begin
+            if superclass.respond_to?(:lob_type)
+              superclass.lob_type
+            else
+              /blob|clob/i
+            end
+          end
+        end
+
+        def lob_type=(type)
+          @lob_type = type
+        end
+
+      end
+
+    end
+  end
+  # @private only due backwards compatibility
+  SerializedAttributesHelper = Util::SerializedAttributes
+end

data/lib/arjdbc/version.rb

@@ -1,5 +1,5 @@
 module ArJdbc
-  VERSION = "1.3.0.rc1"
+  VERSION = "1.3.0"
   # @deprecated
   module Version
     # @private 1.2.x compatibility

data/rakelib/02-test.rake

@@ -82,7 +82,7 @@ test_task_for :PostgreSQL, :prereqs => 'db:postgresql', :driver => 'postgres'
 task :test_postgres => :test_postgresql # alias
 task :test_pgsql => :test_postgresql # alias
 test_task_for :SQLite3
-test_task_for :FireBird
+test_task_for :Firebird
 
 # ensure driver for these DBs is on your class-path
 [ :Oracle, :DB2, :Informix, :CacheDB ].each do |adapter|

data/rakelib/db.rake

@@ -7,7 +7,7 @@ namespace :db do
     load 'test/db/mysql_config.rb' # rescue nil
     script = sql_script <<-SQL, 'mysql'
 DROP DATABASE IF EXISTS `#{MYSQL_CONFIG[:database]}`;
-CREATE DATABASE `#{MYSQL_CONFIG[:database]}` DEFAULT CHARACTER SET `utf8`;
+CREATE DATABASE `#{MYSQL_CONFIG[:database]}` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_general_ci`;
 GRANT ALL PRIVILEGES ON `#{MYSQL_CONFIG[:database]}`.* TO #{MYSQL_CONFIG[:username]}@localhost;
 GRANT ALL PRIVILEGES ON `test\_%`.* TO #{MYSQL_CONFIG[:username]}@localhost;
 SET PASSWORD FOR #{MYSQL_CONFIG[:username]}@localhost = PASSWORD('#{MYSQL_CONFIG[:password]}');

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

@@ -1,5 +1,5 @@
-/*
- **** BEGIN LICENSE BLOCK *****
+/***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2012-2013 Karol Bucek <self@kares.org>
  * 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>

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

@@ -1,4 +1,5 @@
 /***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2012-2013 Karol Bucek <self@kares.org>
  * Copyright (c) 2006-2011 Nick Sieger <nick@nicksieger.com>
  * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
  *
@@ -29,7 +30,6 @@ import static arjdbc.util.QuotingUtils.BYTES_1;
 import static arjdbc.util.QuotingUtils.BYTES_SINGLE_Q_x2;
 
 import org.jruby.Ruby;
-import org.jruby.RubyBoolean;
 import org.jruby.RubyModule;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
@@ -97,150 +97,10 @@ public class DerbyModule {
 
     }
 
-    @JRubyMethod(name = "quote", required = 1, optional = 1)
-    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 ) {
-            final IRubyObject column = args[1];
-            final String columnType = column.isNil() ? "" : column.callMethod(context, "type").toString();
-            // intercept and change value, maybe, if the column type is :text or :string
-            if ( columnType.equals("text") || columnType.equals("string") ) {
-            	value = toRubyStringForTextColumn(context, runtime, self, value);
-            }
-
-            if ( value instanceof RubyString ) {
-                if ( columnType.equals("string") ) {
-                    return quoteString(runtime, "'", value, "'");
-                }
-                if ( columnType.equals("text") ) {
-                    return quoteString(runtime, "CAST('", value, "' AS CLOB)");
-                }
-                if ( columnType.equals("binary") ) {
-                    return quoteStringHex(runtime, "CAST(X'", value, "' AS BLOB)");
-                }
-                if ( columnType.equals("xml") ) {
-                    return quoteString(runtime, "XMLPARSE(DOCUMENT '", value, "' PRESERVE WHITESPACE)");
-                }
-                // column type :integer or other numeric or date version
-                return isDigitsOnly(value) ? value : quoteDefault(context, runtime, self, value, column, columnType);
-            }
-
-            final String metaClass = value.getMetaClass().getName();
-            if ( metaClass.equals("Float") || metaClass.equals("Fixnum") || metaClass.equals("Bignum") ) {
-                if ( columnType.equals("string") ) {
-                    return quoteString(runtime, "'", RubyString.objAsString(context, value), "'");
-                }
-            }
-        }
-        return quoteDefault(context, runtime, self, value, runtime.getNil(), null);
-    }
-
-    private static IRubyObject quoted_date_OR_to_yaml(final ThreadContext context,
-        final Ruby runtime, final IRubyObject self, final IRubyObject value) {
-
-        if ( value.callMethod(context, "acts_like?", runtime.newSymbol("date")).isTrue()
-          || value.callMethod(context, "acts_like?", runtime.newSymbol("time")).isTrue() ) {
-            return self.callMethod(context, "quoted_date", value);
-        }
-        else {
-            return value.callMethod(context, "to_yaml");
-        }
-    }
-
-    /*
-     * Derby is not permissive like MySql. Try and send an Integer to a CLOB or
-     * VARCHAR column and Derby will vomit.
-     * This method turns non stringy things into strings.
-     */
-    private static IRubyObject toRubyStringForTextColumn(
-        final ThreadContext context, final Ruby runtime, final IRubyObject self,
-        final IRubyObject value) {
-
-        if ( value instanceof RubyString || value.isNil() || isMultibyteChars(runtime, value) ) {
-            return value;
-        }
-
-        if ( value instanceof RubyBoolean ) return quoteBoolean(runtime, value);
-
-        final String className = value.getMetaClass().getName();
-        if ( className.equals("Float") || className.equals("Fixnum") || className.equals("Bignum") ) {
-            return RubyString.objAsString(context, value);
-        }
-        if ( className.equals("BigDecimal") ) {
-            return value.callMethod(context, "to_s", runtime.newString("F"));
-        }
-
-        return quoted_date_OR_to_yaml(context, runtime, self, value);
-    }
-
-    private final static ByteList NULL = new ByteList("NULL".getBytes(), false);
-
-    private static IRubyObject quoteDefault(final ThreadContext context,
-        final Ruby runtime, final IRubyObject self,
-        final IRubyObject value, final IRubyObject column, final String columnType) {
-
-        if ( value.respondsTo("quoted_id") ) {
-            return value.callMethod(context, "quoted_id");
-        }
-
-        if ( value.isNil() ) {
-            return runtime.newString(NULL);
-        }
-        if ( value instanceof RubyBoolean ) {
-            if ( columnType == (Object) "integer" ) return quoteBoolean(runtime, value);
-            return self.callMethod(context, value.isTrue() ? "quoted_true" : "quoted_false");
-        }
-        if ( value instanceof RubyString || isMultibyteChars(runtime, value) ) {
-
-            final RubyString strValue = RubyString.objAsString(context, value);
-
-            if ( columnType == (Object) "binary" && column.getType().respondsTo("string_to_binary") ) {
-                IRubyObject str = column.getType().callMethod(context, "string_to_binary", strValue);
-                return quoteString(runtime, "'", str, "'");
-            }
-
-            if ( columnType == (Object) "integer" ) {
-                return RubyString.objAsString( context, strValue.callMethod(context, "to_i") );
-            }
-
-            if ( columnType == (Object) "float" ) {
-                return RubyString.objAsString( context, strValue.callMethod(context, "to_f") );
-            }
-
-            return quoteString(runtime, "'", strValue, "'");
-        }
-
-        final String className = value.getMetaClass().getName();
-        if ( className.equals("Float") || className.equals("Fixnum") || className.equals("Bignum") ) {
-            return RubyString.objAsString(context, value);
-        }
-        if ( className.equals("BigDecimal") ) {
-            return value.callMethod(context, "to_s", runtime.newString("F"));
-        }
-
-        IRubyObject strValue = quoted_date_OR_to_yaml(context, runtime, self, value);
-        return quoteString(runtime, "'", strValue, "'");
-    }
-
-    private static IRubyObject quoteString(final Ruby runtime,
-        final String before, final IRubyObject string, final String after) {
-
-        final ByteList input = ((RubyString) 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);
+    @JRubyMethod(name = "quote_binary", required = 1)
+    public static IRubyObject quote_binary(final ThreadContext context,
+        final IRubyObject self, final IRubyObject string) {
+        return quoteStringHex(context.getRuntime(), "", string, "");
     }
 
     private final static byte[] HEX = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
@@ -249,44 +109,35 @@ public class DerbyModule {
         final String before, final IRubyObject string, final String after) {
 
         final ByteList input = ((RubyString) string).getByteList();
-        final ByteList output = new ByteList(before.getBytes());
+        final int size = input.getRealSize();
+        final ByteList output = new ByteList( before.length() + size * 2 + after.length() );
+        output.append( before.getBytes() );
+
         final byte[] inputBytes = input.unsafeBytes();
 
         int written = 0;
-        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);
+        for (int i = input.getBegin(); i < input.getBegin() + size; i++) {
+            final byte b = inputBytes[i];
+            byte h = HEX[ ( ((char) b) >> 4 ) % 16 ];
+            byte l = HEX[ ( (char) b ) % 16 ];
+            output.append(h).append(l);
             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());
+        output.append( after.getBytes() );
         return RubyString.newStringShared(runtime, output);
     }
 
-    private static boolean isDigitsOnly(final IRubyObject string) {
-        final ByteList input = ((RubyString) 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;
-            }
-        }
-        return true;
-    }
-
-    private static boolean isMultibyteChars(final Ruby runtime, final IRubyObject value) {
-        return getMultibyteChars(runtime).isInstance(value);
-    }
-
     @JRubyMethod(name = "quote_string", required = 1)
     public static IRubyObject quote_string(final IRubyObject self, IRubyObject string) {
+        if ( ! ( string instanceof RubyString ) ) {
+            string = string.asString(); // e.g. Multibyte::Chars
+        }
+
         ByteList bytes = ((RubyString) string).getByteList();
 
         boolean replacement = false;
@@ -310,15 +161,13 @@ public class DerbyModule {
 
     @JRubyMethod(name = "quoted_true", required = 0, frame = false)
     public static IRubyObject quoted_true(
-            final ThreadContext context,
-            final IRubyObject self) {
+        final ThreadContext context, final IRubyObject self) {
         return RubyString.newString(context.getRuntime(), BYTES_1);
     }
 
     @JRubyMethod(name = "quoted_false", required = 0, frame = false)
     public static IRubyObject quoted_false(
-            final ThreadContext context,
-            final IRubyObject self) {
+        final ThreadContext context, final IRubyObject self) {
         return RubyString.newString(context.getRuntime(), BYTES_0);
     }
 
@@ -326,6 +175,10 @@ public class DerbyModule {
         return value.isTrue() ? runtime.newString(BYTES_1) : runtime.newString(BYTES_0);
     }
 
+    private static boolean isMultibyteChars(final Ruby runtime, final IRubyObject value) {
+        return getMultibyteChars(runtime).isInstance(value);
+    }
+
     private static RubyModule getMultibyteChars(final Ruby runtime) {
         return (RubyModule) ((RubyModule) runtime.getModule("ActiveSupport").
                 getConstant("Multibyte")).getConstantAt("Chars");

data/src/java/arjdbc/h2/H2Module.java

@@ -1,4 +1,5 @@
 /***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2012-2013 Karol Bucek <self@kares.org>
  * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
  * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
  *

data/src/java/arjdbc/h2/H2RubyJdbcConnection.java

@@ -1,5 +1,4 @@
-/*
- **** BEGIN LICENSE BLOCK *****
+/***** 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>

data/src/java/arjdbc/hsqldb/HSQLDBModule.java

@@ -1,4 +1,5 @@
 /***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2012-2013 Karol Bucek <self@kares.org>
  * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
  * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
  *
@@ -35,33 +36,33 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 public class HSQLDBModule {
-    
+
     public static RubyModule load(final RubyModule arJdbc) {
         RubyModule hsqldb = arJdbc.defineModuleUnder("HSQLDB");
         hsqldb.defineAnnotatedMethods( HSQLDBModule.class );
         return hsqldb;
     }
-    
+
     @JRubyMethod(name = "quote_string", required = 1, frame = false)
     public static IRubyObject quote_string(
-            final ThreadContext context, 
-            final IRubyObject self, 
+            final ThreadContext context,
+            final IRubyObject self,
             final IRubyObject string) {
         return quoteSingleQuotesWithFallback(context, string);
     }
-    
+
     @JRubyMethod(name = "quoted_true", required = 0, frame = false)
     public static IRubyObject quoted_true(
-            final ThreadContext context, 
+            final ThreadContext context,
             final IRubyObject self) {
         return RubyString.newString(context.getRuntime(), BYTES_1);
     }
-    
+
     @JRubyMethod(name = "quoted_false", required = 0, frame = false)
     public static IRubyObject quoted_false(
-            final ThreadContext context, 
+            final ThreadContext context,
             final IRubyObject self) {
         return RubyString.newString(context.getRuntime(), BYTES_0);
     }
-    
+
 }