summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2018-04-28 23:52:00 +0000
committerGo MAEDA <maeda@farend.jp>2018-04-28 23:52:00 +0000
commit20d16fdba0878edefdcd2b302f2ba50586b94941 (patch)
tree6774a0583dabf23ba90bcb09a910a6e84ee2fb2f
parent0e7cd4133ffae94f1d4f0278fa7549e0ba882338 (diff)
downloadredmine-20d16fdba0878edefdcd2b302f2ba50586b94941.tar.gz
redmine-20d16fdba0878edefdcd2b302f2ba50586b94941.zip
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
-rw-r--r--app/models/version.rb2
-rw-r--r--test/unit/version_test.rb8
2 files changed, 9 insertions, 1 deletions
diff --git a/app/models/version.rb b/app/models/version.rb
index b48938913..a213359f6 100644
--- 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 fe4993ca6..40014375a 100644
--- 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={})