commit

Author: KirillKurdyukov

src/EfCore.Ydb/src/Query/Internal/YdbQuerySqlGenerator.cs

@@ -9,29 +9,16 @@
 
 namespace EfCore.Ydb.Query.Internal;
 
-public class YdbQuerySqlGenerator : QuerySqlGenerator
+public class YdbQuerySqlGenerator(QuerySqlGeneratorDependencies dependencies) : QuerySqlGenerator(dependencies)
 {
-    protected readonly ISqlGenerationHelper SqlGenerationHelper;
-    protected readonly IRelationalTypeMappingSource TypeMappingSource;
-    protected bool SkipAliases;
-
-    public YdbQuerySqlGenerator(
-        QuerySqlGeneratorDependencies dependencies,
-        IRelationalTypeMappingSource typeMappingSource
-    ) : base(dependencies)
-    {
-        SqlGenerationHelper = dependencies.SqlGenerationHelper;
-        TypeMappingSource = typeMappingSource;
-    }
-
-    [return: NotNullIfNotNull("node")]
-    public override Expression? Visit(Expression? node) => node != null ? base.Visit(node) : null;
+    private bool SkipAliases { get; set; }
+    private ISqlGenerationHelper SqlGenerationHelper => Dependencies.SqlGenerationHelper;
 
     protected override Expression VisitColumn(ColumnExpression columnExpression)
     {
         if (SkipAliases)
         {
-            Sql.Append(SqlGenerationHelper.DelimitIdentifier(columnExpression.Name));
+            Sql.Append(Dependencies.SqlGenerationHelper.DelimitIdentifier(columnExpression.Name));
         }
         else
         {
@@ -139,17 +126,17 @@ private void GenerateUpdateColumnSetters(UpdateExpression updateExpression)
         {
             foreach (var columnValueSetter in updateExpression.ColumnValueSetters.Skip(1))
             {
-                Sql
-                    .AppendLine(",")
-                    .Append($"{SqlGenerationHelper.DelimitIdentifier(columnValueSetter.Column.Name)} = ");
+                Sql.AppendLine(",")
+                    .Append(SqlGenerationHelper.DelimitIdentifier(columnValueSetter.Column.Name))
+                    .Append(" = ");
                 SkipAliases = true;
                 Visit(columnValueSetter.Value);
                 SkipAliases = false;
             }
         }
     }
 
-    protected void GenerateOnSubquery(
+    private void GenerateOnSubquery(
         IReadOnlyList<ColumnValueSetter>? columnValueSetters,
         SelectExpression select
     )
@@ -196,9 +183,13 @@ SelectExpression select
         }
     }
 
+    /// <inheritdoc />    
     protected override void GenerateLimitOffset(SelectExpression selectExpression)
     {
-        if (selectExpression.Limit == null && selectExpression.Offset == null) return;
+        if (selectExpression.Limit == null && selectExpression.Offset == null)
+        {
+            return;
+        }
 
         Sql.AppendLine().Append("LIMIT ");
         if (selectExpression.Limit != null)
@@ -211,14 +202,15 @@ protected override void GenerateLimitOffset(SelectExpression selectExpression)
             Sql.Append(ulong.MaxValue.ToString());
         }
 
+        // ReSharper disable once InvertIf
         if (selectExpression.Offset != null)
         {
             Sql.Append(" OFFSET ");
             Visit(selectExpression.Offset);
         }
     }
 
-    private bool IsComplexSelect(SelectExpression select, TableExpressionBase fromTable) =>
+    private static bool IsComplexSelect(SelectExpression select, TableExpressionBase fromTable) =>
         select.Offset != null
         || select.Limit != null
         || select.Having != null

src/EfCore.Ydb/src/Query/Internal/YdbQuerySqlGeneratorFactory.cs

@@ -3,10 +3,7 @@
 
 namespace EfCore.Ydb.Query.Internal;
 
-public class YdbQuerySqlGeneratorFactory(
-    QuerySqlGeneratorDependencies dependencies,
-    IRelationalTypeMappingSource typeMappingSource
-) : IQuerySqlGeneratorFactory
+public class YdbQuerySqlGeneratorFactory(QuerySqlGeneratorDependencies dependencies) : IQuerySqlGeneratorFactory
 {
-    public QuerySqlGenerator Create() => new YdbQuerySqlGenerator(dependencies, typeMappingSource);
+    public QuerySqlGenerator Create() => new YdbQuerySqlGenerator(dependencies);
 }

src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Update/UpdatesYdbTest.cs

@@ -13,7 +13,7 @@ namespace EfCore.Ydb.FunctionalTests.AllTests.Update;
 // Ignore_before_save_property_is_still_generated,
 // SaveChanges_processes_all_tracked_entities.
 // They're failing, but I cannot ignore them because they're not virtual
-internal class UpdatesYdbTest
+public class UpdatesYdbTest
     : UpdatesRelationalTestBase<UpdatesYdbTest.UpdatesYdbFixture>
 // , UpdatesTestBase<UpdatesYdbTest.UpdatesYdbFixture>
 {
@@ -24,8 +24,7 @@ public UpdatesYdbTest(UpdatesYdbFixture fixture) : base(fixture)
 
     public class UpdatesYdbFixture : UpdatesRelationalFixture
     {
-        protected override ITestStoreFactory TestStoreFactory
-            => YdbTestStoreFactory.Instance;
+        protected override ITestStoreFactory TestStoreFactory => YdbTestStoreFactory.Instance;
     }
 
     public override void Identifiers_are_generated_correctly()

src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestUtilities/YdbTestStore.cs

@@ -163,7 +163,7 @@ private static YdbCommand CreateCommand(
     }
 
 
-    private static YdbConnection CreateConnection() => new();
+    private static YdbConnection CreateConnection() => new(new YdbConnectionStringBuilder());
 
     public override async Task CleanAsync(DbContext context)
     {