Merge pull request #2112 from actiontech/issue2104

ci: remove `` in sql because outer layer has added
actiontech · Dec 1, 2023 · 688a2a6 · 688a2a6
2 parents 5414ee9 + 9a7be16
commit 688a2a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/sqle/driver/mysql/executor/executor.go b/sqle/driver/mysql/executor/executor.go
@@ -276,9 +276,9 @@ func Ping(entry *logrus.Entry, instance *driverV2.DSN) error {
 
 // When using keywords as table names, you need to pay attention to wrapping them in quotation marks
 func (c *Executor) ShowCreateTable(schema, tableName string) (string, error) {
-	query := fmt.Sprintf("show create table `%s`", tableName)
+	query := fmt.Sprintf("show create table %s", tableName)
 	if schema != "" {
-		query = fmt.Sprintf("show create table `%s`.`%s`", schema, tableName)
+		query = fmt.Sprintf("show create table %s.%s", schema, tableName)
 	}
 	result, err := c.Db.Query(query)
 	if err != nil {
@@ -451,7 +451,7 @@ func (c *Executor) ShowSchemaViews(schema string) ([]string, error) {
 
 // When using keywords as view names, you need to pay attention to wrapping them in quotation marks
 func (c *Executor) ShowCreateView(tableName string) (string, error) {
-	result, err := c.Db.Query(fmt.Sprintf("show create view `%s`", tableName))
+	result, err := c.Db.Query(fmt.Sprintf("show create view %s", tableName))
 	if err != nil {
 		return "", err
 	}
@@ -677,8 +677,9 @@ type TableIndexesInfo struct {
 	Comment     string
 }
 
+// When using keywords as view names, you need to pay attention to wrapping them in quotation marks
 func (c *Executor) GetTableIndexesInfo(schema, tableName string) ([]*TableIndexesInfo, error) {
-	records, err := c.Db.Query(fmt.Sprintf("SHOW INDEX FROM `%s`.`%s`", schema, tableName))
+	records, err := c.Db.Query(fmt.Sprintf("SHOW INDEX FROM %s.%s", schema, tableName))
 	if err != nil {
 		return nil, err
 	}

diff --git a/sqle/driver/mysql/session/context.go b/sqle/driver/mysql/session/context.go
@@ -1119,5 +1119,5 @@ func (c *Context) GetExecutor() *executor.Executor {
 }
 
 func (c *Context) GetTableIndexesInfo(schema, tableName string) ([]*executor.TableIndexesInfo, error) {
-	return c.e.GetTableIndexesInfo(schema, tableName)
+	return c.e.GetTableIndexesInfo(utils.SupplementalQuotationMarks(schema), utils.SupplementalQuotationMarks(tableName))
 }