revert Program.cs

KirillKurdyukov · KirillKurdyukov · commit 4a6ab5900e86 · 2025-03-30T14:39:05.000+03:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -95,6 +95,31 @@ jobs:
           dotnet-version: ${{ matrix.dotnet-version }}
       - name: Run Topic tests
         run: dotnet test src/Ydb.Sdk/tests/Tests.csproj --filter "FullyQualifiedName~Topic" -f ${{ matrix.dotnet-target-framework }} -l "console;verbosity=detailed"  
+  efcore-functional-tests:
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        ydb-version: [ 'latest', 'trunk' ]
+    services:
+      ydb:
+        image: ydbplatform/local-ydb:${{ matrix.ydb-version }}
+        ports:
+          - 2135:2135
+          - 2136:2136
+          - 8765:8765
+        env:
+          YDB_LOCAL_SURVIVE_RESTART: true
+        options: '--name ydb-local -h localhost'
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Install Dotnet
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.0.x
+      - name: Run EfCore tests
+        run: dotnet test src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/EfCore.Ydb.FunctionalTests.csproj -l "console;verbosity=detailed"
   integration-tests:
     runs-on: ubuntu-22.04
     strategy:
diff --git a/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NorthwindBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NorthwindBulkUpdatesYdbFixture.cs
@@ -5,7 +5,7 @@
 
 namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
 
