Commit 1c1eb92b authored by Vladimir Barsukov's avatar Vladimir Barsukov
Browse files

fix

parent 4a21e5bf
...@@ -4,9 +4,6 @@ import ( ...@@ -4,9 +4,6 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"git.barsukov.pro/barsukov/zdb/ztype"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgtype"
"github.com/jackc/pgx/v5/pgxpool" "github.com/jackc/pgx/v5/pgxpool"
"log" "log"
"reflect" "reflect"
...@@ -117,17 +114,17 @@ func (d *Pool) newConn(mode connMode, pgConnString string) (q *conn, err error) ...@@ -117,17 +114,17 @@ func (d *Pool) newConn(mode connMode, pgConnString string) (q *conn, err error)
return nil, err return nil, err
} }
pgxConfig.AfterConnect = func(ctx context.Context, p *pgx.Conn) error { //pgxConfig.AfterConnect = func(ctx context.Context, p *pgx.Conn) error {
j := &pgtype.Type{Name: "jsonb", OID: pgtype.JSONBOID, Codec: ztype.JSONBCodec{}} // j := &pgtype.Type{Name: "jsonb", OID: pgtype.JSONBOID, Codec: ztype.JSONBCodec{}}
jb := &pgtype.Type{Name: "json", OID: pgtype.JSONOID, Codec: ztype.JSONCodec{}} // jb := &pgtype.Type{Name: "json", OID: pgtype.JSONOID, Codec: ztype.JSONCodec{}}
//
p.TypeMap().RegisterType(j) // p.TypeMap().RegisterType(j)
p.TypeMap().RegisterType(jb) // p.TypeMap().RegisterType(jb)
p.TypeMap().RegisterType(&pgtype.Type{Name: "_json", OID: pgtype.JSONArrayOID, Codec: &pgtype.ArrayCodec{ElementType: j}}) // p.TypeMap().RegisterType(&pgtype.Type{Name: "_json", OID: pgtype.JSONArrayOID, Codec: &pgtype.ArrayCodec{ElementType: j}})
p.TypeMap().RegisterType(&pgtype.Type{Name: "_jsonb", OID: pgtype.JSONBArrayOID, Codec: &pgtype.ArrayCodec{ElementType: jb}}) // p.TypeMap().RegisterType(&pgtype.Type{Name: "_jsonb", OID: pgtype.JSONBArrayOID, Codec: &pgtype.ArrayCodec{ElementType: jb}})
//
return nil // return nil
} //}
if pgxPool, err = pgxpool.NewWithConfig(d.ctx, pgxConfig); err != nil { if pgxPool, err = pgxpool.NewWithConfig(d.ctx, pgxConfig); err != nil {
return &conn{Pool: pgxPool, Alive: false, Mode: mode}, err return &conn{Pool: pgxPool, Alive: false, Mode: mode}, err
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment