Merge branch 'main' into fix-16439

matrixorigin · May 28, 2024 · ebea053 · ebea053
2 parents 305b813 + d50b89e
commit ebea053
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/pkg/frontend/authenticate.go b/pkg/frontend/authenticate.go
@@ -4026,7 +4026,11 @@ func doDropPublication(ctx context.Context, ses *Session, dp *tree.DropPublicati
 		return err
 	}
 	if !execResultArrayHasData(erArray) {
-		return moerr.NewInternalError(ctx, "publication '%s' does not exist", dp.Name)
+		if !dp.IfExists {
+			return moerr.NewInternalError(ctx, "publication '%s' does not exist", dp.Name)
+		} else {
+			return err
+		}
 	}
 
 	sql, err = getSqlForDropPubInfo(ctx, string(dp.Name), false)

diff --git a/test/distributed/cases/tenant/pub_sub2.result b/test/distributed/cases/tenant/pub_sub2.result
@@ -117,3 +117,10 @@ drop database sub1;
 drop database sub2;
 drop account a1;
 drop account a2;
+create database sub1;
+create table sub1.t1 (a int,b int);
+insert into sub1.t1 values (1, 1), (2, 2), (3, 3);
+create publication pub1 database sub1;
+drop publication if exists pub1;
+drop publication if exists pub1;
+drop database if exists sub1;
diff --git a/test/distributed/cases/tenant/pub_sub2.sql b/test/distributed/cases/tenant/pub_sub2.sql
@@ -91,4 +91,15 @@ drop publication pub3;
 drop database sub1;
 drop database sub2;
 drop account a1;
-drop account a2;
+drop account a2;
+
+create database sub1;
+create table sub1.t1 (a int,b int);
+insert into sub1.t1 values (1, 1), (2, 2), (3, 3);
+
+create publication pub1 database sub1;
+
+drop publication if exists pub1;
+drop publication if exists pub1;
+
+drop database if exists sub1;