fix show subscriptions (#1.1-dev) (#13584)

fix show subscriptions (#1.1-dev) Approved by: @sukki37, @iamlinjunhong, @qingxinhome, @heni02, @nnsgmsone, @ouyuanning
matrixorigin · Dec 20, 2023 · c3272df · c3272df
1 parent 48d69d7
commit c3272df
Show file tree

Hide file tree

Showing 9 changed files with 647 additions and 560 deletions.
diff --git a/pkg/frontend/mysql_cmd_executor.go b/pkg/frontend/mysql_cmd_executor.go
@@ -2965,6 +2965,7 @@ func (mce *MysqlCmdExecutor) executeStmt(requestCtx context.Context,
 			err = moerr.NewInternalError(proc.Ctx, "only admin can create subscription")
 			return
 		}
+		st.Sql = sql
 	case *tree.DropDatabase:
 		err = inputNameIsInvalid(proc.Ctx, string(st.Name))
 		if err != nil {

diff --git a/pkg/pb/plan/plan.pb.go b/pkg/pb/plan/plan.pb.go
diff --git a/pkg/sql/compile/ddl.go b/pkg/sql/compile/ddl.go
@@ -32,7 +32,6 @@ import (
 	"github.com/matrixorigin/matrixone/pkg/pb/lock"
 	"github.com/matrixorigin/matrixone/pkg/pb/plan"
 	"github.com/matrixorigin/matrixone/pkg/sql/colexec/lockop"
-	"github.com/matrixorigin/matrixone/pkg/sql/parsers/dialect"
 	"github.com/matrixorigin/matrixone/pkg/sql/parsers/tree"
 	plan2 "github.com/matrixorigin/matrixone/pkg/sql/plan"
 	"github.com/matrixorigin/matrixone/pkg/sql/plan/function"
@@ -60,9 +59,7 @@ func (s *Scope) CreateDatabase(c *Compile) error {
 		return err
 	}
 
-	fmtCtx := tree.NewFmtCtx(dialect.MYSQL, tree.WithQuoteString(true))
-	c.stmt.Format(fmtCtx)
-	ctx := context.WithValue(c.ctx, defines.SqlKey{}, fmtCtx.String())
+	ctx := context.WithValue(c.ctx, defines.SqlKey{}, s.Plan.GetDdl().GetCreateDatabase().GetSql())
 	datType := ""
 	if s.Plan.GetDdl().GetCreateDatabase().SubscriptionOption != nil {
 		datType = catalog.SystemDBTypeSubscription

diff --git a/pkg/sql/parsers/dialect/mysql/mysql_sql.go b/pkg/sql/parsers/dialect/mysql/mysql_sql.go
diff --git a/pkg/sql/parsers/tree/create.go b/pkg/sql/parsers/tree/create.go
@@ -107,6 +107,7 @@ type CreateDatabase struct {
 	Name               Identifier
 	CreateOptions      []CreateOption
 	SubscriptionOption *SubscriptionOption
+	Sql                string
 }
 
 func (node *CreateDatabase) Format(ctx *FmtCtx) {

diff --git a/pkg/sql/plan/build_ddl.go b/pkg/sql/plan/build_ddl.go
@@ -1692,6 +1692,7 @@ func buildCreateDatabase(stmt *tree.CreateDatabase, ctx CompilerContext) (*Plan,
 			Publication: string(stmt.SubscriptionOption.Publication),
 		}
 	}
+	createDB.Sql = stmt.Sql
 
 	return &Plan{
 		Plan: &plan.Plan_Ddl{

diff --git a/proto/plan.proto b/proto/plan.proto
@@ -1057,6 +1057,7 @@ message CreateDatabase {
 	bool if_not_exists 	= 1;
 	string database 	= 2;
 	SubscriptionOption subscription_option = 3;
+	string sql = 4;
 }
 
 message AlterDatabase {

diff --git a/test/distributed/cases/tenant/pub_sub1.result b/test/distributed/cases/tenant/pub_sub1.result
@@ -18,4 +18,18 @@ drop account test_tenant_2;
 drop publication pubname1;
 drop publication pubname2;
 drop database db1;
-set global enable_privilege_cache = on;
+set global enable_privilege_cache = on;
+create account `0b6d35cc_11ab_4da5_a5c5_c4cc09917c11` admin_name 'admin' identified by '111';
+create account `62915dd9_d454_4b02_be16_0741d94b62cc` admin_name 'admin' identified by '111';
+create database test;
+use test;
+create table tt(a int);
+insert into tt values(1);
+create publication mo_test_pub database test account `62915dd9_d454_4b02_be16_0741d94b62cc`;
+create database mo_test_sub from `0b6d35cc_11ab_4da5_a5c5_c4cc09917c11` publication mo_test_pub;
+show subscriptions;
+Name    From_Account
+mo_test_sub    0b6d35cc_11ab_4da5_a5c5_c4cc09917c11
+drop publication mo_test_pub;
+drop account `0b6d35cc_11ab_4da5_a5c5_c4cc09917c11`;
+drop account `62915dd9_d454_4b02_be16_0741d94b62cc`;
diff --git a/test/distributed/cases/tenant/pub_sub1.sql b/test/distributed/cases/tenant/pub_sub1.sql
@@ -14,4 +14,24 @@ drop publication pubname1;
 drop publication pubname2;
 drop database db1;
 
-set global enable_privilege_cache = on;
+set global enable_privilege_cache = on;
+
+
+create account `0b6d35cc_11ab_4da5_a5c5_c4cc09917c11` admin_name 'admin' identified by '111';
+create account `62915dd9_d454_4b02_be16_0741d94b62cc` admin_name 'admin' identified by '111';
+-- @session:id=3&user=0b6d35cc_11ab_4da5_a5c5_c4cc09917c11:admin&password=111
+create database test;
+use test;
+create table tt(a int);
+insert into tt values(1);
+create publication mo_test_pub database test account `62915dd9_d454_4b02_be16_0741d94b62cc`;
+-- @session
+-- @session:id=5&user=62915dd9_d454_4b02_be16_0741d94b62cc:admin&password=111
+create database mo_test_sub from `0b6d35cc_11ab_4da5_a5c5_c4cc09917c11` publication mo_test_pub;
+show subscriptions;
+-- @session
+-- @session:id=7&user=0b6d35cc_11ab_4da5_a5c5_c4cc09917c11:admin&password=111
+drop publication mo_test_pub;
+-- @session
+drop account `0b6d35cc_11ab_4da5_a5c5_c4cc09917c11`;
+drop account `62915dd9_d454_4b02_be16_0741d94b62cc`;