GOMODULES
/
pgx
mirror of https://github.com/jackc/pgx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make Conn.ConnInfo private

pull/608/head
Jack Christensen 2019-09-10 18:09:21 -05:00
parent a8691a7066
commit 76348773bd
9 changed files with 25 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
conn.go
View File

@ -62,7 +62,7 @@ type Conn struct {
doneChan chan struct{} doneChan chan struct{}
closedChan chan error closedChan chan error
ConnInfo *pgtype.ConnInfo connInfo *pgtype.ConnInfo
wbuf []byte wbuf []byte
preallocatedRows []connRows preallocatedRows []connRows
@ -171,7 +171,7 @@ func connect(ctx context.Context, config *ConnConfig) (c *Conn, err error) {
c = &Conn{ c = &Conn{
config: config, config: config,
ConnInfo: pgtype.NewConnInfo(), connInfo: pgtype.NewConnInfo(),
logLevel: config.LogLevel, logLevel: config.LogLevel,
logger: config.Logger, logger: config.Logger,
} }
@ -408,6 +408,9 @@ func (c *Conn) PgConn() *pgconn.PgConn { return c.pgConn }
// StatementCache returns the statement cache used for this connection. // StatementCache returns the statement cache used for this connection.
func (c *Conn) StatementCache() stmtcache.Cache { return c.stmtcache } func (c *Conn) StatementCache() stmtcache.Cache { return c.stmtcache }
// ConnInfo returns the connection info used for this connection.
func (c *Conn) ConnInfo() *pgtype.ConnInfo { return c.connInfo }
// Exec executes sql. sql can be either a prepared statement name or an SQL string. arguments should be referenced // Exec executes sql. sql can be either a prepared statement name or an SQL string. arguments should be referenced
// positionally from the sql string as $1, $2, etc. // positionally from the sql string as $1, $2, etc.
func (c *Conn) Exec(ctx context.Context, sql string, arguments ...interface{}) (pgconn.CommandTag, error) { func (c *Conn) Exec(ctx context.Context, sql string, arguments ...interface{}) (pgconn.CommandTag, error) {
@ -499,14 +502,14 @@ func (c *Conn) execParamsAndPreparedPrefix(sd *pgconn.StatementDescription, argu
} }
for i := range args { for i := range args {
err = c.eqb.AppendParam(c.ConnInfo, sd.ParamOIDs[i], args[i]) err = c.eqb.AppendParam(c.connInfo, sd.ParamOIDs[i], args[i])
if err != nil { if err != nil {
return err return err
} }
} }
for i := range sd.Fields { for i := range sd.Fields {
c.eqb.AppendResultFormat(c.ConnInfo.ResultFormatCodeForOID(sd.Fields[i].DataTypeOID)) c.eqb.AppendResultFormat(c.ConnInfo().ResultFormatCodeForOID(sd.Fields[i].DataTypeOID))
} }
return nil return nil
@ -542,7 +545,7 @@ func (c *Conn) getRows(ctx context.Context, sql string, args []interface{}) *con
r.ctx = ctx r.ctx = ctx
r.logger = c r.logger = c
r.connInfo = c.ConnInfo r.connInfo = c.connInfo
r.startTime = time.Now() r.startTime = time.Now()
r.sql = sql r.sql = sql
r.args = args r.args = args
@ -642,7 +645,7 @@ optionLoop:
} }
for i := range args { for i := range args {
err = c.eqb.AppendParam(c.ConnInfo, sd.ParamOIDs[i], args[i]) err = c.eqb.AppendParam(c.connInfo, sd.ParamOIDs[i], args[i])
if err != nil { if err != nil {
rows.fatal(err) rows.fatal(err)
return rows, rows.err return rows, rows.err
@ -658,7 +661,7 @@ optionLoop:
if resultFormats == nil { if resultFormats == nil {
for i := range sd.Fields { for i := range sd.Fields {
c.eqb.AppendResultFormat(c.ConnInfo.ResultFormatCodeForOID(sd.Fields[i].DataTypeOID)) c.eqb.AppendResultFormat(c.ConnInfo().ResultFormatCodeForOID(sd.Fields[i].DataTypeOID))
} }
resultFormats = c.eqb.resultFormats resultFormats = c.eqb.resultFormats
@ -732,14 +735,14 @@ func (c *Conn) SendBatch(ctx context.Context, b *Batch) BatchResults {
} }
for i := range args { for i := range args {
err = c.eqb.AppendParam(c.ConnInfo, sd.ParamOIDs[i], args[i]) err = c.eqb.AppendParam(c.connInfo, sd.ParamOIDs[i], args[i])
if err != nil { if err != nil {
return &batchResults{ctx: ctx, conn: c, err: err} return &batchResults{ctx: ctx, conn: c, err: err}
} }
} }
for i := range sd.Fields { for i := range sd.Fields {
c.eqb.AppendResultFormat(c.ConnInfo.ResultFormatCodeForOID(sd.Fields[i].DataTypeOID)) c.eqb.AppendResultFormat(c.ConnInfo().ResultFormatCodeForOID(sd.Fields[i].DataTypeOID))
} }
if sd.Name == "" { if sd.Name == "" {
@ -770,7 +773,7 @@ func (c *Conn) sanitizeForSimpleQuery(sql string, args ...interface{}) (string,
var err error var err error
valueArgs := make([]interface{}, len(args)) valueArgs := make([]interface{}, len(args))
for i, a := range args { for i, a := range args {
valueArgs[i], err = convertSimpleArgument(c.ConnInfo, a) valueArgs[i], err = convertSimpleArgument(c.connInfo, a)
if err != nil { if err != nil {
return "", err return "", err
} }

6
conn_test.go
View File

@ -803,11 +803,11 @@ func TestConnInitConnInfo(t *testing.T) {
"text": pgtype.TextOID, "text": pgtype.TextOID,
} }
for name, oid := range nameOIDs { for name, oid := range nameOIDs {
dtByName, ok := conn.ConnInfo.DataTypeForName(name) dtByName, ok := conn.ConnInfo().DataTypeForName(name)
if !ok { if !ok {
t.Fatalf("Expected type named %v to be present", name) t.Fatalf("Expected type named %v to be present", name)
} }
dtByOID, ok := conn.ConnInfo.DataTypeForOID(oid) dtByOID, ok := conn.ConnInfo().DataTypeForOID(oid)
if !ok { if !ok {
t.Fatalf("Expected type OID %v to be present", oid) t.Fatalf("Expected type OID %v to be present", oid)
} }
@ -866,7 +866,7 @@ func TestDomainType(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("did not find uint64 OID, %v", err) t.Fatalf("did not find uint64 OID, %v", err)
} }
conn.ConnInfo.RegisterDataType(pgtype.DataType{Value: &pgtype.Numeric{}, Name: "uint64", OID: uint64OID}) conn.ConnInfo().RegisterDataType(pgtype.DataType{Value: &pgtype.Numeric{}, Name: "uint64", OID: uint64OID})
// String is still an acceptable argument after registration // String is still an acceptable argument after registration
err = conn.QueryRow(context.Background(), "select $1::uint64", "7").Scan(&n) err = conn.QueryRow(context.Background(), "select $1::uint64", "7").Scan(&n)

2
copy_from.go
View File

@ -130,7 +130,7 @@ func (ct *copyFrom) buildCopyBuf(buf []byte, sd *pgconn.StatementDescription) (b
buf = pgio.AppendInt16(buf, int16(len(ct.columnNames))) buf = pgio.AppendInt16(buf, int16(len(ct.columnNames)))
for i, val := range values { for i, val := range values {
buf, err = encodePreparedStatementArgument(ct.conn.ConnInfo, buf, sd.Fields[i].DataTypeOID, val) buf, err = encodePreparedStatementArgument(ct.conn.connInfo, buf, sd.Fields[i].DataTypeOID, val)
if err != nil { if err != nil {
return false, nil, err return false, nil, err
} }

2
copy_from_test.go
View File

@ -133,7 +133,7 @@ func TestConnCopyFromJSON(t *testing.T) {
defer closeConn(t, conn) defer closeConn(t, conn)
for _, typeName := range []string{"json", "jsonb"} { for _, typeName := range []string{"json", "jsonb"} {
if _, ok := conn.ConnInfo.DataTypeForName(typeName); !ok { if _, ok := conn.ConnInfo().DataTypeForName(typeName); !ok {
return // No JSON/JSONB type -- must be running against old PostgreSQL return // No JSON/JSONB type -- must be running against old PostgreSQL
} }
} }

2
example_custom_type_test.go
View File

@ -81,7 +81,7 @@ func Example_CustomType() {
} }
// Override registered handler for point // Override registered handler for point
conn.ConnInfo.RegisterDataType(pgtype.DataType{ conn.ConnInfo().RegisterDataType(pgtype.DataType{
Value: &Point{}, Value: &Point{},
Name: "point", Name: "point",
OID: 600, OID: 600,

40
query_test.go
View File

@ -965,42 +965,6 @@ func TestQueryRowCoreByteSlice(t *testing.T) {
} }
} }
func TestQueryRowUnknownType(t *testing.T) {
t.Parallel()
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn)
// Clear existing type mappings
conn.ConnInfo = pgtype.NewConnInfo()
conn.ConnInfo.RegisterDataType(pgtype.DataType{
Value: &pgtype.GenericText{},
Name: "point",
OID: 600,
})
conn.ConnInfo.RegisterDataType(pgtype.DataType{
Value: &pgtype.Int4{},
Name: "int4",
OID: pgtype.Int4OID,
})
sql := "select $1::point"
expected := "(1,0)"
var actual string
err := conn.QueryRow(context.Background(), sql, expected).Scan(&actual)
if err != nil {
t.Errorf("Unexpected failure: %v (sql -> %v)", err, sql)
}
if actual != expected {
t.Errorf(`Expected "%v", got "%v" (sql -> %v)`, expected, actual, sql)
}
ensureConnValid(t, conn)
}
func TestQueryRowErrors(t *testing.T) { func TestQueryRowErrors(t *testing.T) {
t.Parallel() t.Parallel()
@ -1197,7 +1161,7 @@ func TestConnQueryDatabaseSQLDriverValuerWithBinaryPgTypeThatAcceptsSameType(t *
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn) defer closeConn(t, conn)
conn.ConnInfo.RegisterDataType(pgtype.DataType{ conn.ConnInfo().RegisterDataType(pgtype.DataType{
Value: &satori.UUID{}, Value: &satori.UUID{},
Name: "uuid", Name: "uuid",
OID: 2950, OID: 2950,
@ -1413,7 +1377,7 @@ func TestRowsFromResultReader(t *testing.T) {
var sum, rowCount int32 var sum, rowCount int32
rows := pgx.RowsFromResultReader(conn.ConnInfo, resultReader) rows := pgx.RowsFromResultReader(conn.ConnInfo(), resultReader)
defer rows.Close() defer rows.Close()
for rows.Next() { for rows.Next() {

4
rows.go
View File

@ -188,7 +188,7 @@ func (rows *connRows) Scan(dest ...interface{}) error {
continue continue
} }
err := rows.connInfo.Scan(uint32(fd.DataTypeOID), fd.Format, buf, d) err := rows.connInfo.Scan(fd.DataTypeOID, fd.Format, buf, d)
if err != nil { if err != nil {
rows.fatal(scanArgError{col: i, err: err}) rows.fatal(scanArgError{col: i, err: err})
return err return err
@ -214,7 +214,7 @@ func (rows *connRows) Values() ([]interface{}, error) {
continue continue
} }
if dt, ok := rows.connInfo.DataTypeForOID(uint32(fd.DataTypeOID)); ok { if dt, ok := rows.connInfo.DataTypeForOID(fd.DataTypeOID); ok {
value := reflect.New(reflect.ValueOf(dt.Value).Elem().Type()).Interface().(pgtype.Value) value := reflect.New(reflect.ValueOf(dt.Value).Elem().Type()).Interface().(pgtype.Value)
switch fd.Format { switch fd.Format {

2
stdlib/sql.go
View File

@ -310,7 +310,7 @@ func (r *Rows) Columns() []string {
// ColumnTypeDatabaseTypeName return the database system type name. // ColumnTypeDatabaseTypeName return the database system type name.
func (r *Rows) ColumnTypeDatabaseTypeName(index int) string { func (r *Rows) ColumnTypeDatabaseTypeName(index int) string {
if dt, ok := r.conn.conn.ConnInfo.DataTypeForOID(r.rows.FieldDescriptions()[index].DataTypeOID); ok { if dt, ok := r.conn.conn.ConnInfo().DataTypeForOID(r.rows.FieldDescriptions()[index].DataTypeOID); ok {
return strings.ToUpper(dt.Name) return strings.ToUpper(dt.Name)
} }

2
values_test.go
View File

@ -80,7 +80,7 @@ func TestJSONAndJSONBTranscode(t *testing.T) {
defer closeConn(t, conn) defer closeConn(t, conn)
for _, typename := range []string{"json", "jsonb"} { for _, typename := range []string{"json", "jsonb"} {
if _, ok := conn.ConnInfo.DataTypeForName(typename); !ok { if _, ok := conn.ConnInfo().DataTypeForName(typename); !ok {
continue // No JSON/JSONB type -- must be running against old PostgreSQL continue // No JSON/JSONB type -- must be running against old PostgreSQL
} }