save

any.go

+package zdb
+
+import (
+	"fmt"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
+	"reflect"
+	"time"
+)
+
+func (d *Pool) WAny(dst any, sql string, args ...any) error {
+	return d.execWrapper(ConnModeMaster, dst, func(conn *conn, dst1 any) error {
+		return d.qAny(conn, dst1, sql, args...)
+	})
+}
+func (d *Pool) Any(dst any, sql string, args ...any) error {
+	return d.execWrapper(ConnModeSync, dst, func(conn *conn, dst1 any) error {
+		return d.qAny(conn, dst1, sql, args...)
+	})
+}
+func (d *Pool) AnyAsync(dst any, sql string, args ...any) error {
+	return d.execWrapper(ConnModeAsync, dst, func(conn *conn, dst1 any) error {
+		return d.qAny(conn, dst1, sql, args...)
+	})
+}
+
+func (d *Pool) qAny(q *conn, dst any, sql string, args ...any) error {
+	var rows pgx.Rows
+	var err error
+
+	dstVal := reflect.ValueOf(dst)
+
+	if !dstVal.IsValid() || (dstVal.Kind() == reflect.Ptr && dstVal.IsNil()) {
+		return fmt.Errorf("destination must be a non nil pointer")
+	}
+	if dstVal.Kind() != reflect.Ptr {
+		return fmt.Errorf("destination must be a pointer, got: %v", dstVal.Type())
+	}
+
+	if rows, err = q.Query(d.ctx, sql, args...); err != nil {
+		return err
+	}
+	defer rows.Close()
+
+	var out []map[string]any
+
+	desc := rows.FieldDescriptions()
+
+	for rows.Next() {
+		r := map[string]any{}
+		v, _ := rows.Values()
+
+		for i, f := range desc {
+			if v[i] == nil {
+				r[f.Name] = nil
+			} else if f.DataTypeOID == pgtype.NumericOID {
+				ff, _ := v[i].(pgtype.Numeric).Float64Value()
+				r[f.Name] = ff.Float64
+			} else if f.DataTypeOID == pgtype.TimestampOID {
+				r[f.Name] = v[i].(time.Time).Format(d.PgTsFormat)
+			} else if f.DataTypeOID == pgtype.UUIDOID {
+				bb := v[i].([16]byte)
+				u, _ := uuid.FromBytes(bb[:])
+				r[f.Name] = u.String()
+			} else {
+				r[f.Name] = v[i]
+			}
+		}
+
+		out = append(out, r)
+	}
+
+	dstVal = dstVal.Elem()
+	dstVal.Set(reflect.ValueOf(out))
+
+	return nil
+}

go.mod

-module gitlab.x/barsukov/zdb
+module git.barsukov.pro/barsukov/zdb
 
 go 1.20
 
 require (
 	github.com/georgysavva/scany/v2 v2.0.0
+	github.com/google/uuid v1.3.0
 	github.com/jackc/pgx/v5 v5.3.1
 )
 

go.sum

+github.com/cockroachdb/cockroach-go/v2 v2.2.0 h1:/5znzg5n373N/3ESjHF5SMLxiW4RKB05Ql//KWfeTFs=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/georgysavva/scany/v2 v2.0.0 h1:RGXqxDv4row7/FYoK8MRXAZXqoWF/NM+NP0q50k3DKU=
 github.com/georgysavva/scany/v2 v2.0.0/go.mod h1:sigOdh+0qb/+aOs3TVhehVT10p8qJL7K/Zhyz8vWo38=
+github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
@@ -9,15 +14,22 @@ github.com/jackc/pgx/v5 v5.3.1 h1:Fcr8QJ1ZeLi5zsPZqQeUZhNhxfkkKBOgJuYkJHoBOtU=
 github.com/jackc/pgx/v5 v5.3.1/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8=
 github.com/jackc/puddle/v2 v2.2.0 h1:RdcDk92EJBuBS55nQMMYFXTxwstHug4jkhT5pq8VxPk=
 github.com/jackc/puddle/v2 v2.2.0/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
+github.com/lib/pq v1.10.0 h1:Zx5DJFEYQXio93kgXnQ09fXNiUKsqv4OUEu2UtGcB1E=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
 golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
 golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
 golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
 golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

pool.go

@@ -29,6 +29,8 @@ type Pool struct {
 	slavesAsyncIter *atomic.Int64
 
 	stop bool
+
+	PgTsFormat string
 }
 
 func New() *Pool {
@@ -36,6 +38,7 @@ func New() *Pool {
 		mu:              &sync.RWMutex{},
 		slavesIter:      &atomic.Int64{},
 		slavesAsyncIter: &atomic.Int64{},
+		PgTsFormat:      "2006-01-02 15:04:05",
 	}
 }
 
@@ -101,7 +104,7 @@ func (d *Pool) newConn(mode connMode, pgConnString string) (q *conn, err error)
 	return q, nil
 }
 
-func (d *Pool) slave() *conn {
+func (d *Pool) sync() *conn {
 	if len(d.srvSlaves) == 0 {
 		return d.srvMaster
 	}
@@ -112,9 +115,9 @@ func (d *Pool) slave() *conn {
 	return d.srvSlaves[d.slavesIter.Add(1)%int64(len(d.srvSlaves))]
 }
 
-func (d *Pool) slaveAsync() *conn {
+func (d *Pool) async() *conn {
 	if len(d.srvSlavesAsync) == 0 {
-		return d.slave()
+		return d.sync()
 	}
 
 	d.mu.RLock()
@@ -128,9 +131,9 @@ func (d *Pool) execWrapper(pool connMode, dst any, f func(conn *conn, dst1 any)
 		var q *conn
 
 		if pool == ConnModeSync {
-			q = d.slave()
+			q = d.sync()
 		} else {
-			q = d.slaveAsync()
+			q = d.async()
 		}
 
 		if err := f(q, dst); err != nil {

select.go

 package zdb
 
-import "github.com/georgysavva/scany/v2/pgxscan"
+import (
+	"github.com/georgysavva/scany/v2/pgxscan"
+)
 
 func (d *Pool) WSelect(dst any, sql string, args ...any) error {
 	return d.qSelect(d.srvMaster, dst, sql, args...)