@@ -143,7 +143,7 @@ module EZ @negate ? ["#{@table_prefix}#{@name} IS NOT NULL"] : ["#{@table_prefix}#{@name} IS NULL"] else if @case_insensitive and value.respond_to?(:upcase) - @negate ? ["UPPER(#{@table_prefix}#{@name}) != ?", value.upcase] : ["UPPER(#{@table_prefix}#{@name}) = ?", value.upcase] + @negate ? ["UPPER(#{@table_prefix}#{@name}) != ?", value.mb_chars.upcase] : ["UPPER(#{@table_prefix}#{@name}) = ?", value.mb_chars.upcase] else @negate ? ["#{@table_prefix}#{@name} != ?", value] : ["#{@table_prefix}#{@name} = ?", value] end @@ -155,7 +155,7 @@ module EZ @negate ? ["#{@table_prefix}#{@name} NOT REGEXP ?", str] : ["#{@table_prefix}#{@name} REGEXP ?", str] else if @case_insensitive and value.respond_to?(:upcase) - @negate ? ["UPPER(#{@table_prefix}#{@name}) NOT LIKE ?", value.upcase] : ["UPPER(#{@table_prefix}#{@name}) LIKE ?", value.upcase] + @negate ? ["UPPER(#{@table_prefix}#{@name}) NOT LIKE ?", value.mb_chars.upcase] : ["UPPER(#{@table_prefix}#{@name}) LIKE ?", value.mb_chars.upcase] else @negate ? ["#{@table_prefix}#{@name} NOT LIKE ?", value] : ["#{@table_prefix}#{@name} LIKE ?", value] end lib/ez/clause.rb @@ -675,6 +675,13 @@ class EZWhereTest < Test::Unit::TestCase assert_equal expected, cond.to_sql end + def test_case_insensitive_utf + cond = EZ::Where::Condition.new :my_table + cond.any_of(:title, :subtitle).nocase =~ '%zażółć%' + expected = ["(UPPER(my_table.title) LIKE ? OR UPPER(my_table.subtitle) LIKE ?)", "%ZAŻÓŁĆ%", "%ZAŻÓŁĆ%"] + assert_equal expected, cond.to_sql + end + def test_handling_of_empty_clause_values clause = EZ::Where::Clause.new(:name) clause == nil test/ez_where_tests.rb @@ -3,7 +3,6 @@ require 'rubygems' require 'active_record' require 'active_record/fixtures' require 'active_support' -require 'active_support/breakpoint' require File.dirname(__FILE__) + '/../lib/ez/where' require File.dirname(__FILE__) + '/../lib/ez/clause' @@ -11,6 +10,8 @@ require File.dirname(__FILE__) + '/../lib/ez/condition' require File.dirname(__FILE__) + '/../lib/ez/hash' require File.dirname(__FILE__) + '/../lib/ez/compositions' +$KCODE = 'u' if RUBY_VERSION < '1.9' + config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml')) ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log") test/test_helper.rb d902d99736a5e320bfc3cbc09a6b09e48990807b Ezra Zygmuntowicz ez@engineyard.com http://github.com/ezmobius/ez-where/commit/7290d372f26adae0dd74f720b6501cebdb36edf0 7290d372f26adae0dd74f720b6501cebdb36edf0 2009-02-14T14:27:20-08:00 2009-02-14T14:27:20-08:00 fixing up to be rails 2.2 and multibyte aware for comparisons( Michal Lomnicki) 72ebc4b71441edd07c535f921d95483aa62f0f84 Ezra Zygmuntowicz ez@engineyard.com