Add SeverityUnlocalized field to PgError / Notice

https://github.com/jackc/pgx/issues/1971

pgconn/errors.go

@@ -29,23 +29,24 @@ func Timeout(err error) bool {
 // http://www.postgresql.org/docs/11/static/protocol-error-fields.html for
 // detailed field description.
 type PgError struct {
-	Severity         string
+	Severity            string
-	Code             string
+	SeverityUnlocalized string
-	Message          string
+	Code                string
-	Detail           string
+	Message             string
-	Hint             string
+	Detail              string
-	Position         int32
+	Hint                string
-	InternalPosition int32
+	Position            int32
-	InternalQuery    string
+	InternalPosition    int32
-	Where            string
+	InternalQuery       string
-	SchemaName       string
+	Where               string
-	TableName        string
+	SchemaName          string
-	ColumnName       string
+	TableName           string
-	DataTypeName     string
+	ColumnName          string
-	ConstraintName   string
+	DataTypeName        string
-	File             string
+	ConstraintName      string
-	Line             int32
+	File                string
-	Routine          string
+	Line                int32
+	Routine             string
 }
 
 func (pe *PgError) Error() string {

pgconn/pgconn.go

@@ -928,23 +928,24 @@ func (pgConn *PgConn) Deallocate(ctx context.Context, name string) error {
 // ErrorResponseToPgError converts a wire protocol error message to a *PgError.
 func ErrorResponseToPgError(msg *pgproto3.ErrorResponse) *PgError {
 	return &PgError{
-		Severity:         msg.Severity,
+		Severity:            msg.Severity,
-		Code:             string(msg.Code),
+		SeverityUnlocalized: msg.SeverityUnlocalized,
-		Message:          string(msg.Message),
+		Code:                string(msg.Code),
-		Detail:           string(msg.Detail),
+		Message:             string(msg.Message),
-		Hint:             msg.Hint,
+		Detail:              string(msg.Detail),
-		Position:         msg.Position,
+		Hint:                msg.Hint,
-		InternalPosition: msg.InternalPosition,
+		Position:            msg.Position,
-		InternalQuery:    string(msg.InternalQuery),
+		InternalPosition:    msg.InternalPosition,
-		Where:            string(msg.Where),
+		InternalQuery:       string(msg.InternalQuery),
-		SchemaName:       string(msg.SchemaName),
+		Where:               string(msg.Where),
-		TableName:        string(msg.TableName),
+		SchemaName:          string(msg.SchemaName),
-		ColumnName:       string(msg.ColumnName),
+		TableName:           string(msg.TableName),
-		DataTypeName:     string(msg.DataTypeName),
+		ColumnName:          string(msg.ColumnName),
-		ConstraintName:   msg.ConstraintName,
+		DataTypeName:        string(msg.DataTypeName),
-		File:             string(msg.File),
+		ConstraintName:      msg.ConstraintName,
-		Line:             msg.Line,
+		File:                string(msg.File),
-		Routine:          string(msg.Routine),
+		Line:                msg.Line,
+		Routine:             string(msg.Routine),
 	}
 }
 

pgconn/pgconn_test.go

@@ -1556,9 +1556,9 @@ func TestConnOnNotice(t *testing.T) {
 	config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_DATABASE"))
 	require.NoError(t, err)
 
-	var msg string
+	var notice *pgconn.Notice
-	config.OnNotice = func(c *pgconn.PgConn, notice *pgconn.Notice) {
+	config.OnNotice = func(c *pgconn.PgConn, n *pgconn.Notice) {
-		msg = notice.Message
+		notice = n
 	}
 	config.RuntimeParams["client_min_messages"] = "notice" // Ensure we only get the message we expect.
 
@@ -1576,7 +1576,8 @@ begin
 end$$;`)
 	err = multiResult.Close()
 	require.NoError(t, err)
-	assert.Equal(t, "hello, world", msg)
+	assert.Equal(t, "NOTICE", notice.SeverityUnlocalized)
+	assert.Equal(t, "hello, world", notice.Message)
 
 	ensureConnValid(t, pgConn)
 }