backupresolver: adjust test message expectations

This adjusts tests to check for the appropriate errors that are returned
by the new ResolveTargets implementation.

- The old code delegated to DescriptorsMatchingTargets, which was returning
  an incorrectly specific error message when a database did not exist.
- To handle wildcard expansion, The previous implementation was calling
  ResolveObjectPrefix, which mutates the object name in place to add the
  `public` schema to the pattern if it was unspecified. This was not
  correct, as the db.* pattern causes all tables in the database to be
  backed up, not just the ones in the public schema.

Release note: None

Author: rafiss

pkg/backup/backupresolver/targets.go

@@ -782,10 +782,6 @@ func ResolveTargets(
 			}
 			schema, err := col.ByIDWithoutLeased(txn.KV()).Get().Schema(ctx, schemaID)
 			if err != nil {
-				// Schema might not exist or be dropped, skip it.
-				if errors.Is(err, catalog.ErrDescriptorNotFound) {
-					return nil
-				}
 				return err
 			}
 			if !shouldSkipSchema(schema) {
@@ -798,13 +794,10 @@ func ResolveTargets(
 		for _, dbName := range targets.Databases {
 			db, err := col.ByName(txn.KV()).Get().Database(ctx, string(dbName))
 			if err != nil {
-				if errors.Is(err, catalog.ErrDescriptorNotFound) {
-					return errors.Errorf("database %q does not exist", dbName)
-				}
 				return err
 			}
 			if !db.Public() {
-				return errors.Errorf("database %q does not exist", dbName)
+				return sqlerrors.NewUndefinedDatabaseError(tree.ErrString(&dbName))
 			}
 			addDesc(db)
 

pkg/backup/create_scheduled_backup_test.go

@@ -333,7 +333,7 @@ CREATE TABLE other_db.t1(a int);
 		{
 			name:               "unqualified-all-tables-selectors",
 			query:              "CREATE SCHEDULE FOR BACKUP * INTO $1 RECURRING '@hourly'",
-			expectedBackupStmt: "BACKUP TABLE mydb.public.* INTO %s'%s' WITH OPTIONS (detached)",
+			expectedBackupStmt: "BACKUP TABLE mydb.* INTO %s'%s' WITH OPTIONS (detached)",
 		},
 		{
 			name:               "all-tables-selectors-with-user-defined-schema",
@@ -343,12 +343,12 @@ CREATE TABLE other_db.t1(a int);
 		{
 			name:               "partially-qualified-all-tables-selectors-with-different-db",
 			query:              "CREATE SCHEDULE FOR BACKUP other_db.* INTO $1 RECURRING '@hourly'",
-			expectedBackupStmt: "BACKUP TABLE other_db.public.* INTO %s'%s' WITH OPTIONS (detached)",
+			expectedBackupStmt: "BACKUP TABLE other_db.* INTO %s'%s' WITH OPTIONS (detached)",
 		},
 		{
 			name:               "fully-qualified-all-tables-selectors-with-multiple-dbs",
 			query:              "CREATE SCHEDULE FOR BACKUP *, other_db.* INTO $1 RECURRING '@hourly'",
-			expectedBackupStmt: "BACKUP TABLE mydb.public.*, other_db.public.* INTO %s'%s' WITH OPTIONS (detached)",
+			expectedBackupStmt: "BACKUP TABLE mydb.*, other_db.* INTO %s'%s' WITH OPTIONS (detached)",
 		},
 	}
 
@@ -592,14 +592,14 @@ func TestSerializesScheduledBackupExecutionArgs(t *testing.T) {
 			expectedSchedules: []expectedSchedule{
 				{
 					nameRe:                        "BACKUP .*",
-					backupStmt:                    "BACKUP TABLE system.public.* INTO LATEST IN 'nodelocal://1/backup' WITH OPTIONS (revision_history = true, detached)",
+					backupStmt:                    "BACKUP TABLE system.* INTO LATEST IN 'nodelocal://1/backup' WITH OPTIONS (revision_history = true, detached)",
 					period:                        time.Hour,
 					paused:                        true,
 					chainProtectedTimestampRecord: true,
 				},
 				{
 					nameRe:                        "BACKUP .+",
-					backupStmt:                    "BACKUP TABLE system.public.* INTO 'nodelocal://1/backup' WITH OPTIONS (revision_history = true, detached)",
+					backupStmt:                    "BACKUP TABLE system.* INTO 'nodelocal://1/backup' WITH OPTIONS (revision_history = true, detached)",
 					period:                        24 * time.Hour,
 					runsNow:                       true,
 					chainProtectedTimestampRecord: true,

pkg/backup/testdata/backup-restore/backup-dropped-descriptors

@@ -41,7 +41,7 @@ SELECT orig->'database'->'name', orig->'database'->'state' FROM tbls WHERE id =
 exec-sql
 BACKUP DATABASE d INTO 'nodelocal://1/dropped-database';
 ----
-pq: failed to resolve targets specified in the BACKUP stmt: database "d" does not exist, or invalid RESTORE timestamp: supplied backups do not cover requested time
+pq: failed to resolve targets specified in the BACKUP stmt: database "d" does not exist
 
 # A cluster backup should succeed but should ignore the dropped database
 # and table descriptors.

pkg/backup/testdata/backup-restore/backup-dropped-descriptors-declarative

@@ -42,7 +42,7 @@ SELECT orig->'database'->'name', orig->'database'->'state' FROM tbls WHERE id =
 exec-sql
 BACKUP DATABASE dd INTO 'nodelocal://1/dropped-database';
 ----
-pq: failed to resolve targets specified in the BACKUP stmt: database "dd" does not exist, or invalid RESTORE timestamp: supplied backups do not cover requested time
+pq: failed to resolve targets specified in the BACKUP stmt: database "dd" does not exist
 
 # A cluster backup should succeed.
 exec-sql