-public class NorthwindBulkUpdatesYdbFixture<TModelCustomizer> : NorthwindBulkUpdatesRelationalFixture<TModelCustomizer>
+internal class NorthwindBulkUpdatesYdbFixture<TModelCustomizer> : NorthwindBulkUpdatesRelationalFixture<TModelCustomizer>
     where TModelCustomizer : ITestModelCustomizer, new()
 {
     protected override ITestStoreFactory TestStoreFactory => YdbNorthwindTestStoreFactory.Instance;
diff --git a/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbFixture.cs
@@ -1,6 +1,6 @@
 namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
 
-public class TPCFiltersInheritanceBulkUpdatesYdbFixture : TPCInheritanceBulkUpdatesYdbFixture
+internal class TPCFiltersInheritanceBulkUpdatesYdbFixture : TPCInheritanceBulkUpdatesYdbFixture
 {
     public override bool EnableFilters => true;
 }
diff --git a/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbTest.cs b/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbTest.cs
@@ -5,7 +5,7 @@
 
 namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
 
-public class TPCFiltersInheritanceBulkUpdatesYdbTest(
+internal class TPCFiltersInheritanceBulkUpdatesYdbTest(
     TPCFiltersInheritanceBulkUpdatesYdbFixture fixture,
     ITestOutputHelper testOutputHelper
 ) : TPCFiltersInheritanceBulkUpdatesTestBase<TPCFiltersInheritanceBulkUpdatesYdbFixture>(fixture, testOutputHelper)
diff --git a/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbFixture.cs
@@ -4,7 +4,7 @@
 
 namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
 
-public class TPCInheritanceBulkUpdatesYdbFixture : TPCInheritanceBulkUpdatesFixture
+internal class TPCInheritanceBulkUpdatesYdbFixture : TPCInheritanceBulkUpdatesFixture
 {
     protected override ITestStoreFactory TestStoreFactory => YdbTestStoreFactory.Instance;
 
diff --git a/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbTest.cs b/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbTest.cs
@@ -5,7 +5,7 @@
 
 namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
 
-public class TpcInheritanceBulkUpdatesYdbTest(
+internal class TpcInheritanceBulkUpdatesYdbTest(
     TPCInheritanceBulkUpdatesYdbFixture fixture,
     ITestOutputHelper testOutputHelper
 ) : TPCInheritanceBulkUpdatesTestBase<TPCInheritanceBulkUpdatesYdbFixture>(fixture, testOutputHelper)
diff --git a/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbFixture.cs
@@ -1,6 +1,6 @@
 namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
 
-public class TphFiltersInheritanceBulkUpdatesYdbFixture : TPHInheritanceBulkUpdatesYdbFixture
+internal class TphFiltersInheritanceBulkUpdatesYdbFixture : TPHInheritanceBulkUpdatesYdbFixture
 {
     public override bool EnableFilters => true;
 }
diff --git a/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbFixture.cs
@@ -4,7 +4,7 @@
 
 namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
 
-public class TPHInheritanceBulkUpdatesYdbFixture : TPHInheritanceBulkUpdatesFixture
+internal class TPHInheritanceBulkUpdatesYdbFixture : TPHInheritanceBulkUpdatesFixture
 {
     protected override ITestStoreFactory TestStoreFactory
         => YdbTestStoreFactory.Instance;
diff --git a/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbTest.cs b/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbTest.cs
@@ -4,7 +4,7 @@
 namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
 
 // TODO: Primary key required for ydb tables
-public class TPHInheritanceBulkUpdatesYdbTest(
+internal class TPHInheritanceBulkUpdatesYdbTest(
     TPHInheritanceBulkUpdatesYdbFixture fixture,
     ITestOutputHelper testOutputHelper)
     : TPHInheritanceBulkUpdatesTestBase<TPHInheritanceBulkUpdatesYdbFixture>(fixture, testOutputHelper);
diff --git a/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbFixture.cs
@@ -1,6 +1,6 @@
 namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
 
-public class TPTFiltersInheritanceBulkUpdatesYdbFixture : TPTInheritanceBulkUpdatesYdbFixture
+internal class TPTFiltersInheritanceBulkUpdatesYdbFixture : TPTInheritanceBulkUpdatesYdbFixture
 {
     public override bool EnableFilters
         => true;
diff --git a/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbTest.cs b/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbTest.cs
@@ -5,7 +5,7 @@
 namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
 
 // TODO: Refactor later
-public class TPTFiltersInheritanceBulkUpdatesSqlServerTest(
+internal class TPTFiltersInheritanceBulkUpdatesSqlServerTest(
     TPTFiltersInheritanceBulkUpdatesYdbFixture fixture,
     ITestOutputHelper testOutputHelper
 ) : TPTFiltersInheritanceBulkUpdatesTestBase<TPTFiltersInheritanceBulkUpdatesYdbFixture>(fixture, testOutputHelper)
diff --git a/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbFixture.cs
@@ -4,7 +4,7 @@
 
 namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
 
-public class TPTInheritanceBulkUpdatesYdbFixture : TPTInheritanceBulkUpdatesFixture
+internal class TPTInheritanceBulkUpdatesYdbFixture : TPTInheritanceBulkUpdatesFixture
 {
     protected override ITestStoreFactory TestStoreFactory => YdbTestStoreFactory.Instance;
 }
diff --git a/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/AllTests/Update/UpdatesYdbTest.cs b/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
-public class UpdatesYdbTest
+internal class UpdatesYdbTest
     : UpdatesRelationalTestBase<UpdatesYdbTest.UpdatesYdbFixture>
 // , UpdatesTestBase<UpdatesYdbTest.UpdatesYdbFixture>
 {
diff --git a/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/Migrations/YdbMigrationsSqlGeneratorTest.cs b/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/Migrations/YdbMigrationsSqlGeneratorTest.cs
@@ -117,7 +117,7 @@ public override void InsertDataOperation_required_args()
 
         AssertSql(
             """
-            INSERT INTO `dbo.People` ("First Name")
+            INSERT INTO `dbo/People` (`First Name`)
             VALUES ('John');
             """);
     }
@@ -335,9 +335,7 @@ public override void UpdateDataOperation_required_args_multi()
         );
     }
 
-    [ConditionalTheory]
-    [InlineData(false)]
-    [InlineData(true)]
+    [ConditionalTheory(Skip = "YDB does not support default value")]
     public override void DefaultValue_with_line_breaks(bool isUnicode)
     {
         base.DefaultValue_with_line_breaks(isUnicode);
@@ -349,18 +347,28 @@ public override void DefaultValue_with_line_breaks(bool isUnicode)
                   """);
     }
 
-    [ConditionalTheory]
-    [InlineData(false)]
-    [InlineData(true)]
+    [ConditionalTheory(Skip = "YDB does not support default value")]
     public override void DefaultValue_with_line_breaks_2(bool isUnicode)
     {
         base.DefaultValue_with_line_breaks_2(isUnicode);
+
+        AssertSql("""
+                  CREATE TABLE `dbo/TestLineBreaks` (
+                      `TestDefaultValue` Text NOT NULL
+                  );
+                  """);
     }
 
-    [ConditionalTheory(Skip = "ClickHouse does not support sequences")]
+    [ConditionalTheory(Skip = "YDB does not support sequences")]
     public override void Sequence_restart_operation(long? startsAt)
     {
         base.Sequence_restart_operation(startsAt);
+
+        AssertSql("""
+                  CREATE TABLE `dbo/TestLineBreaks` (
+                      `TestDefaultValue` Text NOT NULL
+                  );
+                  """);
     }
 
     protected override string GetGeometryCollectionStoreType() => throw new NotSupportedException();
diff --git a/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/Query/NorthwindQueryYdbFixtures.cs b/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/Query/NorthwindQueryYdbFixtures.cs
@@ -6,7 +6,7 @@
 
 namespace EfCore.Ydb.FunctionalTests.Query;
 
-public class NorthwindQueryYdbFixture<TModelCustomizer> : NorthwindQueryRelationalFixture<TModelCustomizer>
+internal class NorthwindQueryYdbFixture<TModelCustomizer> : NorthwindQueryRelationalFixture<TModelCustomizer>
     where TModelCustomizer : ITestModelCustomizer, new()
 {
     protected override ITestStoreFactory TestStoreFactory
diff --git a/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/TestModels/Northwind/NorthwindYdbContext.cs b/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/TestModels/Northwind/NorthwindYdbContext.cs
@@ -3,4 +3,4 @@
 
 namespace EfCore.Ydb.FunctionalTests.TestModels.Northwind;
 
-public class NorthwindYdbContext(DbContextOptions options) : NorthwindRelationalContext(options);
+internal class NorthwindYdbContext(DbContextOptions options) : NorthwindRelationalContext(options);
diff --git a/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/TestUtilities/YdbNorthwindTestStoreFactory.cs b/src/EFCore.Ydb/test/EFCore.Ydb.FunctionalTests/TestUtilities/YdbNorthwindTestStoreFactory.cs
@@ -2,7 +2,7 @@
 
 namespace EfCore.Ydb.FunctionalTests.TestUtilities;
 
-public class YdbNorthwindTestStoreFactory : YdbTestStoreFactory
+internal class YdbNorthwindTestStoreFactory : YdbTestStoreFactory
 {
     private const string DatabaseName = "Northwind";
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;`
`7`	`7`
`8`		`-public class NorthwindBulkUpdatesYdbFixture<TModelCustomizer> : NorthwindBulkUpdatesRelationalFixture<TModelCustomizer>`
	`8`	`+internal class NorthwindBulkUpdatesYdbFixture<TModelCustomizer> : NorthwindBulkUpdatesRelationalFixture<TModelCustomizer>`
`9`	`9`	`where TModelCustomizer : ITestModelCustomizer, new()`
`10`	`10`	`{`
`11`	`11`	`protected override ITestStoreFactory TestStoreFactory => YdbNorthwindTestStoreFactory.Instance;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;`
`2`	`2`
`3`		`-public class TPCFiltersInheritanceBulkUpdatesYdbFixture : TPCInheritanceBulkUpdatesYdbFixture`
	`3`	`+internal class TPCFiltersInheritanceBulkUpdatesYdbFixture : TPCInheritanceBulkUpdatesYdbFixture`
`4`	`4`	`{`
`5`	`5`	`public override bool EnableFilters => true;`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;`
`6`	`6`
`7`		`-public class TPCInheritanceBulkUpdatesYdbFixture : TPCInheritanceBulkUpdatesFixture`
	`7`	`+internal class TPCInheritanceBulkUpdatesYdbFixture : TPCInheritanceBulkUpdatesFixture`
`8`	`8`	`{`
`9`	`9`	`protected override ITestStoreFactory TestStoreFactory => YdbTestStoreFactory.Instance;`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;`
`2`	`2`
`3`		`-public class TphFiltersInheritanceBulkUpdatesYdbFixture : TPHInheritanceBulkUpdatesYdbFixture`
	`3`	`+internal class TphFiltersInheritanceBulkUpdatesYdbFixture : TPHInheritanceBulkUpdatesYdbFixture`
`4`	`4`	`{`
`5`	`5`	`public override bool EnableFilters => true;`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;`
`6`	`6`
`7`		`-public class TPHInheritanceBulkUpdatesYdbFixture : TPHInheritanceBulkUpdatesFixture`
	`7`	`+internal class TPHInheritanceBulkUpdatesYdbFixture : TPHInheritanceBulkUpdatesFixture`
`8`	`8`	`{`
`9`	`9`	`protected override ITestStoreFactory TestStoreFactory`
`10`	`10`	`=> YdbTestStoreFactory.Instance;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates;`
`2`	`2`
`3`		`-public class TPTFiltersInheritanceBulkUpdatesYdbFixture : TPTInheritanceBulkUpdatesYdbFixture`
	`3`	`+internal class TPTFiltersInheritanceBulkUpdatesYdbFixture : TPTInheritanceBulkUpdatesYdbFixture`
`4`	`4`	`{`
`5`	`5`	`public override bool EnableFilters`
`6`	`6`	`=> true;`