fixbug-user

Author: bingxindan

store/postgresql/user.go

@@ -387,35 +387,37 @@ func (u *userStore) listUsers(filters map[string]string, offset uint32, limit ui
 		getSql += "  AND user_type != 0 "
 	}
 
-	args := make([]interface{}, 0)
-	var index = 1
+	var (
+		args = make([]interface{}, 0)
+		idx  = 1
+	)
 
 	if len(filters) != 0 {
 		for k, v := range filters {
 			getSql += " AND "
 			countSql += " AND "
 			if k == NameAttribute {
 				if utils.IsPrefixWildName(v) {
-					getSql += " " + k + fmt.Sprintf(" like $%d ", index)
-					countSql += " " + k + fmt.Sprintf(" like $%d ", index)
+					getSql += " " + k + fmt.Sprintf(" like $%d ", idx)
+					countSql += " " + k + fmt.Sprintf(" like $%d ", idx)
 					args = append(args, "%"+v[:len(v)-1]+"%")
 				} else {
-					getSql += " " + k + fmt.Sprintf(" = $%d ", index)
-					countSql += " " + k + fmt.Sprintf(" = $%d ", index)
+					getSql += " " + k + fmt.Sprintf(" = $%d ", idx)
+					countSql += " " + k + fmt.Sprintf(" = $%d ", idx)
 					args = append(args, v)
 				}
 			} else if k == OwnerAttribute {
-				getSql += fmt.Sprintf(" (id = $%d OR owner = $%d) ", index, index+1)
-				countSql += fmt.Sprintf(" (id = $%d OR owner = $%d) ", index, index+1)
-				index += 1
+				getSql += fmt.Sprintf(" (id = $%d OR owner = $%d) ", idx, idx+1)
+				countSql += fmt.Sprintf(" (id = $%d OR owner = $%d) ", idx, idx+1)
+				idx += 2
 				args = append(args, v, v)
 				continue
 			} else {
-				getSql += " " + k + fmt.Sprintf(" = $%d ", index)
-				countSql += " " + k + fmt.Sprintf(" = $%d ", index)
+				getSql += " " + k + fmt.Sprintf(" = $%d ", idx)
+				countSql += " " + k + fmt.Sprintf(" = $%d ", idx)
 				args = append(args, v)
 			}
-			index++
+			idx++
 		}
 	}
 
@@ -424,7 +426,7 @@ func (u *userStore) listUsers(filters map[string]string, offset uint32, limit ui
 		return 0, nil, store.Error(err)
 	}
 
-	getSql += fmt.Sprintf(" ORDER BY mtime LIMIT $%d OFFSET $%d", index, index+1)
+	getSql += fmt.Sprintf(" ORDER BY mtime LIMIT $%d OFFSET $%d", idx, idx+1)
 	getArgs := append(args, limit, offset)
 
 	users, err := u.collectUsers(u.master.Query, getSql, getArgs)
@@ -456,7 +458,7 @@ func (u *userStore) listGroupUsers(filters map[string]string, offset uint32, lim
 		querySql += " AND u.user_type != 0 "
 	}
 
-	var index = 1
+	var idx = 1
 
 	for k, v := range filters {
 		if newK, ok := userLinkGroupAttributeMapping[k]; ok {
@@ -468,24 +470,24 @@ func (u *userStore) listGroupUsers(filters map[string]string, offset uint32, lim
 		}
 
 		if utils.IsPrefixWildName(v) {
-			querySql += " AND " + k + fmt.Sprintf(" like $%d", index)
-			countSql += " AND " + k + fmt.Sprintf(" like $%d", index)
+			querySql += " AND " + k + fmt.Sprintf(" like $%d", idx)
+			countSql += " AND " + k + fmt.Sprintf(" like $%d", idx)
 			args = append(args, v[:len(v)-1]+"%")
 		} else {
-			querySql += " AND " + k + fmt.Sprintf(" = $%d", index)
-			countSql += " AND " + k + fmt.Sprintf(" = $%d", index)
+			querySql += " AND " + k + fmt.Sprintf(" = $%d", idx)
+			countSql += " AND " + k + fmt.Sprintf(" = $%d", idx)
 			args = append(args, v)
 		}
 
-		index++
+		idx++
 	}
 
 	count, err := queryEntryCount(u.slave, countSql, args)
 	if err != nil {
 		return 0, nil, err
 	}
 
-	querySql += fmt.Sprintf(" ORDER BY u.mtime LIMIT $%d OFFSET $%d", index, index+1)
+	querySql += fmt.Sprintf(" ORDER BY u.mtime LIMIT $%d OFFSET $%d", idx, idx+1)
 	args = append(args, limit, offset)
 
 	users, err := u.collectUsers(u.master.Query, querySql, args)

store/postgresql/user_test.go

@@ -0,0 +1,34 @@
+/**
+ * Tencent is pleased to support the open source community by making Polaris available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package postgresql
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestGetUsers(t *testing.T) {
+	obj := initConf()
+	filters := map[string]string{
+		"name":       "polaris",
+		"hide_admin": "true",
+		"owner":      "",
+	}
+	cnt, ret, err := obj.userStore.GetUsers(filters, 0, 10)
+	fmt.Printf("cnt: %+v, ret: %+v, err: %+v\n", cnt, ret, err)
+}