Merge #147195

147195: eval: remove wrapping from builtin errors r=yuzefovich a=yuzefovich

**roachtest/pg_regress: accept recent diff**

Fixes: #147252.

**eval: remove wrapping from builtin errors**

This PR removes the code to perform error wrapping around the errors produced by the builtin function which provides a bit more context (like the function name). This wrapping dates all the way back to a commit from 2015 716837e. Over the years it was expanded to also provide some more context to the sentry reports (7b703de). I don't think either of these provide much value since it's usually clear which builtin the error corresponds to and having just the builtin name in the sentry report doesn't make it any more actionable. Removing of this logic allows us to match errors as they are produced by Postgres.

**builins: unify an error message in substring with PG**

Epic: None
Release note: None

Co-authored-by: Yahor Yuzefovich <[email protected]>

Author: craig[bot]

pkg/backup/testdata/backup-restore/multiregion-mismatch-table-locality

@@ -80,7 +80,7 @@ SELECT count(*) FROM d.t;
 exec-sql
 INSERT INTO d.t VALUES (4)
 ----
-pq: default_to_database_primary_region(): current database defaultdb is not multi-region enabled
+pq: current database defaultdb is not multi-region enabled
 
 exec-sql
 USE d;

pkg/ccl/logictestccl/testdata/logic_test/crdb_internal

@@ -172,10 +172,10 @@ subtest replication-builtins
 user root
 
 
-query error pq: crdb_internal\.stream_ingestion_stats_json\(\): unimplemented
+query error pq: unimplemented
 SELECT crdb_internal.stream_ingestion_stats_json(1);
 
-query error pq: crdb_internal\.stream_ingestion_stats_pb\(\): unimplemented
+query error pq: unimplemented
 SELECT crdb_internal.stream_ingestion_stats_pb(1);
 
 subtest node_tenant_capabilities_cache

pkg/ccl/logictestccl/testdata/logic_test/crdb_internal_tenant

@@ -278,7 +278,7 @@ select crdb_internal.force_retry(interval '0s')
 ----
 0
 
-query error pq: crdb_internal.set_vmodule\(\): syntax error: expect comma-separated list of filename=N
+query error pq: syntax error: expect comma-separated list of filename=N
 select crdb_internal.set_vmodule('not anything reasonable')
 
 query I

pkg/ccl/logictestccl/testdata/logic_test/fips_ready

@@ -10,5 +10,5 @@ _
 
 user testuser
 
-statement error pq: crdb_internal\.fips_ready\(\): user testuser does not have VIEWCLUSTERSETTING system privilege
+statement error pq: user testuser does not have VIEWCLUSTERSETTING system privilege
 SELECT crdb_internal.fips_ready()

pkg/ccl/logictestccl/testdata/logic_test/multi_region_zone_configs

@@ -1950,7 +1950,7 @@ TABLE tbl11  ALTER TABLE tbl11 CONFIGURE ZONE USING
                constraints = '[]',
                lease_preferences = '[]'
 
-query error pq: crdb_internal\.reset_multi_region_zone_configs_for_table\(\): error resolving referenced table ID 1: relation "\[1\]" does not exist
+query error pq: error resolving referenced table ID 1: relation "\[1\]" does not exist
 SELECT crdb_internal.reset_multi_region_zone_configs_for_table(1)
 
 subtest reset_multi_region_zone_configs_database
@@ -2062,7 +2062,7 @@ let $descriptor_table_id
 SELECT table_id FROM crdb_internal.tables WHERE schema_name = 'public' AND name = 'descriptor'
 
 # Validate that builtin errors if called on a table id
-query error pq: crdb_internal\.reset_multi_region_zone_configs_for_database\(\): database "\[3\]" does not exist
+query error pq: database "\[3\]" does not exist
 SELECT crdb_internal.reset_multi_region_zone_configs_for_database($descriptor_table_id)
 
 user testuser

pkg/ccl/logictestccl/testdata/logic_test/tenant_usage

@@ -36,5 +36,5 @@ SELECT crdb_internal.update_tenant_resource_limits('apptenant', 1000, 100, 0)
 
 user testuser
 
-statement error crdb_internal.update_tenant_resource_limits\(\): user testuser does not have REPAIRCLUSTER system privilege
+statement error user testuser does not have REPAIRCLUSTER system privilege
 SELECT crdb_internal.update_tenant_resource_limits(5, 1000, 100, 0, now(), 0)

pkg/ccl/testccl/authccl/testdata/ldap

@@ -377,6 +377,6 @@ ERROR: no rows in result set
 query_row
 SELECT pg_has_role('ldap_user', 'ldap-parent-unsynced', 'MEMBER')
 ----
-ERROR: pg_has_role(): role 'ldap-parent-unsynced' does not exist (SQLSTATE 42704)
+ERROR: role 'ldap-parent-unsynced' does not exist (SQLSTATE 42704)
 
 subtest end

