Skip to content

Commit b46a177

Browse files
committed
Take query building out of retryable callback
1 parent cf77d2e commit b46a177

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

app/server/datasource/rdbms/ydb/connection_native.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,12 @@ type connectionNative struct {
123123
func (c *connectionNative) Query(params *rdbms_utils.QueryParams) (*rdbms_utils.QueryResult, error) {
124124
paramsBuilder := ydb_sdk.ParamsBuilder()
125125

126+
// modify query with args
127+
queryRewritten, err := c.rewriteQuery(params)
128+
if err != nil {
129+
return nil, fmt.Errorf("rewrite query: %w", err)
130+
}
131+
126132
for i, arg := range params.QueryArgs.Values() {
127133
placeholder := c.formatter.GetPlaceholder(i)
128134

@@ -214,12 +220,6 @@ func (c *connectionNative) Query(params *rdbms_utils.QueryParams) (*rdbms_utils.
214220
finalErr := c.driver.Query().Do(
215221
parentCtx,
216222
func(ctx context.Context, session ydb_sdk_query.Session) (err error) {
217-
// modify query with args
218-
queryRewritten, err := c.rewriteQuery(params)
219-
if err != nil {
220-
return fmt.Errorf("rewrite query: %w", err)
221-
}
222-
223223
queryLogger := c.queryLoggerFactory.Make(params.Logger, zap.String("resource_pool", c.resourcePool))
224224
queryLogger.Dump(queryRewritten, params.QueryArgs.Values()...)
225225

0 commit comments

Comments
 (0)