sql, pgwire: Add SEVERITY_NONLOCALIZED error field

Release note (sql change): We now send the Severity_Nonlocalized field in the pgwire Notice Response.
cockroachdb · Jun 9, 2022 · ea6ded2 · ea6ded2
1 parent e9456ba
commit ea6ded2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/pkg/sql/pgwire/conn.go b/pkg/sql/pgwire/conn.go
@@ -1474,6 +1474,9 @@ func writeErrFields(
 	msgBuilder.putErrFieldMsg(pgwirebase.ServerErrFieldSeverity)
 	msgBuilder.writeTerminatedString(pgErr.Severity)
 
+	msgBuilder.putErrFieldMsg(pgwirebase.ServerErrFieldSeverityNonLocalized)
+	msgBuilder.writeTerminatedString(pgErr.Severity)
+
 	msgBuilder.putErrFieldMsg(pgwirebase.ServerErrFieldSQLState)
 	msgBuilder.writeTerminatedString(pgErr.Code)
 

diff --git a/pkg/sql/pgwire/pgwirebase/msg.go b/pkg/sql/pgwire/pgwirebase/msg.go
@@ -61,15 +61,16 @@ type ServerErrFieldType byte
 
 // http://www.postgresql.org/docs/current/static/protocol-error-fields.html
 const (
-	ServerErrFieldSeverity       ServerErrFieldType = 'S'
-	ServerErrFieldSQLState       ServerErrFieldType = 'C'
-	ServerErrFieldMsgPrimary     ServerErrFieldType = 'M'
-	ServerErrFieldDetail         ServerErrFieldType = 'D'
-	ServerErrFieldHint           ServerErrFieldType = 'H'
-	ServerErrFieldSrcFile        ServerErrFieldType = 'F'
-	ServerErrFieldSrcLine        ServerErrFieldType = 'L'
-	ServerErrFieldSrcFunction    ServerErrFieldType = 'R'
-	ServerErrFieldConstraintName ServerErrFieldType = 'n'
+	ServerErrFieldSeverity             ServerErrFieldType = 'S'
+	ServerErrFieldSeverityNonLocalized ServerErrFieldType = 'V'
+	ServerErrFieldSQLState             ServerErrFieldType = 'C'
+	ServerErrFieldMsgPrimary           ServerErrFieldType = 'M'
+	ServerErrFieldDetail               ServerErrFieldType = 'D'
+	ServerErrFieldHint                 ServerErrFieldType = 'H'
+	ServerErrFieldSrcFile              ServerErrFieldType = 'F'
+	ServerErrFieldSrcLine              ServerErrFieldType = 'L'
+	ServerErrFieldSrcFunction          ServerErrFieldType = 'R'
+	ServerErrFieldConstraintName       ServerErrFieldType = 'n'
 )
 
 // PrepareType represents a subtype for prepare messages.

diff --git a/pkg/sql/pgwire/pgwirebase/servererrfieldtype_string.go b/pkg/sql/pgwire/pgwirebase/servererrfieldtype_string.go
diff --git a/pkg/sql/pgwire/testdata/pgtest/notice b/pkg/sql/pgwire/testdata/pgtest/notice
@@ -55,7 +55,7 @@ Query {"String": "DROP INDEX t_x_idx"}
 until crdb_only
 CommandComplete
 ----
-{"Severity":"NOTICE","SeverityUnlocalized":"","Code":"00000","Message":"the data for dropped indexes is reclaimed asynchronously","Detail":"","Hint":"The reclamation delay can be customized in the zone configuration for the table.","Position":0,"InternalPosition":0,"InternalQuery":"","Where":"","SchemaName":"","TableName":"","ColumnName":"","DataTypeName":"","ConstraintName":"","File":"drop_index.go","Line":572,"Routine":"dropIndexByName","UnknownFields":null}
+{"Severity":"NOTICE","SeverityUnlocalized":"NOTICE","Code":"00000","Message":"the data for dropped indexes is reclaimed asynchronously","Detail":"","Hint":"The reclamation delay can be customized in the zone configuration for the table.","Position":0,"InternalPosition":0,"InternalQuery":"","Where":"","SchemaName":"","TableName":"","ColumnName":"","DataTypeName":"","ConstraintName":"","File":"drop_index.go","Line":572,"Routine":"dropIndexByName","UnknownFields":null}
 {"Type":"CommandComplete","CommandTag":"DROP INDEX"}
 
 until noncrdb_only