pkg/cmd/roachtest/testdata/pg_regress/arrays.diffs

@@ -2304,7 +2304,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/arrays.out --labe
 +HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
 +-- error cases
 +SELECT width_bucket('5'::text, ARRAY[3, 4]::integer[]);
-+ERROR:  width_bucket(): operand and thresholds must be of the same type
++ERROR:  operand and thresholds must be of the same type
 +SELECT width_bucket(5, ARRAY[3, 4, NULL]);
   width_bucket 
  --------------
@@ -2322,7 +2322,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/arrays.out --labe
 -ERROR:  thresholds array must not contain NULLs
  SELECT width_bucket(5, ARRAY[ARRAY[1, 2], ARRAY[3, 4]]);
 -ERROR:  thresholds must be one-dimensional array
-+ERROR:  width_bucket(): operand and thresholds must be of the same type
++ERROR:  operand and thresholds must be of the same type
  -- trim_array
  SELECT arr, trim_array(arr, 2)
  FROM

pkg/cmd/roachtest/testdata/pg_regress/bit.diffs

@@ -25,24 +25,6 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/bit.out --label=/
  --INSERT INTO VARBIT_TABLE VALUES ('X554');
  --INSERT INTO VARBIT_TABLE VALUES ('X555');
  SELECT * FROM VARBIT_TABLE;
-@@ -120,7 +120,7 @@
- (1 row)
- 
- SELECT SUBSTRING('01010101'::bit(8) FROM -10 FOR -2147483646) AS "error";
--ERROR:  negative substring length not allowed
-+ERROR:  substring(): negative bit subarray length -2147483646 not allowed
- SELECT SUBSTRING('01010101'::varbit FROM 2 FOR 2147483646) AS "1010101";
-  1010101 
- ---------
-@@ -134,7 +134,7 @@
- (1 row)
- 
- SELECT SUBSTRING('01010101'::varbit FROM -10 FOR -2147483646) AS "error";
--ERROR:  negative substring length not allowed
-+ERROR:  substring(): negative bit subarray length -2147483646 not allowed
- --- Bit operations
- DROP TABLE varbit_table;
- CREATE TABLE varbit_table (a BIT VARYING(16), b BIT VARYING(16));
 @@ -248,231 +248,231 @@
  ERROR:  cannot XOR bit strings of different sizes
  -- More position tests, checking all the boundary cases
@@ -475,12 +457,8 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/bit.out --label=/
  (16 rows)
 
  SELECT v, v >> 1 AS vsr, v << 1 AS vsl
-@@ -684,32 +684,20 @@
- (1 row)
- 
- SELECT set_bit(B'0101011000100100', 16, 1);	-- fail
--ERROR:  bit index 16 out of valid range (0..15)
-+ERROR:  set_bit(): bit index 16 out of valid range (0..15)
+@@ -687,29 +687,17 @@
+ ERROR:  bit index 16 out of valid range (0..15)
  -- Overlay
  SELECT overlay(B'0101011100' placing '001' from 2 for 3);
 -  overlay   

pkg/cmd/roachtest/testdata/pg_regress/date.diffs

@@ -688,13 +688,13 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/date.out --label=
 
  SELECT EXTRACT(TIMEZONE      FROM DATE '2020-08-11');
 -ERROR:  unit "timezone" not supported for type date
-+ERROR:  extract(): unsupported timespan: timezone
++ERROR:  unsupported timespan: timezone
  SELECT EXTRACT(TIMEZONE_M    FROM DATE '2020-08-11');
 -ERROR:  unit "timezone_m" not supported for type date
-+ERROR:  extract(): unsupported timespan: timezone_m
++ERROR:  unsupported timespan: timezone_m
  SELECT EXTRACT(TIMEZONE_H    FROM DATE '2020-08-11');
 -ERROR:  unit "timezone_h" not supported for type date
-+ERROR:  extract(): unsupported timespan: timezone_h
++ERROR:  unsupported timespan: timezone_h
  SELECT EXTRACT(EPOCH         FROM DATE '2020-08-11');
 -  extract   
 -------------
@@ -829,64 +829,64 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/date.out --label=
 -        
 -(1 row)
 -
-+ERROR:  extract(): infinity out of range for timestamp
++ERROR:  infinity out of range for timestamp
  SELECT EXTRACT(DAY FROM DATE '-infinity');     -- NULL
 - extract 
 ----------
 -        
 -(1 row)
 -
-+ERROR:  extract(): -infinity out of range for timestamp
++ERROR:  -infinity out of range for timestamp
  -- all supported fields
  SELECT EXTRACT(DAY           FROM DATE 'infinity');    -- NULL
 - extract 
 ----------
 -        
 -(1 row)
 -
