From 2dc2610621cfde70df8ad03a0b9f20022c6d6bcb Mon Sep 17 00:00:00 2001 From: John Date: Sun, 13 Oct 2019 23:05:48 +0800 Subject: [PATCH] improve gdb; README update --- README.MD | 2 +- README_ZH.MD | 1 + database/gdb/gdb_base.go | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.MD b/README.MD index d2bf6b062..3bb3c3ede 100644 --- a/README.MD +++ b/README.MD @@ -14,7 +14,7 @@ English | [简体中文](README_ZH.MD) # Installation ``` -go get -u github.com/gogf/gf +go get -u -v github.com/gogf/gf ``` suggested using `go.mod`: ``` diff --git a/README_ZH.MD b/README_ZH.MD index f1b740616..1e3288d34 100644 --- a/README_ZH.MD +++ b/README_ZH.MD @@ -15,6 +15,7 @@ # 特点 * 模块化、松耦合设计; * 模块丰富,开箱即用; +* 简便及可维护性为宗旨; * 详尽的开发文档及示例; * 完善的本地中文化支持; * 致力于项目的通用方案; diff --git a/database/gdb/gdb_base.go b/database/gdb/gdb_base.go index 7002e7885..18de865e6 100644 --- a/database/gdb/gdb_base.go +++ b/database/gdb/gdb_base.go @@ -688,11 +688,12 @@ func (bs *dbBase) formatWhere(where interface{}, args []interface{}) (newWhere s buffer.WriteString(key) } else { // 支持key带操作符号,注意like也算是操作符号 + key = gstr.Trim(key) if gstr.Pos(key, "?") == -1 { - if gstr.Pos(key, "<") == -1 && - gstr.Pos(key, ">") == -1 && - gstr.Pos(key, "=") == -1 && - gstr.PosI(key, " like") == -1 { + like := " like" + if len(key) > len(like) && gstr.Equal(key[len(key)-len(like):], like) { + buffer.WriteString(key + " ?") + } else if key[len(key)-1] != '<' && key[len(key)-1] != '>' && key[len(key)-1] != '=' { buffer.WriteString(key + "=?") } else { buffer.WriteString(key + " ?")