Browse Source

#2814 LOWER() column value within search

Unknwon 9 years ago
parent
commit
ff731ea07d
5 changed files with 6 additions and 6 deletions
  1. 1 1
      README.md
  2. 1 1
      gogs.go
  3. 1 1
      models/repo.go
  4. 2 2
      models/user.go
  5. 1 1
      templates/.VERSION

+ 1 - 1
README.md

@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 
 ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
 
-##### Current version: 0.9.11
+##### Current version: 0.9.12
 
 | Web | UI  | Preview  |
 |:-------------:|:-------:|:-------:|

+ 1 - 1
gogs.go

@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.9.11.0316"
+const APP_VER = "0.9.12.0316"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

+ 1 - 1
models/repo.go

@@ -1520,7 +1520,7 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (repos []*Repository, _ int
 	repos = make([]*Repository, 0, opts.PageSize)
 
 	// Append conditions
-	sess := x.Where("lower_name like ?", "%"+opts.Keyword+"%")
+	sess := x.Where("LOWER(lower_name) LIKE ?", "%"+opts.Keyword+"%")
 	if opts.OwnerID > 0 {
 		sess.And("owner_id = ?", opts.OwnerID)
 	}

+ 2 - 2
models/user.go

@@ -1140,8 +1140,8 @@ func SearchUserByName(opts *SearchUserOptions) (users []*User, _ int64, _ error)
 	searchQuery := "%" + opts.Keyword + "%"
 	users = make([]*User, 0, opts.PageSize)
 	// Append conditions
-	sess := x.Where("lower_name like ?", searchQuery).
-		Or("full_name like ?", searchQuery).
+	sess := x.Where("LOWER(lower_name) LIKE ?", searchQuery).
+		Or("LOWER(full_name) LIKE ?", searchQuery).
 		And("type = ?", opts.Type)
 
 	var countSess xorm.Session

+ 1 - 1
templates/.VERSION

@@ -1 +1 @@
-0.9.11.0316
+0.9.12.0316