MySQL: sanitize identifiers (#197)

ydb-platform · Oct 3, 2024 · 839259a · 839259a
1 parent 9bf8848
commit 839259a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/server/datasource/rdbms/mysql/sql_formatter.go b/app/server/datasource/rdbms/mysql/sql_formatter.go
@@ -1,6 +1,9 @@
 package mysql
 
 import (
+	"fmt"
+	"strings"
+
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
 
 	api_service_protos "github.com/ydb-platform/fq-connector-go/api/service/protos"
@@ -72,7 +75,7 @@ func (sqlFormatter) GetPlaceholder(_ int) string {
 }
 
 func (sqlFormatter) SanitiseIdentifier(ident string) string {
-	return ident
+	return fmt.Sprintf("`%s`", strings.Replace(ident, "`", "``", -1))
 }
 
 func (f sqlFormatter) FormatFrom(tableName string) string {

diff --git a/app/server/service_connector.go b/app/server/service_connector.go
@@ -176,10 +176,10 @@ func (s *serviceConnector) ReadSplits(
 		if err := stream.Send(response); err != nil {
 			return fmt.Errorf("stream send: %w", err)
 		}
+	} else {
+		logger.Info("request handling finished")
 	}
 
-	logger.Info("request handling finished")
-
 	return nil
 }