Rename RewriteQuery->AddTablePrefix

Signed-off-by: sashayakovtseva <[email protected]>
sashayakovtseva · Feb 7, 2024 · 63287c8 · 63287c8
1 parent 3fe0b7e
commit 63287c8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/internal/datastore/ydb/common/common.go b/internal/datastore/ydb/common/common.go
@@ -36,7 +36,7 @@ var bytesPool = sync.Pool{
 	},
 }
 
-func RewriteQuery(query string, tablePathPrefix string) string {
+func AddTablePrefix(query string, tablePathPrefix string) string {
 	if tablePathPrefix == "" {
 		return query
 	}

diff --git a/internal/datastore/ydb/migrations/driver.go b/internal/datastore/ydb/migrations/driver.go
@@ -83,7 +83,7 @@ func (d *YDBDriver) Version(ctx context.Context) (string, error) {
 		_, res, err := s.Execute(
 			ctx,
 			table.DefaultTxControl(),
-			common.RewriteQuery(queryLoadVersion, d.tablePathPrefix),
+			common.AddTablePrefix(queryLoadVersion, d.tablePathPrefix),
 			nil,
 		)
 		if err != nil {
@@ -114,7 +114,7 @@ func (d *YDBDriver) Version(ctx context.Context) (string, error) {
 func (d *YDBDriver) WriteVersion(ctx context.Context, tx TxActorWithOptions, version, _ string) error {
 	res, err := tx.tx.Execute(
 		ctx,
-		common.RewriteQuery(queryWriteVersion, tx.opts.tablePathPrefix),
+		common.AddTablePrefix(queryWriteVersion, tx.opts.tablePathPrefix),
 		table.NewQueryParameters(
 			table.ValueParam("$newVersion", types.TextValue(version)),
 			table.ValueParam("$createAtUnixNano", types.Int64Value(truetime.UnixNano())),

diff --git a/internal/datastore/ydb/migrations/zz_migration.0001_initial_schema.go b/internal/datastore/ydb/migrations/zz_migration.0001_initial_schema.go
@@ -83,11 +83,11 @@ func init() {
 	err := YDBMigrations.Register("initial", "", func(ctx context.Context, client TableClientWithOptions) error {
 		return client.client.Do(ctx, func(ctx context.Context, s table.Session) error {
 			statements := []string{
-				common.RewriteQuery(createSchemaVersion, client.opts.tablePathPrefix),
-				common.RewriteQuery(createUniqueIDTable, client.opts.tablePathPrefix),
-				common.RewriteQuery(createNamespaceConfig, client.opts.tablePathPrefix),
-				common.RewriteQuery(createCaveat, client.opts.tablePathPrefix),
-				common.RewriteQuery(createRelationTuple, client.opts.tablePathPrefix),
+				common.AddTablePrefix(createSchemaVersion, client.opts.tablePathPrefix),
+				common.AddTablePrefix(createUniqueIDTable, client.opts.tablePathPrefix),
+				common.AddTablePrefix(createNamespaceConfig, client.opts.tablePathPrefix),
+				common.AddTablePrefix(createCaveat, client.opts.tablePathPrefix),
+				common.AddTablePrefix(createRelationTuple, client.opts.tablePathPrefix),
 			}
 			for _, stmt := range statements {
 				if err := s.ExecuteSchemeQuery(ctx, stmt); err != nil {
@@ -100,7 +100,7 @@ func init() {
 	}, func(ctx context.Context, tx TxActorWithOptions) error {
 		_, err := tx.tx.Execute(
 			ctx,
-			common.RewriteQuery(insertUniqueID, tx.opts.tablePathPrefix),
+			common.AddTablePrefix(insertUniqueID, tx.opts.tablePathPrefix),
 			&table.QueryParameters{},
 		)
 		return err