2
0

Merge pull request #504 from phobosxy/err-handle-verbose-oid

Use more detailed error output of unknown field;
This commit is contained in:
Jack Christensen
2019-01-26 07:36:04 -06:00
committed by GitHub
2 changed files with 7 additions and 4 deletions
+2 -1
View File
@@ -1133,7 +1133,8 @@ func (c *Conn) prepareEx(name, sql string, opts *PrepareExOptions) (ps *Prepared
ps.FieldDescriptions[i].FormatCode = TextFormatCode
}
} else {
return nil, errors.Errorf("unknown oid: %d", ps.FieldDescriptions[i].DataType)
fd := ps.FieldDescriptions[i]
return nil, errors.Errorf("unknown oid: %d, name: %s", fd.DataType, fd.Name)
}
}
case *pgproto3.ReadyForQuery:
+5 -3
View File
@@ -137,7 +137,8 @@ func (rows *Rows) Next() bool {
rows.fields[i].DataTypeName = dt.Name
rows.fields[i].FormatCode = TextFormatCode
} else {
rows.fatal(errors.Errorf("unknown oid: %d", rows.fields[i].DataType))
fd := rows.fields[i]
rows.fatal(errors.Errorf("unknown oid: %d, name: %s", fd.DataType, fd.Name))
return false
}
}
@@ -259,7 +260,7 @@ func (rows *Rows) Scan(dest ...interface{}) (err error) {
}
}
} else {
rows.fatal(scanArgError{col: i, err: errors.Errorf("unknown oid: %v", fd.DataType)})
rows.fatal(scanArgError{col: i, err: errors.Errorf("unknown oid: %v, name: %s", fd.DataType, fd.Name)})
}
}
@@ -507,7 +508,8 @@ func (c *Conn) readUntilRowDescription() ([]FieldDescription, error) {
if dt, ok := c.ConnInfo.DataTypeForOID(fieldDescriptions[i].DataType); ok {
fieldDescriptions[i].DataTypeName = dt.Name
} else {
return nil, errors.Errorf("unknown oid: %d", fieldDescriptions[i].DataType)
fd := fieldDescriptions[i]
return nil, errors.Errorf("unknown oid: %d, name: %s", fd.DataType, fd.Name)
}
}
return fieldDescriptions, nil