Merged r17316 from trunk to 3.4-stable (#27122).

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17317 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/version.rb b/app/models/version.rb
index b489389133c984ff6bf84f506407534b3510cf1b..a213359f6f8ff5b189529dbecaaecb82fc227223 100644 (file)
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -45,7 +45,7 @@ class Version < ActiveRecord::Base
   scope :like, lambda {|arg|
     if arg.present?
       pattern = "%#{arg.to_s.strip}%"
-      where("LOWER(#{Version.table_name}.name) LIKE :p", :p => pattern)
+      where([Redmine::Database.like("#{Version.table_name}.name", '?'), pattern])
     end
   }
   scope :open, lambda { where(:status => 'open') }

diff --git a/test/unit/version_test.rb b/test/unit/version_test.rb
index fe4993ca6af0c1dba920929ae95c334773264958..40014375ac55d0f91ec2d34e07fb1884e78ffd6c 100644 (file)
--- a/test/unit/version_test.rb
+++ b/test/unit/version_test.rb
@@ -277,6 +277,14 @@ class VersionTest < ActiveSupport::TestCase
     assert_equal false, version.deletable?
   end
 
+  def test_like_scope
+    version = Version.create!(:project => Project.find(1), :name => 'Version for like scope test')
+
+    assert_includes Version.like('VERSION FOR LIKE SCOPE TEST'), version
+    assert_includes Version.like('version for like scope test'), version
+    assert_includes Version.like('like scope'), version
+  end
+
   private
 
   def add_issue(version, attributes={})