added syntax option

Author: asmyasnikov

internal/query/execute_query.go

@@ -32,7 +32,7 @@ func executeQueryRequest(a *allocator.Allocator, sessionID, q string, settings e
 	request.SessionId = sessionID
 	request.ExecMode = Ydb_Query.ExecMode(settings.ExecMode())
 	request.TxControl = settings.TxControl().ToYDB(a)
-	request.Query = queryFromText(a, q, settings.Syntax())
+	request.Query = queryFromText(a, q, Ydb_Query.Syntax(settings.Syntax()))
 	request.Parameters = settings.Params().ToYDB(a)
 	request.StatsMode = Ydb_Query.StatsMode(settings.StatsMode())
 	request.ConcurrentResultSets = false

internal/query/transaction_test.go

@@ -152,7 +152,7 @@ func TestFromTxOptions(t *testing.T) {
 				execMode:  query.ExecModeExecute,
 				statsMode: query.StatsModeNone,
 				txControl: query.TxControl(query.WithTxID("test")),
-				syntax:    Ydb_Query.Syntax_SYNTAX_YQL_V1,
+				syntax:    query.SyntaxYQL,
 			},
 		},
 		{
@@ -164,7 +164,7 @@ func TestFromTxOptions(t *testing.T) {
 				execMode:  query.ExecModeExecute,
 				statsMode: query.StatsModeFull,
 				txControl: query.TxControl(query.WithTxID("")),
-				syntax:    Ydb_Query.Syntax_SYNTAX_YQL_V1,
+				syntax:    query.SyntaxYQL,
 			},
 		},
 		{
@@ -176,7 +176,19 @@ func TestFromTxOptions(t *testing.T) {
 				execMode:  query.ExecModeExplain,
 				statsMode: query.StatsModeNone,
 				txControl: query.TxControl(query.WithTxID("")),
-				syntax:    Ydb_Query.Syntax_SYNTAX_YQL_V1,
+				syntax:    query.SyntaxYQL,
+			},
+		},
+		{
+			name: "WithSyntax",
+			txOpts: []query.TxExecuteOption{
+				query.WithSyntax(query.SyntaxPostgreSQL),
+			},
+			settings: testExecuteSettings{
+				execMode:  query.ExecModeExecute,
+				statsMode: query.StatsModeNone,
+				txControl: query.TxControl(query.WithTxID("")),
+				syntax:    query.SyntaxPostgreSQL,
 			},
 		},
 		{
@@ -188,7 +200,7 @@ func TestFromTxOptions(t *testing.T) {
 				execMode:  query.ExecModeExecute,
 				statsMode: query.StatsModeNone,
 				txControl: query.TxControl(query.WithTxID("")),
-				syntax:    Ydb_Query.Syntax_SYNTAX_YQL_V1,
+				syntax:    query.SyntaxYQL,
 				callOptions: []grpc.CallOption{
 					grpc.CallContentSubtype("test"),
 				},
@@ -205,7 +217,7 @@ func TestFromTxOptions(t *testing.T) {
 				execMode:  query.ExecModeExecute,
 				statsMode: query.StatsModeNone,
 				txControl: query.TxControl(query.WithTxID("")),
-				syntax:    Ydb_Query.Syntax_SYNTAX_YQL_V1,
+				syntax:    query.SyntaxYQL,
 				params:    params.Builder{}.Param("$a").Text("A").Build(),
 			},
 		},

query/execute_options.go

@@ -8,7 +8,7 @@ import (
 )
 
 type (
-	Syntax                = Ydb_Query.Syntax
+	Syntax                Ydb_Query.Syntax
 	ExecMode              Ydb_Query.ExecMode
 	StatsMode             Ydb_Query.StatsMode
 	callOptions           []grpc.CallOption
@@ -36,6 +36,19 @@ type (
 	parametersOption params.Parameters
 )
 
+func (syntax Syntax) applyTxExecuteOption(s *txExecuteSettings) {
+	s.syntax = syntax
+}
+
+func (syntax Syntax) applyExecuteOption(s *executeSettings) {
+	s.syntax = syntax
+}
+
+const (
+	SyntaxYQL        = Syntax(Ydb_Query.Syntax_SYNTAX_YQL_V1)
+	SyntaxPostgreSQL = Syntax(Ydb_Query.Syntax_SYNTAX_PG)
+)
+
 func (params parametersOption) applyTxExecuteOption(s *txExecuteSettings) {
 	s.params = append(s.params, params...)
 }
@@ -84,7 +97,7 @@ const (
 
 func defaultCommonExecuteSettings() commonExecuteSettings {
 	return commonExecuteSettings{
-		syntax:    Ydb_Query.Syntax_SYNTAX_YQL_V1,
+		syntax:    SyntaxYQL,
 		execMode:  ExecModeExecute,
 		statsMode: StatsModeNone,
 	}
@@ -161,6 +174,10 @@ func WithExecMode(mode ExecMode) ExecMode {
 	return mode
 }
 
+func WithSyntax(syntax Syntax) Syntax {
+	return syntax
+}
+
 func WithStatsMode(mode StatsMode) StatsMode {
 	return mode
 }

tests/integration/query_execute_test.go

@@ -35,13 +35,16 @@ func TestQueryExecute(t *testing.T) {
 		p3 time.Duration
 	)
 	err = db.Query().Do(ctx, func(ctx context.Context, s query.Session) (err error) {
-		_, res, err := s.Execute(ctx, "SELECT $p1, $p2, $p3", query.WithParameters(
-			ydb.ParamsBuilder().
-				Param("$p1").Text("test").
-				Param("$p2").Uint64(100500000000).
-				Param("$p3").Interval(time.Duration(100500000000)).
-				Build(),
-		))
+		_, res, err := s.Execute(ctx, "SELECT $p1, $p2, $p3",
+			query.WithParameters(
+				ydb.ParamsBuilder().
+					Param("$p1").Text("test").
+					Param("$p2").Uint64(100500000000).
+					Param("$p3").Interval(time.Duration(100500000000)).
+					Build(),
+			),
+			query.WithSyntax(query.SyntaxYQL),
+		)
 		if err != nil {
 			return err
 		}