fixed parameters

ydb-platform · Dec 9, 2024 · 3d61b65 · 3d61b65
1 parent 21b6d88
commit 3d61b65
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/internal/query/conn/conn.go b/internal/query/conn/conn.go
@@ -83,7 +83,14 @@ func (c *Conn) normalize(q string, args ...driver.NamedValue) (query string, _ p
 		queryArgs[i] = args[i]
 	}
 
-	return c.parent.Bindings().RewriteQuery(q, queryArgs...)
+	sql, parameters, err := c.parent.Bindings().RewriteQuery(q, queryArgs...)
+	if err != nil {
+		return "", nil, xerrors.WithStackTrace(err)
+	}
+
+	params := params.Params(parameters)
+
+	return sql, &params, nil
 }
 
 func (c *Conn) beginTx(ctx context.Context, txOptions driver.TxOptions) (tx currentTx, finalErr error) {
@@ -138,7 +145,7 @@ func (c *Conn) execContext(
 		return nil, xerrors.WithStackTrace(err)
 	}
 
-	err = c.session.Exec(ctx, normalizedQuery, options.WithParameters(&params))
+	err = c.session.Exec(ctx, normalizedQuery, options.WithParameters(params))
 	if err != nil {
 		return nil, xerrors.WithStackTrace(err)
 	}
@@ -191,7 +198,7 @@ func (c *Conn) queryContextOther(
 ) (driver.Rows, error) {
 	res, err := c.session.Query(
 		ctx, queryString,
-		options.WithParameters(&parameters),
+		options.WithParameters(parameters),
 	)
 	if err != nil {
 		return nil, xerrors.WithStackTrace(err)
@@ -211,7 +218,7 @@ func (c *Conn) queryContextExplain(
 	var ast, plan string
 	_, err := c.session.Query(
 		ctx, queryString,
-		options.WithParameters(&parameters),
+		options.WithParameters(parameters),
 		options.WithExecMode(options.ExecModeExplain),
 		options.WithStatsMode(options.StatsModeNone, func(stats stats.QueryStats) {
 			ast = stats.QueryAST()

diff --git a/internal/query/conn/tx.go b/internal/query/conn/tx.go
@@ -129,7 +129,7 @@ func (tx *transaction) QueryContext(ctx context.Context, query string, args []dr
 		return nil, xerrors.WithStackTrace(err)
 	}
 	res, err := tx.tx.Query(ctx,
-		query, options.WithParameters(&parameters),
+		query, options.WithParameters(parameters),
 	)
 	if err != nil {
 		return nil, xerrors.WithStackTrace(err)
@@ -157,7 +157,7 @@ func (tx *transaction) ExecContext(ctx context.Context, query string, args []dri
 		return nil, xerrors.WithStackTrace(err)
 	}
 	err = tx.tx.Exec(ctx,
-		query, options.WithParameters(&parameters),
+		query, options.WithParameters(parameters),
 	)
 	if err != nil {
 		return nil, xerrors.WithStackTrace(err)