-+ERROR:  extract(): infinity out of range for timestamp
++ERROR:  infinity out of range for timestamp
  SELECT EXTRACT(MONTH         FROM DATE 'infinity');    -- NULL
 - extract 
 ----------
 -        
 -(1 row)
 -
-+ERROR:  extract(): infinity out of range for timestamp
++ERROR:  infinity out of range for timestamp
  SELECT EXTRACT(QUARTER       FROM DATE 'infinity');    -- NULL
 - extract 
 ----------
 -        
 -(1 row)
 -
-+ERROR:  extract(): infinity out of range for timestamp
++ERROR:  infinity out of range for timestamp
  SELECT EXTRACT(WEEK          FROM DATE 'infinity');    -- NULL
 - extract 
 ----------
 -        
 -(1 row)
 -
-+ERROR:  extract(): infinity out of range for timestamp
++ERROR:  infinity out of range for timestamp
  SELECT EXTRACT(DOW           FROM DATE 'infinity');    -- NULL
 - extract 
 ----------
 -        
 -(1 row)
 -
-+ERROR:  extract(): infinity out of range for timestamp
++ERROR:  infinity out of range for timestamp
  SELECT EXTRACT(ISODOW        FROM DATE 'infinity');    -- NULL
 - extract 
 ----------
 -        
 -(1 row)
 -
-+ERROR:  extract(): infinity out of range for timestamp
++ERROR:  infinity out of range for timestamp
  SELECT EXTRACT(DOY           FROM DATE 'infinity');    -- NULL
 - extract 
 ----------
 -        
 -(1 row)
 -
-+ERROR:  extract(): infinity out of range for timestamp
++ERROR:  infinity out of range for timestamp
  --
  -- monotonic fields from non-finite date:
  --
@@ -896,70 +896,70 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/date.out --label=
 - Infinity
 -(1 row)
 -
-+ERROR:  extract(): infinity out of range for timestamp
++ERROR:  infinity out of range for timestamp
  SELECT EXTRACT(EPOCH FROM DATE '-infinity');        -- -Infinity
 -  extract  
 ------------
 - -Infinity
 -(1 row)
 -
-+ERROR:  extract(): -infinity out of range for timestamp
++ERROR:  -infinity out of range for timestamp
  -- all supported fields
  SELECT EXTRACT(YEAR       FROM DATE 'infinity');    --  Infinity
 - extract  
 -----------
 - Infinity
 -(1 row)
 -
-+ERROR:  extract(): infinity out of range for timestamp
++ERROR:  infinity out of range for timestamp
  SELECT EXTRACT(DECADE     FROM DATE 'infinity');    --  Infinity
 - extract  
 -----------
 - Infinity
 -(1 row)
 -
-+ERROR:  extract(): infinity out of range for timestamp
++ERROR:  infinity out of range for timestamp
  SELECT EXTRACT(CENTURY    FROM DATE 'infinity');    --  Infinity
 - extract  
 -----------
 - Infinity
 -(1 row)
 -
-+ERROR:  extract(): infinity out of range for timestamp
++ERROR:  infinity out of range for timestamp
  SELECT EXTRACT(MILLENNIUM FROM DATE 'infinity');    --  Infinity
 - extract  
 -----------
 - Infinity
 -(1 row)
 -
-+ERROR:  extract(): infinity out of range for timestamp
++ERROR:  infinity out of range for timestamp
  SELECT EXTRACT(JULIAN     FROM DATE 'infinity');    --  Infinity
 - extract  
 -----------
 - Infinity
 -(1 row)
 -
-+ERROR:  extract(): infinity out of range for timestamp
++ERROR:  infinity out of range for timestamp
  SELECT EXTRACT(ISOYEAR    FROM DATE 'infinity');    --  Infinity
 - extract  
 -----------
 - Infinity
 -(1 row)
 -
-+ERROR:  extract(): infinity out of range for timestamp
++ERROR:  infinity out of range for timestamp
  SELECT EXTRACT(EPOCH      FROM DATE 'infinity');    --  Infinity
 - extract  
 -----------
 - Infinity
 -(1 row)
 -
-+ERROR:  extract(): infinity out of range for timestamp
++ERROR:  infinity out of range for timestamp
  --
  -- wrong fields from non-finite date:
  --
  SELECT EXTRACT(MICROSEC  FROM DATE 'infinity');     -- error
 -ERROR:  unit "microsec" not recognized for type date
-+ERROR:  extract(): infinity out of range for timestamp
++ERROR:  infinity out of range for timestamp
  -- test constructors
  select make_date(2013, 7, 15);
   make_date  
@@ -985,7 +985,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/date.out --label=
  -- should fail
  select make_date(0, 7, 15);
 -ERROR:  date field value out of range: 0-07-15
-+ERROR:  make_date(): year value of 0 is not valid
++ERROR:  year value of 0 is not valid
  select make_date(2013, 2, 30);
 -ERROR:  date field value out of range: 2013-02-30
 + make_date