From 2ec328059f36307f11b029150f06ce3e948e61bf Mon Sep 17 00:00:00 2001 From: Ankit Patial Date: Sat, 26 Jul 2025 21:45:09 +0530 Subject: [PATCH] func return type change --- pgm.go | 19 ++++++------------- pool.go | 23 ++++++++++++++--------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/pgm.go b/pgm.go index ead183a..b1f7fb1 100644 --- a/pgm.go +++ b/pgm.go @@ -4,11 +4,9 @@ package pgm import ( - "errors" "strings" "time" - "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgtype" ) @@ -116,19 +114,14 @@ func PgTimeNow() pgtype.Timestamptz { return pgtype.Timestamptz{Time: time.Now(), Valid: true} } -// IsNotFound error check -func IsNotFound(err error) bool { - return errors.Is(err, pgx.ErrNoRows) +func ConcatWs(sep string, fields ...Field) Field { + return Field("concat_ws('" + sep + "'," + joinFileds(fields) + ")") } -func ConcatWs(sep string, fields ...Field) string { - return "concat_ws('" + sep + "'," + joinFileds(fields) + ")" +func StringAgg(exp, sep string) Field { + return Field("string_agg(" + exp + ",'" + sep + "')") } -func StringAgg(exp, sep string) string { - return "string_agg(" + exp + ",'" + sep + "')" -} - -func StringAggCast(exp, sep string) string { - return "string_agg(cast(" + exp + " as varchar),'" + sep + "')" +func StringAggCast(exp, sep string) Field { + return Field("string_agg(cast(" + exp + " as varchar),'" + sep + "')") } diff --git a/pool.go b/pool.go index 7912cd6..9fdff0b 100644 --- a/pool.go +++ b/pool.go @@ -77,6 +77,17 @@ func InitPool(conf Config) { poolPGX.Store(p) } +// get string builder from pool +func getSB() *strings.Builder { + return poolStringBuilder.Get().(*strings.Builder) +} + +// put string builder back to pool +func putSB(sb *strings.Builder) { + sb.Reset() + poolStringBuilder.Put(sb) +} + // GetPool instance func GetPool() *pgxpool.Pool { return poolPGX.Load() @@ -93,13 +104,7 @@ func BeginTx(ctx context.Context) (pgx.Tx, error) { return tx, err } -// get string builder from pool -func getSB() *strings.Builder { - return poolStringBuilder.Get().(*strings.Builder) -} - -// put string builder back to pool -func putSB(sb *strings.Builder) { - sb.Reset() - poolStringBuilder.Put(sb) +// IsNotFound error check +func IsNotFound(err error) bool { + return errors.Is(err, pgx.ErrNoRows) }