internal refactoring

Author: asmyasnikov

internal/xsql/connector.go

@@ -68,8 +68,8 @@ func (e Engine) String() string {
 	switch e {
 	case LEGACY:
 		return "LEGACY"
-	case QUERY_SERVICE:
-		return "QUERY_SERVICE"
+	case PROPOSE:
+		return "PROPOSE"
 	default:
 		return "UNKNOWN"
 	}
@@ -116,8 +116,8 @@ func (c *Connector) Scheme() scheme.Client {
 }
 
 const (
-	QUERY_SERVICE = iota + 1 //nolint:revive,stylecheck
-	LEGACY                   //nolint:revive,stylecheck
+	PROPOSE = iota + 1
+	LEGACY
 )
 
 func (c *Connector) Open(name string) (driver.Conn, error) {
@@ -130,7 +130,7 @@ func (c *Connector) Connect(ctx context.Context) (_ driver.Conn, finalErr error)
 	)
 
 	switch c.processor {
-	case QUERY_SERVICE:
+	case PROPOSE:
 		s, err := query.CreateSession(ctx, c.Query())
 		defer func() {
 			onDone(s, finalErr)
@@ -142,7 +142,7 @@ func (c *Connector) Connect(ctx context.Context) (_ driver.Conn, finalErr error)
 		id := uuid.New()
 
 		conn := &Conn{
-			processor: QUERY_SERVICE,
+			processor: PROPOSE,
 			cc: propose.New(ctx, c, s, append(
 				c.Options,
 				propose.WithOnClose(func() {
@@ -218,7 +218,7 @@ func Open(parent ydbDriver, balancer grpc.ClientConnInterface, opts ...Option) (
 		balancer: balancer,
 		processor: func() Engine {
 			if overQueryService, _ := strconv.ParseBool(os.Getenv("YDB_DATABASE_SQL_OVER_QUERY_SERVICE")); overQueryService {
-				return QUERY_SERVICE
+				return PROPOSE
 			}
 
 			return LEGACY

internal/xsql/options.go

@@ -200,7 +200,7 @@ func WithQueryOptions(opts ...propose.Option) Option {
 
 func WithQueryService(b bool) Option {
 	if b {
-		return queryProcessorOption(QUERY_SERVICE)
+		return queryProcessorOption(PROPOSE)
 	}
 
 	return queryProcessorOption(LEGACY)

tests/integration/database_sql_regression_test.go

@@ -239,7 +239,7 @@ func TestUUIDSerializationDatabaseSQLIssue1501(t *testing.T) {
 		switch driverEngine(db) {
 		case xsql.LEGACY:
 			require.Error(t, err)
-		case xsql.QUERY_SERVICE:
+		case xsql.PROPOSE:
 			require.NoError(t, err)
 		}
 	})
@@ -268,7 +268,7 @@ func TestUUIDSerializationDatabaseSQLIssue1501(t *testing.T) {
 			require.NoError(t, err)
 			resUUID := uuid.UUID(res.AsBytesArray())
 			require.Equal(t, expectedResultWithBug, resUUID.String())
-		case xsql.QUERY_SERVICE:
+		case xsql.PROPOSE:
 			require.Error(t, err)
 		}
 	})
@@ -357,7 +357,7 @@ func TestUUIDSerializationDatabaseSQLIssue1501(t *testing.T) {
 			require.NoError(t, err)
 			resUUID := uuid.UUID(resBytes.AsBytesArray())
 			require.Equal(t, id, resUUID)
-		case xsql.QUERY_SERVICE:
+		case xsql.PROPOSE:
 			require.Error(t, err)
 		}
 	})
@@ -425,7 +425,7 @@ func TestUUIDSerializationDatabaseSQLIssue1501(t *testing.T) {
 			resUUID := resFromDB.PublicRevertReorderForIssue1501()
 			resString := strings.ToUpper(resUUID.String())
 			require.Equal(t, idString, resString)
-		case xsql.QUERY_SERVICE:
+		case xsql.PROPOSE:
 			require.Error(t, err)
 		}
 	})

tests/integration/table_truncated_err_test.go

@@ -137,7 +137,7 @@ func TestIssue798TruncatedError(t *testing.T) {
 		switch driverEngine(db) {
 		case xsql.LEGACY:
 			scope.Require.ErrorIs(err, result.ErrTruncated)
-		case xsql.QUERY_SERVICE:
+		case xsql.PROPOSE:
 			scope.Require.NoError(err)
 		}
 	}