fix wrong unescape special characters in table create query, fix #1151, affected aversions from 2.6.6 to 2.6.18

Signed-off-by: Slach <[email protected]>

Author: Slach

ChangeLog.md

@@ -4,6 +4,7 @@ BUG FIXES
 - fix empty `path` and non-empty `object_disk_path` config parameters, allows unexpected deletion backup object disk data, fix [859](https://github.com/Altinity/clickhouse-backup/issues/859) 
 - reproduce behavior `<metadata_path>` parameter in clickhouse `<storage_configuration>` don't contain trailing slash, restore make hardlinks to wrong directory, look details in https://github.com/Altinity/clickhouse-backup/issues/859#issuecomment-2896880448, https://github.com/ClickHouse/ClickHouse/issues/80647 
 - fix backup for azblob disk behavior when `storage_account_url` contains container as first part in hostname
+- fix wrong unescape special characters in table create query, fix [1151](https://github.com/Altinity/clickhouse-backup/issues/1151), affected aversions from 2.6.6 to 2.6.18
 
 # v2.6.18
 IMPROVEMENTS

pkg/clickhouse/clickhouse.go

@@ -381,8 +381,12 @@ func (ch *ClickHouse) GetTables(ctx context.Context, tablePattern string) ([]Tab
 		return nil, err
 	}
 	for i := range tables {
-		// https://github.com/Altinity/clickhouse-backup/issues/1091
-		tables[i].CreateTableQuery = strings.ReplaceAll(tables[i].CreateTableQuery, `\\`, `\`)
+		// https://github.com/Altinity/clickhouse-backup/issues/1091, https://github.com/Altinity/clickhouse-backup/issues/1151
+		escapeReplacer := strings.NewReplacer(`\`, `\\`)
+		escapeDb := escapeReplacer.Replace(tables[i].Database)
+		escapeTable := escapeReplacer.Replace(tables[i].Name)
+		tables[i].CreateTableQuery = strings.Replace(tables[i].CreateTableQuery, escapeDb, tables[i].Database, 1)
+		tables[i].CreateTableQuery = strings.Replace(tables[i].CreateTableQuery, escapeTable, tables[i].Name, 1)
 	}
 	metadataPath, err := ch.getMetadataPath(ctx)
 	if err != nil {

test/integration/integration_test.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/Altinity/clickhouse-backup/v2/pkg/common"
 	"github.com/Altinity/clickhouse-backup/v2/pkg/config"
 	pool "github.com/jolestar/go-commons-pool/v2"
 	"math/rand"
@@ -2385,7 +2386,47 @@ func TestCheckSystemPartsColumns(t *testing.T) {
 	env.Cleanup(t, r)
 }
 
-// // https://github.com/Altinity/clickhouse-backup/issues/871
+// https://github.com/Altinity/clickhouse-backup/issues/1151
+func TestSlashesInDatabaseAndTableNamesAndTableQuery(t *testing.T) {
+	env, r := NewTestEnvironment(t)
+	env.connectWithWait(t, r, 500*time.Millisecond, 1*time.Second, 1*time.Minute)
+	version, err := env.ch.GetVersion(t.Context())
+	r.NoError(err)
+
+	dbName := `db\db2/db3`
+	tableName := `z\z2/z3`
+	createSchemaSQL := "(`s`" + ` String DEFAULT replaceRegexpAll('test', '(\\\\=|\\\\\\\\)', '\\\\\\\\\\\\1')) ENGINE = MergeTree ORDER BY s`
+	createTableSQL := fmt.Sprintf("CREATE TABLE `%s`.`%s` "+createSchemaSQL, dbName, tableName)
+	env.queryWithNoError(r, fmt.Sprintf("CREATE DATABASE `%s`", dbName))
+	env.queryWithNoError(r, createTableSQL)
+	env.DockerExecNoError(r, "clickhouse-backup", "clickhouse-backup", "create", "--env", "CLICKHOUSE_HOST=clickhouse", "--tables", dbName+".*", t.Name())
+
+	backupTableFile := fmt.Sprintf("/var/lib/clickhouse/backup/%s/metadata/%s/%s.json", t.Name(), common.TablePathEncode(dbName), common.TablePathEncode(tableName))
+	backupContent, err := env.DockerExecOut("clickhouse-backup", "cat", backupTableFile)
+	r.NoError(err)
+	escapedCreateTableSQL := fmt.Sprintf("CREATE TABLE `%s`.`%s`", strings.ReplaceAll(dbName, `\`, `\\`), strings.ReplaceAll(tableName, `\`, `\\`))
+	escapedSchemaSQL := strings.ReplaceAll(createSchemaSQL, `\`, `\\`)
+	r.Contains(backupContent, escapedCreateTableSQL)
+	r.Contains(backupContent, escapedSchemaSQL)
+
+	r.NoError(env.ch.DropOrDetachTable(clickhouse.Table{Database: dbName, Name: tableName, CreateTableQuery: createTableSQL}, createTableSQL, "", false, version, "", false, ""))
+	r.NoError(env.dropDatabase(dbName, false))
+	env.DockerExecNoError(r, "clickhouse-backup", "clickhouse-backup", "restore", "--config", "/etc/clickhouse-backup/config-s3.yml", "--tables", dbName+".*", t.Name())
+	restoredSQL := ""
+	r.NoError(env.ch.SelectSingleRow(t.Context(), &restoredSQL, fmt.Sprintf("SHOW CREATE TABLE `%s`.`%s`", dbName, tableName)))
+
+	r.Contains(restoredSQL, escapedCreateTableSQL)
+	//SHOW CREATE SQL transform original query
+	restoredSQL = regexp.MustCompile(`[\n\s]+`).ReplaceAllString(restoredSQL, " ")
+	restoredSQL = regexp.MustCompile(`\(\s+`).ReplaceAllString(restoredSQL, "(")
+	restoredSQL = regexp.MustCompile(`\s+\)`).ReplaceAllString(restoredSQL, ")")
+	r.Contains(restoredSQL, createSchemaSQL)
+
+	r.NoError(env.dropDatabase(dbName, false))
+	env.Cleanup(t, r)
+}
+
+// https://github.com/Altinity/clickhouse-backup/issues/871
 func TestKeepBackupRemoteAndDiffFromRemote(t *testing.T) {
 	if isTestShouldSkip("RUN_ADVANCED_TESTS") {
 		t.Skip("Skipping Advanced integration tests...")