From e0f621df88023afeb7dee73fd54e47bf79a3056c Mon Sep 17 00:00:00 2001 From: KirillKurdyukov Date: Wed, 9 Apr 2025 14:14:34 +0300 Subject: [PATCH 1/8] dev: prepare release EF --- .github/workflows/tests.yml | 4 ++-- examples/src/EF/EF.csproj | 2 +- examples/src/EF/Program.cs | 11 ++++++--- examples/src/EF_YC/EF_YC.csproj | 2 +- examples/src/EF_YC/Program.cs | 2 +- src/{EfCore.Ydb => EFCore.Ydb}/CHANGELOG.md | 0 .../src/Abstractions/YdbStringAttribute.cs | 2 +- .../Design/Internal/YdbDesignTimeServices.cs | 6 ++--- .../Internal/YdbCommandInterceptor.cs | 2 +- .../Internal/YdbLoggingDefinitions.cs | 2 +- .../src/EntityFrameworkCore.Ydb.csproj} | 5 ++-- .../YdbContextOptionsBuilderExtensions.cs | 6 ++--- .../YdbServiceCollectionExtensions.cs | 15 +++++++----- .../EntityFrameworkYdbServicesBuilder.cs | 2 +- .../Internal/YdbModelValidator.cs | 2 +- .../Internal/YdbOptionsExtension.cs | 4 ++-- .../YdbDbContextOptionsBuilder.cs | 4 ++-- .../Conventions/YdbConventionSetBuilder.cs | 2 +- .../YdbStringAttributeConvention.cs | 4 ++-- .../Metadata/Internal/YdbAnnotationNames.cs | 2 +- .../Internal/YdbAnnotationProvider.cs | 2 +- .../Internal/YdbHistoryRepository.cs | 1 + .../Migrations/YdbMigrationsSqlGenerator.cs | 4 ++-- .../src/Properties/AssemblyInfo.cs | 0 .../Internal/Translators/StubTranslator.cs | 0 .../YdbQueryableAggregateMethodTranslator.cs | 1 + ...dbAggregateMethodCallTranslatorProvider.cs | 3 ++- .../Internal/YdbMemberTranslatorProvider.cs | 2 +- .../YdbMethodCallTranslatorProvider.cs | 2 +- .../Internal/YdbParameterBasedSqlProcessor.cs | 2 +- .../YdbParameterBasedSqlProcessorFactory.cs | 2 +- .../Internal/YdbQueryCompilationContext.cs | 2 +- .../YdbQueryCompilationContextFactory.cs | 1 + .../Query/Internal/YdbQuerySqlGenerator.cs | 2 +- .../Internal/YdbQuerySqlGeneratorFactory.cs | 1 + .../YdbQueryTranslationPostprocessor.cs | 3 ++- ...YdbQueryTranslationPostprocessorFactory.cs | 1 + ...yableMethodTranslatingExpressionVisitor.cs | 4 +++- ...thodTranslatingExpressionVisitorFactory.cs | 1 + .../Query/Internal/YdbSqlExpressionFactory.cs | 2 +- .../YdbSqlTranslatingExpressionVisitor.cs | 3 ++- ...bSqlTranslatingExpressionVisitorFactory.cs | 1 + .../Internal/YdbTypeMappingPostprocessor.cs | 2 +- .../Internal/YdbDatabaseModelFactory.cs | 2 +- .../Internal/IYdbRelationalConnection.cs | 2 +- .../Internal/Mapping/YdbBoolTypeMapping.cs | 0 .../Internal/Mapping/YdbBytesTypeMapping.cs | 0 .../Internal/Mapping/YdbDecimalTypeMapping.cs | 0 .../Internal/Mapping/YdbJsonTypeMapping.cs | 0 .../Internal/Mapping/YdbStringTypeMapping.cs | 0 .../Storage/Internal/YdbDatabaseCreator.cs | 2 +- .../Internal/YdbRelationalConnection.cs | 6 ++--- .../Internal/YdbRelationalTransaction.cs | 2 +- .../YdbRelationalTransactionFactory.cs | 1 + .../Internal/YdbSqlGenerationHelper.cs | 2 +- .../Storage/Internal/YdbTypeMappingSource.cs | 2 +- .../Update/Internal/YdbModificationCommand.cs | 0 .../Internal/YdbModificationCommandBatch.cs | 8 +++++++ .../YdbModificationCommandBatchFactory.cs | 11 +++++++++ .../Internal/YdbModificationCommandFactory.cs | 0 .../Update/Internal/YdbUpdateSqlGenerator.cs | 22 +++++++---------- .../src/Utilities/ArrayUtil.cs | 0 .../ComplexTypeBulkUpdatesYdbTest.cs | 4 ++-- .../NonSharedModelBulkUpdatesYdbTest.cs | 4 ++-- .../NorthwindBulkUpdatesYdbFixture.cs | 4 ++-- .../NorthwindBulkUpdatesYdbTest.cs | 2 +- ...FiltersInheritanceBulkUpdatesYdbFixture.cs | 6 +++++ ...TPCFiltersInheritanceBulkUpdatesYdbTest.cs | 8 +++---- .../TPCInheritanceBulkUpdatesYdbFixture.cs | 6 ++--- .../TPCInheritanceBulkUpdatesYdbTest.cs | 8 +++---- ...FiltersInheritanceBulkUpdatesYdbFixture.cs | 2 +- ...TPHFiltersInheritanceBulkUpdatesYdbTest.cs | 4 ++-- .../TPHInheritanceBulkUpdatesYdbFixture.cs | 4 ++-- .../TPHInheritanceBulkUpdatesYdbTest.cs | 2 +- ...FiltersInheritanceBulkUpdatesYdbFixture.cs | 2 +- ...TPTFiltersInheritanceBulkUpdatesYdbTest.cs | 2 +- .../TPTInheritanceBulkUpdatesYdbFixture.cs | 4 ++-- .../TPTInheritanceBulkUpdatesYdbTest.cs | 2 +- .../AllTests/EntitySplittingYdbTest.cs | 4 ++-- .../AllTests/ModelBuilding101YdbTest.cs | 2 +- .../AllTests/NotificationEntitiesYdbTest.cs | 4 ++-- .../OverzealousInitializationYdbTest.cs | 4 ++-- .../AllTests/PropertyValuesYdbTest.cs | 4 ++-- .../AdHocAdvancedMappingsQueryYdbTest.cs | 4 ++-- .../Query/AdHocComplexTypeQueryYdbTest.cs | 4 ++-- .../Query/AdHocNavigationsQueryYdbTest.cs | 4 ++-- .../Query/AdHocQueryFiltersQueryYdbTest.cs | 4 ++-- .../Query/EntitySplittingQueryYdbTest.cs | 4 ++-- .../AllTests/Query/FieldsOnlyLoadYdbTest.cs | 4 ++-- .../AllTests/Query/IncludeOneToOneYdbTest.cs | 4 ++-- ...NorthwindAggregateOperatorsQueryYdbTest.cs | 4 ++-- .../Query/NorthwindCompiledQueryYdbTest.cs | 4 ++-- .../Query/NorthwindGroupByQueryYdbTest.cs | 4 ++-- .../AllTests/Query/NullKeysYdbTest.cs | 2 +- .../AllTests/Update/UpdatesYdbTest.cs | 24 +++++++++++++++++-- .../YdbServiceCollectionExtensionsTest.cs | 4 ++-- ...yFrameworkCore.Ydb.FunctionalTests.csproj} | 2 +- .../YdbMigrationsInfrastructureTest.cs | 6 ++--- .../YdbMigrationsSqlGeneratorTest.cs | 4 ++-- .../Migrations/YdbMigrationsTest.cs | 9 +++---- .../Northwind.sql | 0 .../Query/NorthwindQueryYdbFixtures.cs | 4 ++-- .../Northwind/NorthwindYdbContext.cs | 2 +- .../TestUtilities/SharedTestMethods.cs | 2 +- .../YdbNorthwindTestStoreFactory.cs | 2 +- .../TestUtilities/YdbTestHelpers.cs | 4 ++-- .../TestUtilities/YdbTestStore.cs | 4 ++-- .../TestUtilities/YdbTestStoreFactory.cs | 4 ++-- .../YdbFixture.cs | 2 +- .../xunit.runner.json | 0 .../YdbModificationCommandBatchFactory.cs | 20 ---------------- ...FiltersInheritanceBulkUpdatesYdbFixture.cs | 6 ----- src/Ydb.Sdk/src/Properties/AssemblyInfo.cs | 2 +- src/YdbSdk.sln | 8 +++---- 114 files changed, 223 insertions(+), 191 deletions(-) rename src/{EfCore.Ydb => EFCore.Ydb}/CHANGELOG.md (100%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Abstractions/YdbStringAttribute.cs (68%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Design/Internal/YdbDesignTimeServices.cs (78%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Diagnostics/Internal/YdbCommandInterceptor.cs (86%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Diagnostics/Internal/YdbLoggingDefinitions.cs (67%) rename src/{EfCore.Ydb/src/EfCore.Ydb.csproj => EFCore.Ydb/src/EntityFrameworkCore.Ydb.csproj} (84%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Extensions/YdbContextOptionsBuilderExtensions.cs (93%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Extensions/YdbServiceCollectionExtensions.cs (88%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Infrastructure/EntityFrameworkYdbServicesBuilder.cs (94%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Infrastructure/Internal/YdbModelValidator.cs (81%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Infrastructure/Internal/YdbOptionsExtension.cs (94%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Infrastructure/YdbDbContextOptionsBuilder.cs (88%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Metadata/Conventions/YdbConventionSetBuilder.cs (92%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Metadata/Conventions/YdbStringAttributeConvention.cs (87%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Metadata/Internal/YdbAnnotationNames.cs (72%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Metadata/Internal/YdbAnnotationProvider.cs (94%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Migrations/Internal/YdbHistoryRepository.cs (99%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Migrations/YdbMigrationsSqlGenerator.cs (99%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Properties/AssemblyInfo.cs (100%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/Translators/StubTranslator.cs (100%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/Translators/YdbQueryableAggregateMethodTranslator.cs (99%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/YdbAggregateMethodCallTranslatorProvider.cs (89%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/YdbMemberTranslatorProvider.cs (89%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/YdbMethodCallTranslatorProvider.cs (89%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/YdbParameterBasedSqlProcessor.cs (85%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/YdbParameterBasedSqlProcessorFactory.cs (88%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/YdbQueryCompilationContext.cs (86%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/YdbQueryCompilationContextFactory.cs (90%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/YdbQuerySqlGenerator.cs (99%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/YdbQuerySqlGeneratorFactory.cs (85%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/YdbQueryTranslationPostprocessor.cs (88%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/YdbQueryTranslationPostprocessorFactory.cs (93%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitor.cs (91%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitorFactory.cs (95%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/YdbSqlExpressionFactory.cs (91%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/YdbSqlTranslatingExpressionVisitor.cs (99%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/YdbSqlTranslatingExpressionVisitorFactory.cs (93%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Query/Internal/YdbTypeMappingPostprocessor.cs (88%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Scaffolding/Internal/YdbDatabaseModelFactory.cs (98%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Storage/Internal/IYdbRelationalConnection.cs (74%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Storage/Internal/Mapping/YdbBoolTypeMapping.cs (100%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Storage/Internal/Mapping/YdbBytesTypeMapping.cs (100%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Storage/Internal/Mapping/YdbDecimalTypeMapping.cs (100%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Storage/Internal/Mapping/YdbJsonTypeMapping.cs (100%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Storage/Internal/Mapping/YdbStringTypeMapping.cs (100%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Storage/Internal/YdbDatabaseCreator.cs (98%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Storage/Internal/YdbRelationalConnection.cs (91%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Storage/Internal/YdbRelationalTransaction.cs (96%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Storage/Internal/YdbRelationalTransactionFactory.cs (94%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Storage/Internal/YdbSqlGenerationHelper.cs (95%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Storage/Internal/YdbTypeMappingSource.cs (98%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Update/Internal/YdbModificationCommand.cs (100%) create mode 100644 src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatch.cs create mode 100644 src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatchFactory.cs rename src/{EfCore.Ydb => EFCore.Ydb}/src/Update/Internal/YdbModificationCommandFactory.cs (100%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Update/Internal/YdbUpdateSqlGenerator.cs (88%) rename src/{EfCore.Ydb => EFCore.Ydb}/src/Utilities/ArrayUtil.cs (100%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/BulkUpdates/ComplexTypeBulkUpdatesYdbTest.cs (99%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/BulkUpdates/NonSharedModelBulkUpdatesYdbTest.cs (70%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/BulkUpdates/NorthwindBulkUpdatesYdbFixture.cs (76%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/BulkUpdates/NorthwindBulkUpdatesYdbTest.cs (85%) create mode 100644 src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbFixture.cs rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbTest.cs (96%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbFixture.cs (57%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbTest.cs (96%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbFixture.cs (67%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbTest.cs (97%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbFixture.cs (68%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbTest.cs (83%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbFixture.cs (68%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbTest.cs (96%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbFixture.cs (68%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbTest.cs (83%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/EntitySplittingYdbTest.cs (73%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/ModelBuilding101YdbTest.cs (87%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/NotificationEntitiesYdbTest.cs (82%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/OverzealousInitializationYdbTest.cs (82%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/PropertyValuesYdbTest.cs (91%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/Query/AdHocAdvancedMappingsQueryYdbTest.cs (91%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/Query/AdHocComplexTypeQueryYdbTest.cs (68%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/Query/AdHocNavigationsQueryYdbTest.cs (94%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/Query/AdHocQueryFiltersQueryYdbTest.cs (84%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/Query/EntitySplittingQueryYdbTest.cs (96%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/Query/FieldsOnlyLoadYdbTest.cs (79%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/Query/IncludeOneToOneYdbTest.cs (87%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/Query/NorthwindAggregateOperatorsQueryYdbTest.cs (99%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/Query/NorthwindCompiledQueryYdbTest.cs (91%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/Query/NorthwindGroupByQueryYdbTest.cs (99%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/Query/NullKeysYdbTest.cs (89%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/Update/UpdatesYdbTest.cs (88%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/AllTests/YdbServiceCollectionExtensionsTest.cs (57%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/EfCore.Ydb.FunctionalTests.csproj => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/EntityFrameworkCore.Ydb.FunctionalTests.csproj} (93%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/Migrations/YdbMigrationsInfrastructureTest.cs (95%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/Migrations/YdbMigrationsSqlGeneratorTest.cs (98%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/Migrations/YdbMigrationsTest.cs (99%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/Northwind.sql (100%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/Query/NorthwindQueryYdbFixtures.cs (82%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/TestModels/Northwind/NorthwindYdbContext.cs (73%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/TestUtilities/SharedTestMethods.cs (93%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/TestUtilities/YdbNorthwindTestStoreFactory.cs (89%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/TestUtilities/YdbTestHelpers.cs (83%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/TestUtilities/YdbTestStore.cs (98%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/TestUtilities/YdbTestStoreFactory.cs (87%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/YdbFixture.cs (89%) rename src/{EfCore.Ydb/test/EfCore.Ydb.FunctionalTests => EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests}/xunit.runner.json (100%) delete mode 100644 src/EfCore.Ydb/src/Update/Internal/YdbModificationCommandBatchFactory.cs delete mode 100644 src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbFixture.cs diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f9e264c6..b01c1641 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -118,8 +118,8 @@ jobs: 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" + - 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/examples/src/EF/EF.csproj b/examples/src/EF/EF.csproj index 6be5b878..8686be97 100644 --- a/examples/src/EF/EF.csproj +++ b/examples/src/EF/EF.csproj @@ -9,6 +9,6 @@ - + diff --git a/examples/src/EF/Program.cs b/examples/src/EF/Program.cs index 4b92a857..5950a095 100644 --- a/examples/src/EF/Program.cs +++ b/examples/src/EF/Program.cs @@ -1,4 +1,4 @@ -using EfCore.Ydb.Extensions; +using EntityFrameworkCore.Ydb.Extensions; using Microsoft.EntityFrameworkCore; await using var db = new BloggingContext(); @@ -7,7 +7,11 @@ await db.Database.EnsureCreatedAsync(); Console.WriteLine("Inserting a new blog"); -db.Add(new Blog { Url = "http://blogs.msdn.com/adonet" }); +db.Add(new Blog { Url = "http://blogs.msdn.com/adonet - 1" }); +db.Add(new Blog { Url = "http://blogs.msdn.com/adonet - 2" }); +db.Add(new Blog { Url = "http://blogs.msdn.com/adonet - 3" }); +db.Add(new Blog { Url = "http://blogs.msdn.com/adonet - 4" }); + await db.SaveChangesAsync(); Console.WriteLine("Querying for a blog"); @@ -30,7 +34,8 @@ internal class BloggingContext : DbContext public DbSet Posts { get; set; } protected override void OnConfiguring(DbContextOptionsBuilder options) - => options.UseYdb("Host=localhost;Port=2136;Database=/local"); + => options.UseYdb("Host=localhost;Port=2136;Database=/local") + .LogTo(Console.WriteLine); } internal class Blog diff --git a/examples/src/EF_YC/EF_YC.csproj b/examples/src/EF_YC/EF_YC.csproj index b5acf661..d5eaa1ea 100644 --- a/examples/src/EF_YC/EF_YC.csproj +++ b/examples/src/EF_YC/EF_YC.csproj @@ -15,7 +15,7 @@ - + diff --git a/examples/src/EF_YC/Program.cs b/examples/src/EF_YC/Program.cs index a38068ca..9d4fc7b8 100644 --- a/examples/src/EF_YC/Program.cs +++ b/examples/src/EF_YC/Program.cs @@ -1,6 +1,6 @@ using CommandLine; using EF_YC; -using EfCore.Ydb.Extensions; +using EntityFrameworkCore.Ydb.Extensions; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using Ydb.Sdk.Yc; diff --git a/src/EfCore.Ydb/CHANGELOG.md b/src/EFCore.Ydb/CHANGELOG.md similarity index 100% rename from src/EfCore.Ydb/CHANGELOG.md rename to src/EFCore.Ydb/CHANGELOG.md diff --git a/src/EfCore.Ydb/src/Abstractions/YdbStringAttribute.cs b/src/EFCore.Ydb/src/Abstractions/YdbStringAttribute.cs similarity index 68% rename from src/EfCore.Ydb/src/Abstractions/YdbStringAttribute.cs rename to src/EFCore.Ydb/src/Abstractions/YdbStringAttribute.cs index 12df1e31..85290ee7 100644 --- a/src/EfCore.Ydb/src/Abstractions/YdbStringAttribute.cs +++ b/src/EFCore.Ydb/src/Abstractions/YdbStringAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace EfCore.Ydb.Abstractions; +namespace EntityFrameworkCore.Ydb.Abstractions; [AttributeUsage(AttributeTargets.Property)] public class YdbStringAttribute : Attribute; diff --git a/src/EfCore.Ydb/src/Design/Internal/YdbDesignTimeServices.cs b/src/EFCore.Ydb/src/Design/Internal/YdbDesignTimeServices.cs similarity index 78% rename from src/EfCore.Ydb/src/Design/Internal/YdbDesignTimeServices.cs rename to src/EFCore.Ydb/src/Design/Internal/YdbDesignTimeServices.cs index 4e16f187..7d3f785e 100644 --- a/src/EfCore.Ydb/src/Design/Internal/YdbDesignTimeServices.cs +++ b/src/EFCore.Ydb/src/Design/Internal/YdbDesignTimeServices.cs @@ -1,10 +1,10 @@ -using EfCore.Ydb.Extensions; -using EfCore.Ydb.Scaffolding.Internal; +using EntityFrameworkCore.Ydb.Extensions; +using EntityFrameworkCore.Ydb.Scaffolding.Internal; using Microsoft.EntityFrameworkCore.Design; using Microsoft.EntityFrameworkCore.Scaffolding; using Microsoft.Extensions.DependencyInjection; -namespace EfCore.Ydb.Design.Internal; +namespace EntityFrameworkCore.Ydb.Design.Internal; public class YdbDesignTimeServices : IDesignTimeServices { diff --git a/src/EfCore.Ydb/src/Diagnostics/Internal/YdbCommandInterceptor.cs b/src/EFCore.Ydb/src/Diagnostics/Internal/YdbCommandInterceptor.cs similarity index 86% rename from src/EfCore.Ydb/src/Diagnostics/Internal/YdbCommandInterceptor.cs rename to src/EFCore.Ydb/src/Diagnostics/Internal/YdbCommandInterceptor.cs index 7400b68d..973db589 100644 --- a/src/EfCore.Ydb/src/Diagnostics/Internal/YdbCommandInterceptor.cs +++ b/src/EFCore.Ydb/src/Diagnostics/Internal/YdbCommandInterceptor.cs @@ -1,7 +1,7 @@ using System.Data.Common; using Microsoft.EntityFrameworkCore.Diagnostics; -namespace EfCore.Ydb.Diagnostics.Internal; +namespace EntityFrameworkCore.Ydb.Diagnostics.Internal; // Temporary for debugging public class YdbCommandInterceptor : DbCommandInterceptor diff --git a/src/EfCore.Ydb/src/Diagnostics/Internal/YdbLoggingDefinitions.cs b/src/EFCore.Ydb/src/Diagnostics/Internal/YdbLoggingDefinitions.cs similarity index 67% rename from src/EfCore.Ydb/src/Diagnostics/Internal/YdbLoggingDefinitions.cs rename to src/EFCore.Ydb/src/Diagnostics/Internal/YdbLoggingDefinitions.cs index b24d8ad2..66eb6698 100644 --- a/src/EfCore.Ydb/src/Diagnostics/Internal/YdbLoggingDefinitions.cs +++ b/src/EFCore.Ydb/src/Diagnostics/Internal/YdbLoggingDefinitions.cs @@ -1,5 +1,5 @@ using Microsoft.EntityFrameworkCore.Diagnostics; -namespace EfCore.Ydb.Diagnostics.Internal; +namespace EntityFrameworkCore.Ydb.Diagnostics.Internal; public class YdbLoggingDefinitions : RelationalLoggingDefinitions; diff --git a/src/EfCore.Ydb/src/EfCore.Ydb.csproj b/src/EFCore.Ydb/src/EntityFrameworkCore.Ydb.csproj similarity index 84% rename from src/EfCore.Ydb/src/EfCore.Ydb.csproj rename to src/EFCore.Ydb/src/EntityFrameworkCore.Ydb.csproj index 488a9ea6..fdb60602 100644 --- a/src/EfCore.Ydb/src/EfCore.Ydb.csproj +++ b/src/EFCore.Ydb/src/EntityFrameworkCore.Ydb.csproj @@ -2,10 +2,9 @@ net8.0 - EfCore.Ydb + EntityFrameworkCore.Ydb enable - EfCore.Ydb - EfCore.Ydb + EntityFrameworkCore.Ydb diff --git a/src/EfCore.Ydb/src/Extensions/YdbContextOptionsBuilderExtensions.cs b/src/EFCore.Ydb/src/Extensions/YdbContextOptionsBuilderExtensions.cs similarity index 93% rename from src/EfCore.Ydb/src/Extensions/YdbContextOptionsBuilderExtensions.cs rename to src/EFCore.Ydb/src/Extensions/YdbContextOptionsBuilderExtensions.cs index 9f9d1116..54378384 100644 --- a/src/EfCore.Ydb/src/Extensions/YdbContextOptionsBuilderExtensions.cs +++ b/src/EFCore.Ydb/src/Extensions/YdbContextOptionsBuilderExtensions.cs @@ -1,11 +1,11 @@ using System; using System.Data.Common; -using EfCore.Ydb.Infrastructure; -using EfCore.Ydb.Infrastructure.Internal; +using EntityFrameworkCore.Ydb.Infrastructure; +using EntityFrameworkCore.Ydb.Infrastructure.Internal; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; -namespace EfCore.Ydb.Extensions; +namespace EntityFrameworkCore.Ydb.Extensions; public static class YdbContextOptionsBuilderExtensions { diff --git a/src/EfCore.Ydb/src/Extensions/YdbServiceCollectionExtensions.cs b/src/EFCore.Ydb/src/Extensions/YdbServiceCollectionExtensions.cs similarity index 88% rename from src/EfCore.Ydb/src/Extensions/YdbServiceCollectionExtensions.cs rename to src/EFCore.Ydb/src/Extensions/YdbServiceCollectionExtensions.cs index 9f412c33..c7372cbc 100644 --- a/src/EfCore.Ydb/src/Extensions/YdbServiceCollectionExtensions.cs +++ b/src/EFCore.Ydb/src/Extensions/YdbServiceCollectionExtensions.cs @@ -1,13 +1,16 @@ -using EfCore.Ydb.Diagnostics.Internal; -using EfCore.Ydb.Infrastructure; -using EfCore.Ydb.Infrastructure.Internal; -using EfCore.Ydb.Metadata.Conventions; -using EfCore.Ydb.Metadata.Internal; using EfCore.Ydb.Migrations; using EfCore.Ydb.Migrations.Internal; using EfCore.Ydb.Query.Internal; using EfCore.Ydb.Storage.Internal; using EfCore.Ydb.Update.Internal; +using EntityFrameworkCore.Ydb.Diagnostics.Internal; +using EntityFrameworkCore.Ydb.Infrastructure; +using EntityFrameworkCore.Ydb.Infrastructure.Internal; +using EntityFrameworkCore.Ydb.Metadata.Conventions; +using EntityFrameworkCore.Ydb.Metadata.Internal; +using EntityFrameworkCore.Ydb.Migrations; +using EntityFrameworkCore.Ydb.Query.Internal; +using EntityFrameworkCore.Ydb.Storage.Internal; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; @@ -18,7 +21,7 @@ using Microsoft.EntityFrameworkCore.Update; using Microsoft.Extensions.DependencyInjection; -namespace EfCore.Ydb.Extensions; +namespace EntityFrameworkCore.Ydb.Extensions; public static class YdbServiceCollectionExtensions { diff --git a/src/EfCore.Ydb/src/Infrastructure/EntityFrameworkYdbServicesBuilder.cs b/src/EFCore.Ydb/src/Infrastructure/EntityFrameworkYdbServicesBuilder.cs similarity index 94% rename from src/EfCore.Ydb/src/Infrastructure/EntityFrameworkYdbServicesBuilder.cs rename to src/EFCore.Ydb/src/Infrastructure/EntityFrameworkYdbServicesBuilder.cs index af8d10a2..f3fa9848 100644 --- a/src/EfCore.Ydb/src/Infrastructure/EntityFrameworkYdbServicesBuilder.cs +++ b/src/EFCore.Ydb/src/Infrastructure/EntityFrameworkYdbServicesBuilder.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.Extensions.DependencyInjection; -namespace EfCore.Ydb.Infrastructure; +namespace EntityFrameworkCore.Ydb.Infrastructure; public class EntityFrameworkYdbServicesBuilder(IServiceCollection serviceCollection) : EntityFrameworkRelationalServicesBuilder(serviceCollection) diff --git a/src/EfCore.Ydb/src/Infrastructure/Internal/YdbModelValidator.cs b/src/EFCore.Ydb/src/Infrastructure/Internal/YdbModelValidator.cs similarity index 81% rename from src/EfCore.Ydb/src/Infrastructure/Internal/YdbModelValidator.cs rename to src/EFCore.Ydb/src/Infrastructure/Internal/YdbModelValidator.cs index e39c7ec4..7ea40259 100644 --- a/src/EfCore.Ydb/src/Infrastructure/Internal/YdbModelValidator.cs +++ b/src/EFCore.Ydb/src/Infrastructure/Internal/YdbModelValidator.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Infrastructure; -namespace EfCore.Ydb.Infrastructure.Internal; +namespace EntityFrameworkCore.Ydb.Infrastructure.Internal; public class YdbModelValidator( ModelValidatorDependencies dependencies, diff --git a/src/EfCore.Ydb/src/Infrastructure/Internal/YdbOptionsExtension.cs b/src/EFCore.Ydb/src/Infrastructure/Internal/YdbOptionsExtension.cs similarity index 94% rename from src/EfCore.Ydb/src/Infrastructure/Internal/YdbOptionsExtension.cs rename to src/EFCore.Ydb/src/Infrastructure/Internal/YdbOptionsExtension.cs index 8b84ab4a..12047dae 100644 --- a/src/EfCore.Ydb/src/Infrastructure/Internal/YdbOptionsExtension.cs +++ b/src/EFCore.Ydb/src/Infrastructure/Internal/YdbOptionsExtension.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Security.Cryptography.X509Certificates; -using EfCore.Ydb.Extensions; +using EntityFrameworkCore.Ydb.Extensions; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.Extensions.DependencyInjection; using Ydb.Sdk.Auth; -namespace EfCore.Ydb.Infrastructure.Internal; +namespace EntityFrameworkCore.Ydb.Infrastructure.Internal; public class YdbOptionsExtension : RelationalOptionsExtension { diff --git a/src/EfCore.Ydb/src/Infrastructure/YdbDbContextOptionsBuilder.cs b/src/EFCore.Ydb/src/Infrastructure/YdbDbContextOptionsBuilder.cs similarity index 88% rename from src/EfCore.Ydb/src/Infrastructure/YdbDbContextOptionsBuilder.cs rename to src/EFCore.Ydb/src/Infrastructure/YdbDbContextOptionsBuilder.cs index 6c9b4854..fa64290c 100644 --- a/src/EfCore.Ydb/src/Infrastructure/YdbDbContextOptionsBuilder.cs +++ b/src/EFCore.Ydb/src/Infrastructure/YdbDbContextOptionsBuilder.cs @@ -1,10 +1,10 @@ using System.Security.Cryptography.X509Certificates; -using EfCore.Ydb.Infrastructure.Internal; +using EntityFrameworkCore.Ydb.Infrastructure.Internal; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Ydb.Sdk.Auth; -namespace EfCore.Ydb.Infrastructure; +namespace EntityFrameworkCore.Ydb.Infrastructure; public class YdbDbContextOptionsBuilder(DbContextOptionsBuilder optionsBuilder) : RelationalDbContextOptionsBuilder(optionsBuilder) diff --git a/src/EfCore.Ydb/src/Metadata/Conventions/YdbConventionSetBuilder.cs b/src/EFCore.Ydb/src/Metadata/Conventions/YdbConventionSetBuilder.cs similarity index 92% rename from src/EfCore.Ydb/src/Metadata/Conventions/YdbConventionSetBuilder.cs rename to src/EFCore.Ydb/src/Metadata/Conventions/YdbConventionSetBuilder.cs index 6e21e1a5..f4f5b6c8 100644 --- a/src/EfCore.Ydb/src/Metadata/Conventions/YdbConventionSetBuilder.cs +++ b/src/EFCore.Ydb/src/Metadata/Conventions/YdbConventionSetBuilder.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore.Metadata.Conventions; using Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure; -namespace EfCore.Ydb.Metadata.Conventions; +namespace EntityFrameworkCore.Ydb.Metadata.Conventions; // ReSharper disable once ClassNeverInstantiated.Global public class YdbConventionSetBuilder( diff --git a/src/EfCore.Ydb/src/Metadata/Conventions/YdbStringAttributeConvention.cs b/src/EFCore.Ydb/src/Metadata/Conventions/YdbStringAttributeConvention.cs similarity index 87% rename from src/EfCore.Ydb/src/Metadata/Conventions/YdbStringAttributeConvention.cs rename to src/EFCore.Ydb/src/Metadata/Conventions/YdbStringAttributeConvention.cs index 139d2700..b35a84a5 100644 --- a/src/EfCore.Ydb/src/Metadata/Conventions/YdbStringAttributeConvention.cs +++ b/src/EFCore.Ydb/src/Metadata/Conventions/YdbStringAttributeConvention.cs @@ -1,11 +1,11 @@ using System.Reflection; -using EfCore.Ydb.Abstractions; +using EntityFrameworkCore.Ydb.Abstractions; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; using Microsoft.EntityFrameworkCore.Metadata.Conventions; using Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure; -namespace EfCore.Ydb.Metadata.Conventions; +namespace EntityFrameworkCore.Ydb.Metadata.Conventions; public class YdbStringAttributeConvention(ProviderConventionSetBuilderDependencies dependencies) : PropertyAttributeConventionBase(dependencies) diff --git a/src/EfCore.Ydb/src/Metadata/Internal/YdbAnnotationNames.cs b/src/EFCore.Ydb/src/Metadata/Internal/YdbAnnotationNames.cs similarity index 72% rename from src/EfCore.Ydb/src/Metadata/Internal/YdbAnnotationNames.cs rename to src/EFCore.Ydb/src/Metadata/Internal/YdbAnnotationNames.cs index 4002af33..92778335 100644 --- a/src/EfCore.Ydb/src/Metadata/Internal/YdbAnnotationNames.cs +++ b/src/EFCore.Ydb/src/Metadata/Internal/YdbAnnotationNames.cs @@ -1,4 +1,4 @@ -namespace EfCore.Ydb.Metadata.Internal; +namespace EntityFrameworkCore.Ydb.Metadata.Internal; public static class YdbAnnotationNames { diff --git a/src/EfCore.Ydb/src/Metadata/Internal/YdbAnnotationProvider.cs b/src/EFCore.Ydb/src/Metadata/Internal/YdbAnnotationProvider.cs similarity index 94% rename from src/EfCore.Ydb/src/Metadata/Internal/YdbAnnotationProvider.cs rename to src/EFCore.Ydb/src/Metadata/Internal/YdbAnnotationProvider.cs index d5b2e9c5..c4ef46a4 100644 --- a/src/EfCore.Ydb/src/Metadata/Internal/YdbAnnotationProvider.cs +++ b/src/EFCore.Ydb/src/Metadata/Internal/YdbAnnotationProvider.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Metadata.Internal; -namespace EfCore.Ydb.Metadata.Internal; +namespace EntityFrameworkCore.Ydb.Metadata.Internal; public class YdbAnnotationProvider(RelationalAnnotationProviderDependencies dependencies) : RelationalAnnotationProvider(dependencies) diff --git a/src/EfCore.Ydb/src/Migrations/Internal/YdbHistoryRepository.cs b/src/EFCore.Ydb/src/Migrations/Internal/YdbHistoryRepository.cs similarity index 99% rename from src/EfCore.Ydb/src/Migrations/Internal/YdbHistoryRepository.cs rename to src/EFCore.Ydb/src/Migrations/Internal/YdbHistoryRepository.cs index ccf536a4..569f706e 100644 --- a/src/EfCore.Ydb/src/Migrations/Internal/YdbHistoryRepository.cs +++ b/src/EFCore.Ydb/src/Migrations/Internal/YdbHistoryRepository.cs @@ -5,6 +5,7 @@ using System.Threading; using System.Threading.Tasks; using EfCore.Ydb.Storage.Internal; +using EntityFrameworkCore.Ydb.Storage.Internal; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations.Operations; diff --git a/src/EfCore.Ydb/src/Migrations/YdbMigrationsSqlGenerator.cs b/src/EFCore.Ydb/src/Migrations/YdbMigrationsSqlGenerator.cs similarity index 99% rename from src/EfCore.Ydb/src/Migrations/YdbMigrationsSqlGenerator.cs rename to src/EFCore.Ydb/src/Migrations/YdbMigrationsSqlGenerator.cs index 94baf401..79c68fce 100644 --- a/src/EfCore.Ydb/src/Migrations/YdbMigrationsSqlGenerator.cs +++ b/src/EFCore.Ydb/src/Migrations/YdbMigrationsSqlGenerator.cs @@ -1,13 +1,13 @@ using System; using System.Text; -using EfCore.Ydb.Metadata.Internal; +using EntityFrameworkCore.Ydb.Metadata.Internal; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations.Operations; using Ydb.Sdk.Ado; -namespace EfCore.Ydb.Migrations; +namespace EntityFrameworkCore.Ydb.Migrations; public class YdbMigrationsSqlGenerator(MigrationsSqlGeneratorDependencies dependencies) : MigrationsSqlGenerator(dependencies) diff --git a/src/EfCore.Ydb/src/Properties/AssemblyInfo.cs b/src/EFCore.Ydb/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/EfCore.Ydb/src/Properties/AssemblyInfo.cs rename to src/EFCore.Ydb/src/Properties/AssemblyInfo.cs diff --git a/src/EfCore.Ydb/src/Query/Internal/Translators/StubTranslator.cs b/src/EFCore.Ydb/src/Query/Internal/Translators/StubTranslator.cs similarity index 100% rename from src/EfCore.Ydb/src/Query/Internal/Translators/StubTranslator.cs rename to src/EFCore.Ydb/src/Query/Internal/Translators/StubTranslator.cs diff --git a/src/EfCore.Ydb/src/Query/Internal/Translators/YdbQueryableAggregateMethodTranslator.cs b/src/EFCore.Ydb/src/Query/Internal/Translators/YdbQueryableAggregateMethodTranslator.cs similarity index 99% rename from src/EfCore.Ydb/src/Query/Internal/Translators/YdbQueryableAggregateMethodTranslator.cs rename to src/EFCore.Ydb/src/Query/Internal/Translators/YdbQueryableAggregateMethodTranslator.cs index 66b9c87f..93fbe7d7 100644 --- a/src/EfCore.Ydb/src/Query/Internal/Translators/YdbQueryableAggregateMethodTranslator.cs +++ b/src/EFCore.Ydb/src/Query/Internal/Translators/YdbQueryableAggregateMethodTranslator.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Reflection; using EfCore.Ydb.Utilities; +using EntityFrameworkCore.Ydb.Query.Internal; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.Query; diff --git a/src/EfCore.Ydb/src/Query/Internal/YdbAggregateMethodCallTranslatorProvider.cs b/src/EFCore.Ydb/src/Query/Internal/YdbAggregateMethodCallTranslatorProvider.cs similarity index 89% rename from src/EfCore.Ydb/src/Query/Internal/YdbAggregateMethodCallTranslatorProvider.cs rename to src/EFCore.Ydb/src/Query/Internal/YdbAggregateMethodCallTranslatorProvider.cs index 7ca0c7f3..8e809c0f 100644 --- a/src/EfCore.Ydb/src/Query/Internal/YdbAggregateMethodCallTranslatorProvider.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbAggregateMethodCallTranslatorProvider.cs @@ -1,7 +1,8 @@ +using EfCore.Ydb.Query.Internal; using EfCore.Ydb.Query.Internal.Translators; using Microsoft.EntityFrameworkCore.Query; -namespace EfCore.Ydb.Query.Internal; +namespace EntityFrameworkCore.Ydb.Query.Internal; public sealed class YdbAggregateMethodCallTranslatorProvider : RelationalAggregateMethodCallTranslatorProvider diff --git a/src/EfCore.Ydb/src/Query/Internal/YdbMemberTranslatorProvider.cs b/src/EFCore.Ydb/src/Query/Internal/YdbMemberTranslatorProvider.cs similarity index 89% rename from src/EfCore.Ydb/src/Query/Internal/YdbMemberTranslatorProvider.cs rename to src/EFCore.Ydb/src/Query/Internal/YdbMemberTranslatorProvider.cs index 59173350..5abd2bea 100644 --- a/src/EfCore.Ydb/src/Query/Internal/YdbMemberTranslatorProvider.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbMemberTranslatorProvider.cs @@ -1,7 +1,7 @@ using EfCore.Ydb.Query.Internal.Translators; using Microsoft.EntityFrameworkCore.Query; -namespace EfCore.Ydb.Query.Internal; +namespace EntityFrameworkCore.Ydb.Query.Internal; public sealed class YdbMemberTranslatorProvider : RelationalMemberTranslatorProvider { diff --git a/src/EfCore.Ydb/src/Query/Internal/YdbMethodCallTranslatorProvider.cs b/src/EFCore.Ydb/src/Query/Internal/YdbMethodCallTranslatorProvider.cs similarity index 89% rename from src/EfCore.Ydb/src/Query/Internal/YdbMethodCallTranslatorProvider.cs rename to src/EFCore.Ydb/src/Query/Internal/YdbMethodCallTranslatorProvider.cs index 05fccd88..32044b96 100644 --- a/src/EfCore.Ydb/src/Query/Internal/YdbMethodCallTranslatorProvider.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbMethodCallTranslatorProvider.cs @@ -1,7 +1,7 @@ using EfCore.Ydb.Query.Internal.Translators; using Microsoft.EntityFrameworkCore.Query; -namespace EfCore.Ydb.Query.Internal; +namespace EntityFrameworkCore.Ydb.Query.Internal; public sealed class YdbMethodCallTranslatorProvider : RelationalMethodCallTranslatorProvider { diff --git a/src/EfCore.Ydb/src/Query/Internal/YdbParameterBasedSqlProcessor.cs b/src/EFCore.Ydb/src/Query/Internal/YdbParameterBasedSqlProcessor.cs similarity index 85% rename from src/EfCore.Ydb/src/Query/Internal/YdbParameterBasedSqlProcessor.cs rename to src/EFCore.Ydb/src/Query/Internal/YdbParameterBasedSqlProcessor.cs index 872bcde1..9d581ab1 100644 --- a/src/EfCore.Ydb/src/Query/Internal/YdbParameterBasedSqlProcessor.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbParameterBasedSqlProcessor.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Query; -namespace EfCore.Ydb.Query.Internal; +namespace EntityFrameworkCore.Ydb.Query.Internal; public class YdbParameterBasedSqlProcessor( RelationalParameterBasedSqlProcessorDependencies dependencies, diff --git a/src/EfCore.Ydb/src/Query/Internal/YdbParameterBasedSqlProcessorFactory.cs b/src/EFCore.Ydb/src/Query/Internal/YdbParameterBasedSqlProcessorFactory.cs similarity index 88% rename from src/EfCore.Ydb/src/Query/Internal/YdbParameterBasedSqlProcessorFactory.cs rename to src/EFCore.Ydb/src/Query/Internal/YdbParameterBasedSqlProcessorFactory.cs index 2da4ef3f..03f699fa 100644 --- a/src/EfCore.Ydb/src/Query/Internal/YdbParameterBasedSqlProcessorFactory.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbParameterBasedSqlProcessorFactory.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Query; -namespace EfCore.Ydb.Query.Internal; +namespace EntityFrameworkCore.Ydb.Query.Internal; public class YdbParameterBasedSqlProcessorFactory(RelationalParameterBasedSqlProcessorDependencies dependencies) : IRelationalParameterBasedSqlProcessorFactory diff --git a/src/EfCore.Ydb/src/Query/Internal/YdbQueryCompilationContext.cs b/src/EFCore.Ydb/src/Query/Internal/YdbQueryCompilationContext.cs similarity index 86% rename from src/EfCore.Ydb/src/Query/Internal/YdbQueryCompilationContext.cs rename to src/EFCore.Ydb/src/Query/Internal/YdbQueryCompilationContext.cs index 4d15d19d..2f3eebe2 100644 --- a/src/EfCore.Ydb/src/Query/Internal/YdbQueryCompilationContext.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbQueryCompilationContext.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Query; -namespace EfCore.Ydb.Query.Internal; +namespace EntityFrameworkCore.Ydb.Query.Internal; public class YdbQueryCompilationContext( QueryCompilationContextDependencies dependencies, diff --git a/src/EfCore.Ydb/src/Query/Internal/YdbQueryCompilationContextFactory.cs b/src/EFCore.Ydb/src/Query/Internal/YdbQueryCompilationContextFactory.cs similarity index 90% rename from src/EfCore.Ydb/src/Query/Internal/YdbQueryCompilationContextFactory.cs rename to src/EFCore.Ydb/src/Query/Internal/YdbQueryCompilationContextFactory.cs index 6527202b..43884438 100644 --- a/src/EfCore.Ydb/src/Query/Internal/YdbQueryCompilationContextFactory.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbQueryCompilationContextFactory.cs @@ -1,3 +1,4 @@ +using EntityFrameworkCore.Ydb.Query.Internal; using Microsoft.EntityFrameworkCore.Query; namespace EfCore.Ydb.Query.Internal; diff --git a/src/EfCore.Ydb/src/Query/Internal/YdbQuerySqlGenerator.cs b/src/EFCore.Ydb/src/Query/Internal/YdbQuerySqlGenerator.cs similarity index 99% rename from src/EfCore.Ydb/src/Query/Internal/YdbQuerySqlGenerator.cs rename to src/EFCore.Ydb/src/Query/Internal/YdbQuerySqlGenerator.cs index 3a49afc5..719b5fc4 100644 --- a/src/EfCore.Ydb/src/Query/Internal/YdbQuerySqlGenerator.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbQuerySqlGenerator.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Query.SqlExpressions; using Microsoft.EntityFrameworkCore.Storage; -namespace EfCore.Ydb.Query.Internal; +namespace EntityFrameworkCore.Ydb.Query.Internal; public class YdbQuerySqlGenerator(QuerySqlGeneratorDependencies dependencies) : QuerySqlGenerator(dependencies) { diff --git a/src/EfCore.Ydb/src/Query/Internal/YdbQuerySqlGeneratorFactory.cs b/src/EFCore.Ydb/src/Query/Internal/YdbQuerySqlGeneratorFactory.cs similarity index 85% rename from src/EfCore.Ydb/src/Query/Internal/YdbQuerySqlGeneratorFactory.cs rename to src/EFCore.Ydb/src/Query/Internal/YdbQuerySqlGeneratorFactory.cs index b243b8a1..58950880 100644 --- a/src/EfCore.Ydb/src/Query/Internal/YdbQuerySqlGeneratorFactory.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbQuerySqlGeneratorFactory.cs @@ -1,3 +1,4 @@ +using EntityFrameworkCore.Ydb.Query.Internal; using Microsoft.EntityFrameworkCore.Query; namespace EfCore.Ydb.Query.Internal; diff --git a/src/EfCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessor.cs b/src/EFCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessor.cs similarity index 88% rename from src/EfCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessor.cs rename to src/EFCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessor.cs index 52d08fda..5818c452 100644 --- a/src/EfCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessor.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessor.cs @@ -1,7 +1,8 @@ using System.Linq.Expressions; +using EfCore.Ydb.Query.Internal; using Microsoft.EntityFrameworkCore.Query; -namespace EfCore.Ydb.Query.Internal; +namespace EntityFrameworkCore.Ydb.Query.Internal; public class YdbQueryTranslationPostprocessor( QueryTranslationPostprocessorDependencies dependencies, diff --git a/src/EfCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessorFactory.cs b/src/EFCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessorFactory.cs similarity index 93% rename from src/EfCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessorFactory.cs rename to src/EFCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessorFactory.cs index 7b22f9a2..cd07545e 100644 --- a/src/EfCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessorFactory.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessorFactory.cs @@ -1,3 +1,4 @@ +using EntityFrameworkCore.Ydb.Query.Internal; using Microsoft.EntityFrameworkCore.Query; namespace EfCore.Ydb.Query.Internal; diff --git a/src/EfCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitor.cs similarity index 91% rename from src/EfCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitor.cs rename to src/EFCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitor.cs index 27c2cb78..6c319323 100644 --- a/src/EfCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitor.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitor.cs @@ -1,7 +1,9 @@ +using EfCore.Ydb.Query.Internal; using EfCore.Ydb.Storage.Internal; +using EntityFrameworkCore.Ydb.Storage.Internal; using Microsoft.EntityFrameworkCore.Query; -namespace EfCore.Ydb.Query.Internal; +namespace EntityFrameworkCore.Ydb.Query.Internal; public class YdbQueryableMethodTranslatingExpressionVisitor : RelationalQueryableMethodTranslatingExpressionVisitor diff --git a/src/EfCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitorFactory.cs b/src/EFCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitorFactory.cs similarity index 95% rename from src/EfCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitorFactory.cs rename to src/EFCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitorFactory.cs index 39808fbf..4c997533 100644 --- a/src/EfCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitorFactory.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitorFactory.cs @@ -1,3 +1,4 @@ +using EntityFrameworkCore.Ydb.Query.Internal; using Microsoft.EntityFrameworkCore.Query; namespace EfCore.Ydb.Query.Internal; diff --git a/src/EfCore.Ydb/src/Query/Internal/YdbSqlExpressionFactory.cs b/src/EFCore.Ydb/src/Query/Internal/YdbSqlExpressionFactory.cs similarity index 91% rename from src/EfCore.Ydb/src/Query/Internal/YdbSqlExpressionFactory.cs rename to src/EFCore.Ydb/src/Query/Internal/YdbSqlExpressionFactory.cs index 019310b2..bdf3eb3c 100644 --- a/src/EfCore.Ydb/src/Query/Internal/YdbSqlExpressionFactory.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbSqlExpressionFactory.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Query.SqlExpressions; using Microsoft.EntityFrameworkCore.Storage; -namespace EfCore.Ydb.Query.Internal; +namespace EntityFrameworkCore.Ydb.Query.Internal; public class YdbSqlExpressionFactory(SqlExpressionFactoryDependencies dependencies) : SqlExpressionFactory(dependencies) { diff --git a/src/EfCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitor.cs b/src/EFCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitor.cs similarity index 99% rename from src/EfCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitor.cs rename to src/EFCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitor.cs index f4c59292..45652295 100644 --- a/src/EfCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitor.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitor.cs @@ -5,12 +5,13 @@ using System.Linq.Expressions; using System.Reflection; using System.Text; +using EfCore.Ydb.Query.Internal; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.Query.SqlExpressions; using Microsoft.EntityFrameworkCore.Storage; using ArgumentOutOfRangeException = System.ArgumentOutOfRangeException; -namespace EfCore.Ydb.Query.Internal; +namespace EntityFrameworkCore.Ydb.Query.Internal; public class YdbSqlTranslatingExpressionVisitor( RelationalSqlTranslatingExpressionVisitorDependencies dependencies, diff --git a/src/EfCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitorFactory.cs b/src/EFCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitorFactory.cs similarity index 93% rename from src/EfCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitorFactory.cs rename to src/EFCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitorFactory.cs index 8a1e5757..7d22b747 100644 --- a/src/EfCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitorFactory.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitorFactory.cs @@ -1,3 +1,4 @@ +using EntityFrameworkCore.Ydb.Query.Internal; using Microsoft.EntityFrameworkCore.Query; namespace EfCore.Ydb.Query.Internal; diff --git a/src/EfCore.Ydb/src/Query/Internal/YdbTypeMappingPostprocessor.cs b/src/EFCore.Ydb/src/Query/Internal/YdbTypeMappingPostprocessor.cs similarity index 88% rename from src/EfCore.Ydb/src/Query/Internal/YdbTypeMappingPostprocessor.cs rename to src/EFCore.Ydb/src/Query/Internal/YdbTypeMappingPostprocessor.cs index 68c4cca9..8c3257fb 100644 --- a/src/EfCore.Ydb/src/Query/Internal/YdbTypeMappingPostprocessor.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbTypeMappingPostprocessor.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Query; -namespace EfCore.Ydb.Query.Internal; +namespace EntityFrameworkCore.Ydb.Query.Internal; public class YdbTypeMappingPostprocessor( QueryTranslationPostprocessorDependencies dependencies, diff --git a/src/EfCore.Ydb/src/Scaffolding/Internal/YdbDatabaseModelFactory.cs b/src/EFCore.Ydb/src/Scaffolding/Internal/YdbDatabaseModelFactory.cs similarity index 98% rename from src/EfCore.Ydb/src/Scaffolding/Internal/YdbDatabaseModelFactory.cs rename to src/EFCore.Ydb/src/Scaffolding/Internal/YdbDatabaseModelFactory.cs index 1c68f1e8..71e6928e 100644 --- a/src/EfCore.Ydb/src/Scaffolding/Internal/YdbDatabaseModelFactory.cs +++ b/src/EFCore.Ydb/src/Scaffolding/Internal/YdbDatabaseModelFactory.cs @@ -7,7 +7,7 @@ using Ydb.Sdk.Ado; using Ydb.Sdk.Ado.Schema; -namespace EfCore.Ydb.Scaffolding.Internal; +namespace EntityFrameworkCore.Ydb.Scaffolding.Internal; public class YdbDatabaseModelFactory : DatabaseModelFactory { diff --git a/src/EfCore.Ydb/src/Storage/Internal/IYdbRelationalConnection.cs b/src/EFCore.Ydb/src/Storage/Internal/IYdbRelationalConnection.cs similarity index 74% rename from src/EfCore.Ydb/src/Storage/Internal/IYdbRelationalConnection.cs rename to src/EFCore.Ydb/src/Storage/Internal/IYdbRelationalConnection.cs index bff58ef6..6ce26e01 100644 --- a/src/EfCore.Ydb/src/Storage/Internal/IYdbRelationalConnection.cs +++ b/src/EFCore.Ydb/src/Storage/Internal/IYdbRelationalConnection.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Storage; -namespace EfCore.Ydb.Storage.Internal; +namespace EntityFrameworkCore.Ydb.Storage.Internal; public interface IYdbRelationalConnection : IRelationalConnection { diff --git a/src/EfCore.Ydb/src/Storage/Internal/Mapping/YdbBoolTypeMapping.cs b/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbBoolTypeMapping.cs similarity index 100% rename from src/EfCore.Ydb/src/Storage/Internal/Mapping/YdbBoolTypeMapping.cs rename to src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbBoolTypeMapping.cs diff --git a/src/EfCore.Ydb/src/Storage/Internal/Mapping/YdbBytesTypeMapping.cs b/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbBytesTypeMapping.cs similarity index 100% rename from src/EfCore.Ydb/src/Storage/Internal/Mapping/YdbBytesTypeMapping.cs rename to src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbBytesTypeMapping.cs diff --git a/src/EfCore.Ydb/src/Storage/Internal/Mapping/YdbDecimalTypeMapping.cs b/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbDecimalTypeMapping.cs similarity index 100% rename from src/EfCore.Ydb/src/Storage/Internal/Mapping/YdbDecimalTypeMapping.cs rename to src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbDecimalTypeMapping.cs diff --git a/src/EfCore.Ydb/src/Storage/Internal/Mapping/YdbJsonTypeMapping.cs b/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbJsonTypeMapping.cs similarity index 100% rename from src/EfCore.Ydb/src/Storage/Internal/Mapping/YdbJsonTypeMapping.cs rename to src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbJsonTypeMapping.cs diff --git a/src/EfCore.Ydb/src/Storage/Internal/Mapping/YdbStringTypeMapping.cs b/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbStringTypeMapping.cs similarity index 100% rename from src/EfCore.Ydb/src/Storage/Internal/Mapping/YdbStringTypeMapping.cs rename to src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbStringTypeMapping.cs diff --git a/src/EfCore.Ydb/src/Storage/Internal/YdbDatabaseCreator.cs b/src/EFCore.Ydb/src/Storage/Internal/YdbDatabaseCreator.cs similarity index 98% rename from src/EfCore.Ydb/src/Storage/Internal/YdbDatabaseCreator.cs rename to src/EFCore.Ydb/src/Storage/Internal/YdbDatabaseCreator.cs index 10e89ab3..28012d85 100644 --- a/src/EfCore.Ydb/src/Storage/Internal/YdbDatabaseCreator.cs +++ b/src/EFCore.Ydb/src/Storage/Internal/YdbDatabaseCreator.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Logging; using Ydb.Sdk.Ado; -namespace EfCore.Ydb.Storage.Internal; +namespace EntityFrameworkCore.Ydb.Storage.Internal; public class YdbDatabaseCreator(RelationalDatabaseCreatorDependencies dependencies) : RelationalDatabaseCreator(dependencies) diff --git a/src/EfCore.Ydb/src/Storage/Internal/YdbRelationalConnection.cs b/src/EFCore.Ydb/src/Storage/Internal/YdbRelationalConnection.cs similarity index 91% rename from src/EfCore.Ydb/src/Storage/Internal/YdbRelationalConnection.cs rename to src/EFCore.Ydb/src/Storage/Internal/YdbRelationalConnection.cs index 186645e9..3d5a023b 100644 --- a/src/EfCore.Ydb/src/Storage/Internal/YdbRelationalConnection.cs +++ b/src/EFCore.Ydb/src/Storage/Internal/YdbRelationalConnection.cs @@ -1,13 +1,13 @@ using System.Data.Common; using System.Security.Cryptography.X509Certificates; -using EfCore.Ydb.Extensions; -using EfCore.Ydb.Infrastructure.Internal; +using EntityFrameworkCore.Ydb.Extensions; +using EntityFrameworkCore.Ydb.Infrastructure.Internal; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Storage; using Ydb.Sdk.Ado; using Ydb.Sdk.Auth; -namespace EfCore.Ydb.Storage.Internal; +namespace EntityFrameworkCore.Ydb.Storage.Internal; public class YdbRelationalConnection : RelationalConnection, IYdbRelationalConnection { diff --git a/src/EfCore.Ydb/src/Storage/Internal/YdbRelationalTransaction.cs b/src/EFCore.Ydb/src/Storage/Internal/YdbRelationalTransaction.cs similarity index 96% rename from src/EfCore.Ydb/src/Storage/Internal/YdbRelationalTransaction.cs rename to src/EFCore.Ydb/src/Storage/Internal/YdbRelationalTransaction.cs index 0aad1f20..36343245 100644 --- a/src/EfCore.Ydb/src/Storage/Internal/YdbRelationalTransaction.cs +++ b/src/EFCore.Ydb/src/Storage/Internal/YdbRelationalTransaction.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.Storage; -namespace EfCore.Ydb.Storage.Internal; +namespace EntityFrameworkCore.Ydb.Storage.Internal; public class YdbRelationalTransaction( IRelationalConnection connection, diff --git a/src/EfCore.Ydb/src/Storage/Internal/YdbRelationalTransactionFactory.cs b/src/EFCore.Ydb/src/Storage/Internal/YdbRelationalTransactionFactory.cs similarity index 94% rename from src/EfCore.Ydb/src/Storage/Internal/YdbRelationalTransactionFactory.cs rename to src/EFCore.Ydb/src/Storage/Internal/YdbRelationalTransactionFactory.cs index 90b5ecd3..3d239717 100644 --- a/src/EfCore.Ydb/src/Storage/Internal/YdbRelationalTransactionFactory.cs +++ b/src/EFCore.Ydb/src/Storage/Internal/YdbRelationalTransactionFactory.cs @@ -1,5 +1,6 @@ using System; using System.Data.Common; +using EntityFrameworkCore.Ydb.Storage.Internal; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.Storage; diff --git a/src/EfCore.Ydb/src/Storage/Internal/YdbSqlGenerationHelper.cs b/src/EFCore.Ydb/src/Storage/Internal/YdbSqlGenerationHelper.cs similarity index 95% rename from src/EfCore.Ydb/src/Storage/Internal/YdbSqlGenerationHelper.cs rename to src/EFCore.Ydb/src/Storage/Internal/YdbSqlGenerationHelper.cs index 7282a2f9..59c04d92 100644 --- a/src/EfCore.Ydb/src/Storage/Internal/YdbSqlGenerationHelper.cs +++ b/src/EFCore.Ydb/src/Storage/Internal/YdbSqlGenerationHelper.cs @@ -1,7 +1,7 @@ using System.Text; using Microsoft.EntityFrameworkCore.Storage; -namespace EfCore.Ydb.Storage.Internal; +namespace EntityFrameworkCore.Ydb.Storage.Internal; public class YdbSqlGenerationHelper(RelationalSqlGenerationHelperDependencies dependencies) : RelationalSqlGenerationHelper(dependencies) diff --git a/src/EfCore.Ydb/src/Storage/Internal/YdbTypeMappingSource.cs b/src/EFCore.Ydb/src/Storage/Internal/YdbTypeMappingSource.cs similarity index 98% rename from src/EfCore.Ydb/src/Storage/Internal/YdbTypeMappingSource.cs rename to src/EFCore.Ydb/src/Storage/Internal/YdbTypeMappingSource.cs index cb8575cd..9388a6d3 100644 --- a/src/EfCore.Ydb/src/Storage/Internal/YdbTypeMappingSource.cs +++ b/src/EFCore.Ydb/src/Storage/Internal/YdbTypeMappingSource.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Storage; using Type = System.Type; -namespace EfCore.Ydb.Storage.Internal; +namespace EntityFrameworkCore.Ydb.Storage.Internal; public sealed class YdbTypeMappingSource( TypeMappingSourceDependencies dependencies, diff --git a/src/EfCore.Ydb/src/Update/Internal/YdbModificationCommand.cs b/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommand.cs similarity index 100% rename from src/EfCore.Ydb/src/Update/Internal/YdbModificationCommand.cs rename to src/EFCore.Ydb/src/Update/Internal/YdbModificationCommand.cs diff --git a/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatch.cs b/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatch.cs new file mode 100644 index 00000000..c563282d --- /dev/null +++ b/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatch.cs @@ -0,0 +1,8 @@ +using Microsoft.EntityFrameworkCore.Update; + +namespace EfCore.Ydb.Update.Internal; + +public class YdbModificationCommandBatch( + ModificationCommandBatchFactoryDependencies dependencies, + int? maxBatchSize = null +) : AffectedCountModificationCommandBatch(dependencies, maxBatchSize); diff --git a/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatchFactory.cs b/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatchFactory.cs new file mode 100644 index 00000000..812f6ffb --- /dev/null +++ b/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatchFactory.cs @@ -0,0 +1,11 @@ +using Microsoft.EntityFrameworkCore.Update; + +namespace EfCore.Ydb.Update.Internal; + +public sealed class YdbModificationCommandBatchFactory(ModificationCommandBatchFactoryDependencies dependencies) + : IModificationCommandBatchFactory +{ + private ModificationCommandBatchFactoryDependencies Dependencies { get; } = dependencies; + + public ModificationCommandBatch Create() => new YdbModificationCommandBatch(Dependencies); +} diff --git a/src/EfCore.Ydb/src/Update/Internal/YdbModificationCommandFactory.cs b/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandFactory.cs similarity index 100% rename from src/EfCore.Ydb/src/Update/Internal/YdbModificationCommandFactory.cs rename to src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandFactory.cs diff --git a/src/EfCore.Ydb/src/Update/Internal/YdbUpdateSqlGenerator.cs b/src/EFCore.Ydb/src/Update/Internal/YdbUpdateSqlGenerator.cs similarity index 88% rename from src/EfCore.Ydb/src/Update/Internal/YdbUpdateSqlGenerator.cs rename to src/EFCore.Ydb/src/Update/Internal/YdbUpdateSqlGenerator.cs index c7a9b80b..1caec952 100644 --- a/src/EfCore.Ydb/src/Update/Internal/YdbUpdateSqlGenerator.cs +++ b/src/EFCore.Ydb/src/Update/Internal/YdbUpdateSqlGenerator.cs @@ -9,7 +9,9 @@ namespace EfCore.Ydb.Update.Internal; public class YdbUpdateSqlGenerator(UpdateSqlGeneratorDependencies dependencies) : UpdateSqlGenerator(dependencies) { public override ResultSetMapping AppendInsertReturningOperation( - StringBuilder commandStringBuilder, IReadOnlyModificationCommand command, int commandPosition, + StringBuilder commandStringBuilder, + IReadOnlyModificationCommand command, + int commandPosition, out bool requiresTransaction ) { @@ -73,13 +75,7 @@ out bool requiresTransaction requiresTransaction = false; - AppendDeleteCommand( - commandStringBuilder, - name, - schema, - [], - conditionOperations - ); + AppendDeleteCommand(commandStringBuilder, name, schema, [], conditionOperations); return ResultSetMapping.NoResults; } @@ -133,7 +129,7 @@ protected override void AppendDeleteCommand( public override ResultSetMapping AppendStoredProcedureCall( StringBuilder commandStringBuilder, IReadOnlyModificationCommand command, int commandPosition, out bool requiresTransaction - ) => throw new InvalidOperationException("Stored procedure calls are not supported in YDB"); + ) => throw new NotSupportedException("Stored procedure calls are not supported in YDB"); protected override void AppendReturningClause( StringBuilder commandStringBuilder, @@ -153,16 +149,16 @@ protected override void AppendReturningClause( } public override string GenerateNextSequenceValueOperation(string name, string? schema) - => throw new InvalidOperationException("Iterating over serial is not supported in YDB"); + => throw new NotSupportedException("Iterating over serial is not supported in YDB"); public override void AppendNextSequenceValueOperation( StringBuilder commandStringBuilder, string name, string? schema - ) => throw new InvalidOperationException("Iterating over serial is not supported in YDB"); + ) => throw new NotSupportedException("Iterating over serial is not supported in YDB"); public override string GenerateObtainNextSequenceValueOperation(string name, string? schema) - => throw new InvalidOperationException("Iterating over serial is not supported in YDB"); + => throw new NotSupportedException("Iterating over serial is not supported in YDB"); public override void AppendObtainNextSequenceValueOperation( StringBuilder commandStringBuilder, string name, string? schema - ) => throw new InvalidOperationException("Iterating over serial is not supported in YDB"); + ) => throw new NotSupportedException("Iterating over serial is not supported in YDB"); } diff --git a/src/EfCore.Ydb/src/Utilities/ArrayUtil.cs b/src/EFCore.Ydb/src/Utilities/ArrayUtil.cs similarity index 100% rename from src/EfCore.Ydb/src/Utilities/ArrayUtil.cs rename to src/EFCore.Ydb/src/Utilities/ArrayUtil.cs diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/ComplexTypeBulkUpdatesYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/ComplexTypeBulkUpdatesYdbTest.cs similarity index 99% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/ComplexTypeBulkUpdatesYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/ComplexTypeBulkUpdatesYdbTest.cs index 25f3ba8d..ca59b2b9 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/ComplexTypeBulkUpdatesYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/ComplexTypeBulkUpdatesYdbTest.cs @@ -1,10 +1,10 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.BulkUpdates; using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit; using Xunit.Abstractions; -namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates; #pragma warning disable xUnit1000 internal class ComplexTypeBulkUpdatesYdbTest( diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NonSharedModelBulkUpdatesYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NonSharedModelBulkUpdatesYdbTest.cs similarity index 70% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NonSharedModelBulkUpdatesYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NonSharedModelBulkUpdatesYdbTest.cs index 2bf38b96..25d37a79 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NonSharedModelBulkUpdatesYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NonSharedModelBulkUpdatesYdbTest.cs @@ -1,8 +1,8 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.BulkUpdates; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates; // TODO: need fix internal class NonSharedModelBulkUpdatesYdbTest : NonSharedModelBulkUpdatesRelationalTestBase diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NorthwindBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NorthwindBulkUpdatesYdbFixture.cs similarity index 76% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NorthwindBulkUpdatesYdbFixture.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NorthwindBulkUpdatesYdbFixture.cs index 0cfc9b8f..704a0c57 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NorthwindBulkUpdatesYdbFixture.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NorthwindBulkUpdatesYdbFixture.cs @@ -1,9 +1,9 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.BulkUpdates; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates; internal class NorthwindBulkUpdatesYdbFixture : NorthwindBulkUpdatesRelationalFixture diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NorthwindBulkUpdatesYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NorthwindBulkUpdatesYdbTest.cs similarity index 85% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NorthwindBulkUpdatesYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NorthwindBulkUpdatesYdbTest.cs index 9b2825d1..2503ffe1 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NorthwindBulkUpdatesYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/NorthwindBulkUpdatesYdbTest.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit.Abstractions; -namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates; // TODO: Await Norhhwind internal class NorthwindBulkUpdatesYdbTest( diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbFixture.cs new file mode 100644 index 00000000..6872356f --- /dev/null +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbFixture.cs @@ -0,0 +1,6 @@ +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates; + +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/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbTest.cs similarity index 96% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbTest.cs index 9798c37d..3534c6f9 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbTest.cs @@ -1,16 +1,16 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.BulkUpdates; using Xunit; using Xunit.Abstractions; -namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates; #pragma warning disable xUnit1000 internal class TpcFiltersInheritanceBulkUpdatesYdbTest( #pragma warning restore xUnit1000 - TPCFiltersInheritanceBulkUpdatesYdbFixture fixture, + TpcFiltersInheritanceBulkUpdatesYdbFixture fixture, ITestOutputHelper testOutputHelper -) : TPCFiltersInheritanceBulkUpdatesTestBase(fixture, testOutputHelper) +) : TPCFiltersInheritanceBulkUpdatesTestBase(fixture, testOutputHelper) { public override Task Delete_where_keyless_entity_mapped_to_sql_query(bool async) => SharedTestMethods.TestIgnoringBase( diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbFixture.cs similarity index 57% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbFixture.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbFixture.cs index cbfa10a6..edf5fa2e 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbFixture.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbFixture.cs @@ -1,10 +1,10 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.BulkUpdates; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates; -internal 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/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbTest.cs similarity index 96% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbTest.cs index 1dc57022..ad22919e 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbTest.cs @@ -1,16 +1,16 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.BulkUpdates; using Xunit; using Xunit.Abstractions; -namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates; #pragma warning disable xUnit1000 internal class TpcInheritanceBulkUpdatesYdbTest( #pragma warning restore xUnit1000 - TPCInheritanceBulkUpdatesYdbFixture fixture, + TpcInheritanceBulkUpdatesYdbFixture fixture, ITestOutputHelper testOutputHelper -) : TPCInheritanceBulkUpdatesTestBase(fixture, testOutputHelper) +) : TPCInheritanceBulkUpdatesTestBase(fixture, testOutputHelper) { public override Task Delete_where_keyless_entity_mapped_to_sql_query(bool async) => SharedTestMethods.TestIgnoringBase( diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbFixture.cs similarity index 67% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbFixture.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbFixture.cs index 43f9009e..e614d9d9 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbFixture.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbFixture.cs @@ -1,4 +1,4 @@ -namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates; internal class TphFiltersInheritanceBulkUpdatesYdbFixture : TPHInheritanceBulkUpdatesYdbFixture { diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbTest.cs similarity index 97% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbTest.cs index cb6e5122..7a652078 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbTest.cs @@ -1,8 +1,8 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.BulkUpdates; using Xunit.Abstractions; -namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates; // TODO: following error // Error: Primary key is required for ydb tables. diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbFixture.cs similarity index 68% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbFixture.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbFixture.cs index 53bdb0ea..052f3161 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbFixture.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbFixture.cs @@ -1,8 +1,8 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.BulkUpdates; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates; internal class TPHInheritanceBulkUpdatesYdbFixture : TPHInheritanceBulkUpdatesFixture { diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbTest.cs similarity index 83% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbTest.cs index e825b8ab..01938a23 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbTest.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore.BulkUpdates; using Xunit.Abstractions; -namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates; // TODO: Primary key required for ydb tables internal class TPHInheritanceBulkUpdatesYdbTest( diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbFixture.cs similarity index 68% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbFixture.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbFixture.cs index 9e8fc8c8..9c349b22 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbFixture.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbFixture.cs @@ -1,4 +1,4 @@ -namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates; internal class TPTFiltersInheritanceBulkUpdatesYdbFixture : TPTInheritanceBulkUpdatesYdbFixture { diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbTest.cs similarity index 96% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbTest.cs index 22c08ef9..e60eb985 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbTest.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore.BulkUpdates; using Xunit.Abstractions; -namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates; // TODO: Refactor later #pragma warning disable xUnit1000 diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbFixture.cs similarity index 68% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbFixture.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbFixture.cs index 14c1ca35..5ac5416c 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbFixture.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbFixture.cs @@ -1,8 +1,8 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.BulkUpdates; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates; internal class TPTInheritanceBulkUpdatesYdbFixture : TPTInheritanceBulkUpdatesFixture { diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbTest.cs similarity index 83% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbTest.cs index 6f28cfc0..e07e314b 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbTest.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore.BulkUpdates; using Xunit.Abstractions; -namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates; // TODO: Key columns are not specified :c internal class TPTInheritanceBulkUpdatesYdbTest( diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/EntitySplittingYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/EntitySplittingYdbTest.cs similarity index 73% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/EntitySplittingYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/EntitySplittingYdbTest.cs index d48378d9..a287ab88 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/EntitySplittingYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/EntitySplittingYdbTest.cs @@ -1,9 +1,9 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit.Abstractions; -namespace EfCore.Ydb.FunctionalTests.AllTests; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests; public class EntitySplittingYdbTest(ITestOutputHelper testOutputHelper) : EntitySplittingTestBase(testOutputHelper) { diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/ModelBuilding101YdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/ModelBuilding101YdbTest.cs similarity index 87% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/ModelBuilding101YdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/ModelBuilding101YdbTest.cs index e642d7fc..6d0c6391 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/ModelBuilding101YdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/ModelBuilding101YdbTest.cs @@ -1,4 +1,4 @@ -using EfCore.Ydb.Extensions; +using EntityFrameworkCore.Ydb.Extensions; using Microsoft.EntityFrameworkCore; namespace EfCore.Ydb.FunctionalTests.AllTests; diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/NotificationEntitiesYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/NotificationEntitiesYdbTest.cs similarity index 82% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/NotificationEntitiesYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/NotificationEntitiesYdbTest.cs index 4f49fa04..c99eb1d8 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/NotificationEntitiesYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/NotificationEntitiesYdbTest.cs @@ -1,8 +1,8 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.AllTests; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests; public class NotificationEntitiesYdbTest(NotificationEntitiesYdbTest.NotificationEntitiesYdbFixture fixture) : NotificationEntitiesTestBase(fixture) diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/OverzealousInitializationYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/OverzealousInitializationYdbTest.cs similarity index 82% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/OverzealousInitializationYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/OverzealousInitializationYdbTest.cs index b69a589b..e0f6a1b6 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/OverzealousInitializationYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/OverzealousInitializationYdbTest.cs @@ -1,8 +1,8 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.AllTests; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests; public class OverzealousInitializationYdbTest( OverzealousInitializationYdbTest.OverzealousInitializationYdbFixture fixture diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/PropertyValuesYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/PropertyValuesYdbTest.cs similarity index 91% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/PropertyValuesYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/PropertyValuesYdbTest.cs index a436a40c..a724491b 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/PropertyValuesYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/PropertyValuesYdbTest.cs @@ -1,8 +1,8 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.AllTests; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests; public class PropertyValuesYdbTest(PropertyValuesYdbTest.PropertyValuesYdbFixture fixture) : PropertyValuesTestBase(fixture) diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/AdHocAdvancedMappingsQueryYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/AdHocAdvancedMappingsQueryYdbTest.cs similarity index 91% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/AdHocAdvancedMappingsQueryYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/AdHocAdvancedMappingsQueryYdbTest.cs index 3422a9bf..66efceda 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/AdHocAdvancedMappingsQueryYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/AdHocAdvancedMappingsQueryYdbTest.cs @@ -1,8 +1,8 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.AllTests.Query; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.Query; // TODO: Fix tests // Right now success rate is ~30/45 diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/AdHocComplexTypeQueryYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/AdHocComplexTypeQueryYdbTest.cs similarity index 68% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/AdHocComplexTypeQueryYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/AdHocComplexTypeQueryYdbTest.cs index 90104707..319a3a82 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/AdHocComplexTypeQueryYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/AdHocComplexTypeQueryYdbTest.cs @@ -1,8 +1,8 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.AllTests.Query; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.Query; public class AdHocComplexTypeQueryYdbTest : AdHocComplexTypeQueryTestBase { diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/AdHocNavigationsQueryYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/AdHocNavigationsQueryYdbTest.cs similarity index 94% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/AdHocNavigationsQueryYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/AdHocNavigationsQueryYdbTest.cs index 07d2bf16..73ad6331 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/AdHocNavigationsQueryYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/AdHocNavigationsQueryYdbTest.cs @@ -1,8 +1,8 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.AllTests.Query; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.Query; public class AdHocNavigationsQueryYdbTest : AdHocNavigationsQueryRelationalTestBase { diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/AdHocQueryFiltersQueryYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/AdHocQueryFiltersQueryYdbTest.cs similarity index 84% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/AdHocQueryFiltersQueryYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/AdHocQueryFiltersQueryYdbTest.cs index 360f5671..d385d62f 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/AdHocQueryFiltersQueryYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/AdHocQueryFiltersQueryYdbTest.cs @@ -1,8 +1,8 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.AllTests.Query; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.Query; public class AdHocQueryFiltersQueryYdbTest : AdHocQueryFiltersQueryRelationalTestBase { diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/EntitySplittingQueryYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/EntitySplittingQueryYdbTest.cs similarity index 96% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/EntitySplittingQueryYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/EntitySplittingQueryYdbTest.cs index 28c20d19..0f762d7c 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/EntitySplittingQueryYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/EntitySplittingQueryYdbTest.cs @@ -1,8 +1,8 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.AllTests.Query; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.Query; // TODO: Fix tests // Right now success rate is ~70/114 diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/FieldsOnlyLoadYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/FieldsOnlyLoadYdbTest.cs similarity index 79% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/FieldsOnlyLoadYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/FieldsOnlyLoadYdbTest.cs index 90c0fd9e..045361e9 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/FieldsOnlyLoadYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/FieldsOnlyLoadYdbTest.cs @@ -1,8 +1,8 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.AllTests.Query; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.Query; public abstract class FieldsOnlyLoadYdbTest(FieldsOnlyLoadYdbTest.FieldsOnlyLoadYdbFixture fixture) : FieldsOnlyLoadTestBase(fixture) diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/IncludeOneToOneYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/IncludeOneToOneYdbTest.cs similarity index 87% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/IncludeOneToOneYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/IncludeOneToOneYdbTest.cs index 6d38fc10..20461857 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/IncludeOneToOneYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/IncludeOneToOneYdbTest.cs @@ -1,11 +1,11 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Xunit.Abstractions; -namespace EfCore.Ydb.FunctionalTests.AllTests.Query; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.Query; public class IncludeOneToOneYdbTest : IncludeOneToOneTestBase { diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/NorthwindAggregateOperatorsQueryYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/NorthwindAggregateOperatorsQueryYdbTest.cs similarity index 99% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/NorthwindAggregateOperatorsQueryYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/NorthwindAggregateOperatorsQueryYdbTest.cs index 0b1fbfb0..3d404317 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/NorthwindAggregateOperatorsQueryYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/NorthwindAggregateOperatorsQueryYdbTest.cs @@ -1,8 +1,8 @@ -using EfCore.Ydb.FunctionalTests.Query; +using EntityFrameworkCore.Ydb.FunctionalTests.Query; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.AllTests.Query; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.Query; // TODO: Fix tests // Right now success rate is ~160/422 diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/NorthwindCompiledQueryYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/NorthwindCompiledQueryYdbTest.cs similarity index 91% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/NorthwindCompiledQueryYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/NorthwindCompiledQueryYdbTest.cs index 43d5030b..8dc1fc56 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/NorthwindCompiledQueryYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/NorthwindCompiledQueryYdbTest.cs @@ -1,9 +1,9 @@ -using EfCore.Ydb.FunctionalTests.Query; +using EntityFrameworkCore.Ydb.FunctionalTests.Query; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit.Abstractions; -namespace EfCore.Ydb.FunctionalTests.AllTests.Query; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.Query; // TODO: Fix tests public class NorthwindCompiledQueryYdbTest diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/NorthwindGroupByQueryYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/NorthwindGroupByQueryYdbTest.cs similarity index 99% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/NorthwindGroupByQueryYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/NorthwindGroupByQueryYdbTest.cs index 88d8fcc9..74dbef44 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/NorthwindGroupByQueryYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/NorthwindGroupByQueryYdbTest.cs @@ -1,8 +1,8 @@ -using EfCore.Ydb.FunctionalTests.Query; +using EntityFrameworkCore.Ydb.FunctionalTests.Query; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.AllTests.Query; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.Query; // TODO: Fix tests // Right now success rate is ~260/520 diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/NullKeysYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/NullKeysYdbTest.cs similarity index 89% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/NullKeysYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/NullKeysYdbTest.cs index f9f33f6f..23d5300c 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Query/NullKeysYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/NullKeysYdbTest.cs @@ -1,4 +1,4 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Update/UpdatesYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Update/UpdatesYdbTest.cs similarity index 88% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Update/UpdatesYdbTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Update/UpdatesYdbTest.cs index e2676a14..f264970c 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/Update/UpdatesYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Update/UpdatesYdbTest.cs @@ -1,10 +1,10 @@ using System.Text; -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.TestUtilities; using Microsoft.EntityFrameworkCore.Update; using Xunit; -namespace EfCore.Ydb.FunctionalTests.AllTests.Update; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.Update; // Tests: // Ignore_before_save_property_is_still_generated_graph, @@ -36,11 +36,15 @@ public override Task SaveChanges_throws_for_entities_only_mapped_to_view() => TestIgnoringBase(base.SaveChanges_throws_for_entities_only_mapped_to_view); [Fact(Skip = "There's no foreign keys in ydb")] +#pragma warning disable xUnit1028 public override Task Save_with_shared_foreign_key() +#pragma warning restore xUnit1028 => TestIgnoringBase(base.Save_with_shared_foreign_key); [Fact(Skip = "Need fix")] +#pragma warning disable xUnit1028 public override Task Can_use_shared_columns_with_conversion() +#pragma warning restore xUnit1028 => TestIgnoringBase(base.Can_use_shared_columns_with_conversion); public override Task Swap_filtered_unique_index_values() @@ -75,17 +79,23 @@ public override Task Save_partial_update() base.Save_partial_update); [Fact(Skip = "TODO: need fix")] +#pragma warning disable xUnit1028 public override Task Save_partial_update_on_missing_record_throws() +#pragma warning restore xUnit1028 => TestIgnoringBase( base.Save_partial_update_on_missing_record_throws); [Fact(Skip = "TODO: need fix")] +#pragma warning disable xUnit1028 public override Task Save_partial_update_on_concurrency_token_original_value_mismatch_throws() +#pragma warning restore xUnit1028 => TestIgnoringBase( base.Save_partial_update_on_concurrency_token_original_value_mismatch_throws); [Fact(Skip = "TODO: need fix")] +#pragma warning disable xUnit1028 public override Task Update_on_bytes_concurrency_token_original_value_mismatch_throws() +#pragma warning restore xUnit1028 => TestIgnoringBase( base.Update_on_bytes_concurrency_token_original_value_mismatch_throws); @@ -94,7 +104,9 @@ public override Task Update_on_bytes_concurrency_token_original_value_matches_do base.Update_on_bytes_concurrency_token_original_value_matches_does_not_throw); [Fact(Skip = "TODO: need fix")] +#pragma warning disable xUnit1028 public override Task Remove_on_bytes_concurrency_token_original_value_mismatch_throws() +#pragma warning restore xUnit1028 => TestIgnoringBase( base.Remove_on_bytes_concurrency_token_original_value_mismatch_throws); @@ -103,12 +115,16 @@ public override Task Remove_on_bytes_concurrency_token_original_value_matches_do base.Remove_on_bytes_concurrency_token_original_value_matches_does_not_throw); [Fact(Skip = "TODO: need fix")] +#pragma warning disable xUnit1028 public override Task Can_add_and_remove_self_refs() +#pragma warning restore xUnit1028 => TestIgnoringBase( base.Can_add_and_remove_self_refs); [Fact(Skip = "TODO: need fix")] +#pragma warning disable xUnit1028 public override Task Can_change_enums_with_conversion() +#pragma warning restore xUnit1028 => TestIgnoringBase( base.Can_change_enums_with_conversion); @@ -117,12 +133,16 @@ public override Task Can_remove_partial() base.Can_remove_partial); [Fact(Skip = "TODO: need fix")] +#pragma warning disable xUnit1028 public override Task Remove_partial_on_missing_record_throws() +#pragma warning restore xUnit1028 => TestIgnoringBase( base.Remove_partial_on_missing_record_throws); [Fact(Skip = "TODO: need fix")] +#pragma warning disable xUnit1028 public override Task Remove_partial_on_concurrency_token_original_value_mismatch_throws() +#pragma warning restore xUnit1028 => TestIgnoringBase( base.Remove_partial_on_concurrency_token_original_value_mismatch_throws); diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/YdbServiceCollectionExtensionsTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/YdbServiceCollectionExtensionsTest.cs similarity index 57% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/YdbServiceCollectionExtensionsTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/YdbServiceCollectionExtensionsTest.cs index e28a4f57..45c54558 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/YdbServiceCollectionExtensionsTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/YdbServiceCollectionExtensionsTest.cs @@ -1,7 +1,7 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; -namespace EfCore.Ydb.FunctionalTests.AllTests; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests; public class YdbServiceCollectionExtensionsTest() : RelationalServiceCollectionExtensionsTestBase(YdbTestHelpers.Instance); diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/EfCore.Ydb.FunctionalTests.csproj b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/EntityFrameworkCore.Ydb.FunctionalTests.csproj similarity index 93% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/EfCore.Ydb.FunctionalTests.csproj rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/EntityFrameworkCore.Ydb.FunctionalTests.csproj index 4d693592..8bc7ab08 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/EfCore.Ydb.FunctionalTests.csproj +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/EntityFrameworkCore.Ydb.FunctionalTests.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/Migrations/YdbMigrationsInfrastructureTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Migrations/YdbMigrationsInfrastructureTest.cs similarity index 95% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/Migrations/YdbMigrationsInfrastructureTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Migrations/YdbMigrationsInfrastructureTest.cs index 0de0e79a..5a2819ea 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/Migrations/YdbMigrationsInfrastructureTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Migrations/YdbMigrationsInfrastructureTest.cs @@ -1,10 +1,10 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit; -namespace EfCore.Ydb.FunctionalTests.Migrations; +namespace EntityFrameworkCore.Ydb.FunctionalTests.Migrations; public class YdbMigrationsInfrastructureTest(YdbMigrationsInfrastructureTest.YdbMigrationsInfrastructureFixture fixture) : MigrationsInfrastructureTestBase(fixture) @@ -95,7 +95,7 @@ public override void Can_get_active_provider() { base.Can_get_active_provider(); - Assert.Equal("EfCore.Ydb", ActiveProvider); + Assert.Equal("EntityFrameworkCore.Ydb", ActiveProvider); } protected override Task ExecuteSqlAsync(string value) => diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/Migrations/YdbMigrationsSqlGeneratorTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Migrations/YdbMigrationsSqlGeneratorTest.cs similarity index 98% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/Migrations/YdbMigrationsSqlGeneratorTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Migrations/YdbMigrationsSqlGeneratorTest.cs index b440e70c..d13b2777 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/Migrations/YdbMigrationsSqlGeneratorTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Migrations/YdbMigrationsSqlGeneratorTest.cs @@ -1,10 +1,10 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations.Operations; using Xunit; -namespace EfCore.Ydb.FunctionalTests.Migrations; +namespace EntityFrameworkCore.Ydb.FunctionalTests.Migrations; public class YdbMigrationsSqlGeneratorTest() : MigrationsSqlGeneratorTestBase(YdbTestHelpers.Instance) { diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/Migrations/YdbMigrationsTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Migrations/YdbMigrationsTest.cs similarity index 99% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/Migrations/YdbMigrationsTest.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Migrations/YdbMigrationsTest.cs index eb5bf200..927604ba 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/Migrations/YdbMigrationsTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Migrations/YdbMigrationsTest.cs @@ -1,5 +1,5 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; -using EfCore.Ydb.Scaffolding.Internal; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.Scaffolding.Internal; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Scaffolding; @@ -9,7 +9,7 @@ using Xunit.Abstractions; using Ydb.Sdk.Ado; -namespace EfCore.Ydb.FunctionalTests.Migrations; +namespace EntityFrameworkCore.Ydb.FunctionalTests.Migrations; public class YdbMigrationsTest : MigrationsTestBase { @@ -121,7 +121,6 @@ public override Task Add_column_with_defaultValue_string() => public override Task Add_column_with_defaultValue_datetime() => Assert.ThrowsAsync(() => base.Add_column_with_defaultValue_datetime()); - [Fact] public override Task Add_column_with_defaultValueSql() => Assert.ThrowsAsync(() => base.Add_column_with_defaultValueSql()); @@ -181,11 +180,9 @@ public override Task Alter_column_change_type() => public override async Task Alter_column_make_required() => await Assert.ThrowsAsync(() => base.Alter_column_make_required()); - [Fact] public override Task Alter_column_set_collation() => Assert.ThrowsAsync(() => base.Alter_column_set_collation()); - [Fact] public override Task Alter_column_reset_collation() => Assert.ThrowsAsync(() => base.Alter_column_reset_collation()); diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/Northwind.sql b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Northwind.sql similarity index 100% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/Northwind.sql rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Northwind.sql diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/Query/NorthwindQueryYdbFixtures.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Query/NorthwindQueryYdbFixtures.cs similarity index 82% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/Query/NorthwindQueryYdbFixtures.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Query/NorthwindQueryYdbFixtures.cs index 0dd12517..ed34bec4 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/Query/NorthwindQueryYdbFixtures.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Query/NorthwindQueryYdbFixtures.cs @@ -1,10 +1,10 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestModels.Northwind; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.Query; +namespace EntityFrameworkCore.Ydb.FunctionalTests.Query; public class NorthwindQueryYdbFixture : NorthwindQueryRelationalFixture where TModelCustomizer : ITestModelCustomizer, new() diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestModels/Northwind/NorthwindYdbContext.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestModels/Northwind/NorthwindYdbContext.cs similarity index 73% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestModels/Northwind/NorthwindYdbContext.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestModels/Northwind/NorthwindYdbContext.cs index a33ccae4..3fcf89be 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestModels/Northwind/NorthwindYdbContext.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestModels/Northwind/NorthwindYdbContext.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestModels.Northwind; -namespace EfCore.Ydb.FunctionalTests.TestModels.Northwind; +namespace EntityFrameworkCore.Ydb.FunctionalTests.TestModels.Northwind; internal class NorthwindYdbContext(DbContextOptions options) : NorthwindRelationalContext(options); diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestUtilities/SharedTestMethods.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/SharedTestMethods.cs similarity index 93% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestUtilities/SharedTestMethods.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/SharedTestMethods.cs index 6ad242f3..19eaf39b 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestUtilities/SharedTestMethods.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/SharedTestMethods.cs @@ -2,7 +2,7 @@ using Xunit; using Xunit.Sdk; -namespace EfCore.Ydb.FunctionalTests.TestUtilities; +namespace EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; internal static class SharedTestMethods { diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestUtilities/YdbNorthwindTestStoreFactory.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/YdbNorthwindTestStoreFactory.cs similarity index 89% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestUtilities/YdbNorthwindTestStoreFactory.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/YdbNorthwindTestStoreFactory.cs index 1307cf2e..a280bc66 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestUtilities/YdbNorthwindTestStoreFactory.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/YdbNorthwindTestStoreFactory.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.TestUtilities; +namespace EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; internal class YdbNorthwindTestStoreFactory : YdbTestStoreFactory { diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestUtilities/YdbTestHelpers.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/YdbTestHelpers.cs similarity index 83% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestUtilities/YdbTestHelpers.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/YdbTestHelpers.cs index 5f52e084..57e4a098 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestUtilities/YdbTestHelpers.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/YdbTestHelpers.cs @@ -1,9 +1,9 @@ -using EfCore.Ydb.Extensions; +using EntityFrameworkCore.Ydb.Extensions; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestUtilities; using Microsoft.Extensions.DependencyInjection; -namespace EfCore.Ydb.FunctionalTests.TestUtilities; +namespace EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; public class YdbTestHelpers : RelationalTestHelpers { diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestUtilities/YdbTestStore.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/YdbTestStore.cs similarity index 98% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestUtilities/YdbTestStore.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/YdbTestStore.cs index 9976b9a7..0b8ceb4a 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestUtilities/YdbTestStore.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/YdbTestStore.cs @@ -1,12 +1,12 @@ using System.Data; using System.Data.Common; using System.Text.RegularExpressions; -using EfCore.Ydb.Extensions; +using EntityFrameworkCore.Ydb.Extensions; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestUtilities; using Ydb.Sdk.Ado; -namespace EfCore.Ydb.FunctionalTests.TestUtilities; +namespace EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; public class YdbTestStore( string name, diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestUtilities/YdbTestStoreFactory.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/YdbTestStoreFactory.cs similarity index 87% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestUtilities/YdbTestStoreFactory.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/YdbTestStoreFactory.cs index 734d48cb..08d6abd1 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestUtilities/YdbTestStoreFactory.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/YdbTestStoreFactory.cs @@ -1,8 +1,8 @@ -using EfCore.Ydb.Extensions; +using EntityFrameworkCore.Ydb.Extensions; using Microsoft.EntityFrameworkCore.TestUtilities; using Microsoft.Extensions.DependencyInjection; -namespace EfCore.Ydb.FunctionalTests.TestUtilities; +namespace EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; public class YdbTestStoreFactory(string? additionalSql = null) : RelationalTestStoreFactory { diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/YdbFixture.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/YdbFixture.cs similarity index 89% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/YdbFixture.cs rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/YdbFixture.cs index 85587c18..0015ce5b 100644 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/YdbFixture.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/YdbFixture.cs @@ -1,4 +1,4 @@ -using EfCore.Ydb.FunctionalTests.TestUtilities; +using EntityFrameworkCore.Ydb.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestUtilities; using Microsoft.Extensions.DependencyInjection; diff --git a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/xunit.runner.json b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/xunit.runner.json similarity index 100% rename from src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/xunit.runner.json rename to src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/xunit.runner.json diff --git a/src/EfCore.Ydb/src/Update/Internal/YdbModificationCommandBatchFactory.cs b/src/EfCore.Ydb/src/Update/Internal/YdbModificationCommandBatchFactory.cs deleted file mode 100644 index a0ef2dbc..00000000 --- a/src/EfCore.Ydb/src/Update/Internal/YdbModificationCommandBatchFactory.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Microsoft.EntityFrameworkCore.Update; - -namespace EfCore.Ydb.Update.Internal; - -public sealed class YdbModificationCommandBatchFactory(ModificationCommandBatchFactoryDependencies dependencies) - : IModificationCommandBatchFactory -{ - private ModificationCommandBatchFactoryDependencies Dependencies { get; } = dependencies; - - public ModificationCommandBatch Create() - => new MyModificationCommandBatch(Dependencies); -} - -internal class MyModificationCommandBatch( - ModificationCommandBatchFactoryDependencies dependencies, - int? maxBatchSize = MyModificationCommandBatch.CustomMaxBatchSize -) : AffectedCountModificationCommandBatch(dependencies, maxBatchSize) -{ - public const int CustomMaxBatchSize = 4096; -} 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 deleted file mode 100644 index 876971ec..00000000 --- a/src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/AllTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbFixture.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace EfCore.Ydb.FunctionalTests.AllTests.BulkUpdates; - -internal class TPCFiltersInheritanceBulkUpdatesYdbFixture : TPCInheritanceBulkUpdatesYdbFixture -{ - public override bool EnableFilters => true; -} diff --git a/src/Ydb.Sdk/src/Properties/AssemblyInfo.cs b/src/Ydb.Sdk/src/Properties/AssemblyInfo.cs index 065a401c..624e8b0c 100644 --- a/src/Ydb.Sdk/src/Properties/AssemblyInfo.cs +++ b/src/Ydb.Sdk/src/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("EfCore.Ydb")] +[assembly: InternalsVisibleTo("EntityFrameworkCore.Ydb")] [assembly: InternalsVisibleTo("Ydb.Sdk.Tests")] diff --git a/src/YdbSdk.sln b/src/YdbSdk.sln index 5c6376ab..19250bf0 100644 --- a/src/YdbSdk.sln +++ b/src/YdbSdk.sln @@ -13,18 +13,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ydb.Sdk", "Ydb.Sdk\src\Ydb. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Ydb.Sdk\tests\Tests.csproj", "{A27FD249-6ACB-4392-B00F-CD08FB727C98}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EfCore.Ydb", "EfCore.Ydb", "{5E7B167B-5FC7-41BD-8819-16B02ED9B961}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EFCore.Ydb", "EFCore.Ydb", "{5E7B167B-5FC7-41BD-8819-16B02ED9B961}" ProjectSection(SolutionItems) = preProject - EfCore.Ydb\CHANGELOG.md = EfCore.Ydb\CHANGELOG.md + EFCore.Ydb\CHANGELOG.md = EFCore.Ydb\CHANGELOG.md EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4A4EE5F3-CC9C-4166-A8F5-3ACFDD2A75F3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EfCore.Ydb", "EfCore.Ydb\src\EfCore.Ydb.csproj", "{1C97E429-3499-4EC0-AA28-76BFADB73A65}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFrameworkCore.Ydb", "EFCore.Ydb\src\EntityFrameworkCore.Ydb.csproj", "{1C97E429-3499-4EC0-AA28-76BFADB73A65}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{39DE35EE-621B-4DEC-BFA2-5337ACBAEEF4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EfCore.Ydb.FunctionalTests", "EfCore.Ydb\test\EfCore.Ydb.FunctionalTests\EfCore.Ydb.FunctionalTests.csproj", "{28550E34-B56D-4536-B455-031983D9E561}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFrameworkCore.Ydb.FunctionalTests", "EFCore.Ydb\test\EntityFrameworkCore.Ydb.FunctionalTests\EntityFrameworkCore.Ydb.FunctionalTests.csproj", "{28550E34-B56D-4536-B455-031983D9E561}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution From 7f4a52d24d025d90d1085a9ff8a9af553d6218dd Mon Sep 17 00:00:00 2001 From: KirillKurdyukov Date: Wed, 9 Apr 2025 14:16:38 +0300 Subject: [PATCH 2/8] fix tests.yml --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b01c1641..d1796a6a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -94,7 +94,7 @@ jobs: with: 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" + 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: @@ -119,7 +119,7 @@ jobs: 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" + run: dotnet test src/EFCore.Ydb/test/EfCore.Ydb.FunctionalTests/EntityFrameworkCore.Ydb.FunctionalTests.csproj -l "console;verbosity=detailed" integration-tests: runs-on: ubuntu-22.04 strategy: From 5aa8b4bb532e80b708e5767ba3eff30c2a7dad3e Mon Sep 17 00:00:00 2001 From: KirillKurdyukov Date: Wed, 9 Apr 2025 14:17:10 +0300 Subject: [PATCH 3/8] fix --- examples/src/EF/Program.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/examples/src/EF/Program.cs b/examples/src/EF/Program.cs index 5950a095..eebbcd21 100644 --- a/examples/src/EF/Program.cs +++ b/examples/src/EF/Program.cs @@ -7,10 +7,7 @@ await db.Database.EnsureCreatedAsync(); Console.WriteLine("Inserting a new blog"); -db.Add(new Blog { Url = "http://blogs.msdn.com/adonet - 1" }); -db.Add(new Blog { Url = "http://blogs.msdn.com/adonet - 2" }); -db.Add(new Blog { Url = "http://blogs.msdn.com/adonet - 3" }); -db.Add(new Blog { Url = "http://blogs.msdn.com/adonet - 4" }); +db.Add(new Blog { Url = "http://blogs.msdn.com/adonet" }); await db.SaveChangesAsync(); From 1b92392bf2bba0a1c11c545a177c3439def07f31 Mon Sep 17 00:00:00 2001 From: KirillKurdyukov Date: Wed, 9 Apr 2025 14:52:19 +0300 Subject: [PATCH 4/8] fix linter --- .github/workflows/tests.yml | 2 +- .../src/Extensions/YdbServiceCollectionExtensions.cs | 7 ++----- .../src/Migrations/Internal/YdbHistoryRepository.cs | 3 +-- .../Query/Internal/YdbQueryCompilationContextFactory.cs | 3 +-- .../src/Query/Internal/YdbQuerySqlGeneratorFactory.cs | 3 +-- .../src/Query/Internal/YdbQueryTranslationPostprocessor.cs | 1 - .../Internal/YdbQueryTranslationPostprocessorFactory.cs | 3 +-- .../YdbQueryableMethodTranslatingExpressionVisitor.cs | 2 -- ...dbQueryableMethodTranslatingExpressionVisitorFactory.cs | 3 +-- .../Query/Internal/YdbSqlTranslatingExpressionVisitor.cs | 1 - .../Internal/YdbSqlTranslatingExpressionVisitorFactory.cs | 3 +-- .../Storage/Internal/YdbRelationalTransactionFactory.cs | 3 +-- .../Update/Internal/YdbModificationCommandBatchFactory.cs | 3 ++- .../src/Update/Internal/YdbModificationCommandFactory.cs | 3 ++- .../src/Update/Internal/YdbUpdateSqlGenerator.cs | 2 +- 15 files changed, 15 insertions(+), 27 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d1796a6a..c9cd7fa2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -119,7 +119,7 @@ jobs: with: dotnet-version: 9.0.x - name: Run EFCore tests - run: dotnet test src/EFCore.Ydb/test/EfCore.Ydb.FunctionalTests/EntityFrameworkCore.Ydb.FunctionalTests.csproj -l "console;verbosity=detailed" + run: dotnet test src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/EntityFrameworkCore.Ydb.FunctionalTests.csproj -l "console;verbosity=detailed" integration-tests: runs-on: ubuntu-22.04 strategy: diff --git a/src/EFCore.Ydb/src/Extensions/YdbServiceCollectionExtensions.cs b/src/EFCore.Ydb/src/Extensions/YdbServiceCollectionExtensions.cs index c7372cbc..7b511196 100644 --- a/src/EFCore.Ydb/src/Extensions/YdbServiceCollectionExtensions.cs +++ b/src/EFCore.Ydb/src/Extensions/YdbServiceCollectionExtensions.cs @@ -1,16 +1,13 @@ -using EfCore.Ydb.Migrations; -using EfCore.Ydb.Migrations.Internal; -using EfCore.Ydb.Query.Internal; -using EfCore.Ydb.Storage.Internal; -using EfCore.Ydb.Update.Internal; using EntityFrameworkCore.Ydb.Diagnostics.Internal; using EntityFrameworkCore.Ydb.Infrastructure; using EntityFrameworkCore.Ydb.Infrastructure.Internal; using EntityFrameworkCore.Ydb.Metadata.Conventions; using EntityFrameworkCore.Ydb.Metadata.Internal; using EntityFrameworkCore.Ydb.Migrations; +using EntityFrameworkCore.Ydb.Migrations.Internal; using EntityFrameworkCore.Ydb.Query.Internal; using EntityFrameworkCore.Ydb.Storage.Internal; +using EntityFrameworkCore.Ydb.Update.Internal; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; diff --git a/src/EFCore.Ydb/src/Migrations/Internal/YdbHistoryRepository.cs b/src/EFCore.Ydb/src/Migrations/Internal/YdbHistoryRepository.cs index 569f706e..75f18ebc 100644 --- a/src/EFCore.Ydb/src/Migrations/Internal/YdbHistoryRepository.cs +++ b/src/EFCore.Ydb/src/Migrations/Internal/YdbHistoryRepository.cs @@ -4,7 +4,6 @@ using System.Globalization; using System.Threading; using System.Threading.Tasks; -using EfCore.Ydb.Storage.Internal; using EntityFrameworkCore.Ydb.Storage.Internal; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.Migrations; @@ -13,7 +12,7 @@ using Ydb.Sdk; using Ydb.Sdk.Ado; -namespace EfCore.Ydb.Migrations.Internal; +namespace EntityFrameworkCore.Ydb.Migrations.Internal; public class YdbHistoryRepository(HistoryRepositoryDependencies dependencies) : HistoryRepository(dependencies), IHistoryRepository diff --git a/src/EFCore.Ydb/src/Query/Internal/YdbQueryCompilationContextFactory.cs b/src/EFCore.Ydb/src/Query/Internal/YdbQueryCompilationContextFactory.cs index 43884438..b15d1dd5 100644 --- a/src/EFCore.Ydb/src/Query/Internal/YdbQueryCompilationContextFactory.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbQueryCompilationContextFactory.cs @@ -1,7 +1,6 @@ -using EntityFrameworkCore.Ydb.Query.Internal; using Microsoft.EntityFrameworkCore.Query; -namespace EfCore.Ydb.Query.Internal; +namespace EntityFrameworkCore.Ydb.Query.Internal; public class YdbQueryCompilationContextFactory( QueryCompilationContextDependencies dependencies, diff --git a/src/EFCore.Ydb/src/Query/Internal/YdbQuerySqlGeneratorFactory.cs b/src/EFCore.Ydb/src/Query/Internal/YdbQuerySqlGeneratorFactory.cs index 58950880..55e89f93 100644 --- a/src/EFCore.Ydb/src/Query/Internal/YdbQuerySqlGeneratorFactory.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbQuerySqlGeneratorFactory.cs @@ -1,7 +1,6 @@ -using EntityFrameworkCore.Ydb.Query.Internal; using Microsoft.EntityFrameworkCore.Query; -namespace EfCore.Ydb.Query.Internal; +namespace EntityFrameworkCore.Ydb.Query.Internal; public class YdbQuerySqlGeneratorFactory(QuerySqlGeneratorDependencies dependencies) : IQuerySqlGeneratorFactory { diff --git a/src/EFCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessor.cs b/src/EFCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessor.cs index 5818c452..57aa1dfa 100644 --- a/src/EFCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessor.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessor.cs @@ -1,5 +1,4 @@ using System.Linq.Expressions; -using EfCore.Ydb.Query.Internal; using Microsoft.EntityFrameworkCore.Query; namespace EntityFrameworkCore.Ydb.Query.Internal; diff --git a/src/EFCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessorFactory.cs b/src/EFCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessorFactory.cs index cd07545e..4c345110 100644 --- a/src/EFCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessorFactory.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbQueryTranslationPostprocessorFactory.cs @@ -1,7 +1,6 @@ -using EntityFrameworkCore.Ydb.Query.Internal; using Microsoft.EntityFrameworkCore.Query; -namespace EfCore.Ydb.Query.Internal; +namespace EntityFrameworkCore.Ydb.Query.Internal; public sealed class YdbQueryTranslationPostprocessorFactory( QueryTranslationPostprocessorDependencies dependencies, diff --git a/src/EFCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitor.cs index 6c319323..d0d758be 100644 --- a/src/EFCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitor.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitor.cs @@ -1,5 +1,3 @@ -using EfCore.Ydb.Query.Internal; -using EfCore.Ydb.Storage.Internal; using EntityFrameworkCore.Ydb.Storage.Internal; using Microsoft.EntityFrameworkCore.Query; diff --git a/src/EFCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitorFactory.cs b/src/EFCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitorFactory.cs index 4c997533..e80b7903 100644 --- a/src/EFCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitorFactory.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbQueryableMethodTranslatingExpressionVisitorFactory.cs @@ -1,7 +1,6 @@ -using EntityFrameworkCore.Ydb.Query.Internal; using Microsoft.EntityFrameworkCore.Query; -namespace EfCore.Ydb.Query.Internal; +namespace EntityFrameworkCore.Ydb.Query.Internal; public class YdbQueryableMethodTranslatingExpressionVisitorFactory( QueryableMethodTranslatingExpressionVisitorDependencies dependencies, diff --git a/src/EFCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitor.cs b/src/EFCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitor.cs index 45652295..8f56eb74 100644 --- a/src/EFCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitor.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitor.cs @@ -5,7 +5,6 @@ using System.Linq.Expressions; using System.Reflection; using System.Text; -using EfCore.Ydb.Query.Internal; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.Query.SqlExpressions; using Microsoft.EntityFrameworkCore.Storage; diff --git a/src/EFCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitorFactory.cs b/src/EFCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitorFactory.cs index 7d22b747..45ad5524 100644 --- a/src/EFCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitorFactory.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbSqlTranslatingExpressionVisitorFactory.cs @@ -1,7 +1,6 @@ -using EntityFrameworkCore.Ydb.Query.Internal; using Microsoft.EntityFrameworkCore.Query; -namespace EfCore.Ydb.Query.Internal; +namespace EntityFrameworkCore.Ydb.Query.Internal; public class YdbSqlTranslatingExpressionVisitorFactory( RelationalSqlTranslatingExpressionVisitorDependencies dependencies diff --git a/src/EFCore.Ydb/src/Storage/Internal/YdbRelationalTransactionFactory.cs b/src/EFCore.Ydb/src/Storage/Internal/YdbRelationalTransactionFactory.cs index 3d239717..3918f626 100644 --- a/src/EFCore.Ydb/src/Storage/Internal/YdbRelationalTransactionFactory.cs +++ b/src/EFCore.Ydb/src/Storage/Internal/YdbRelationalTransactionFactory.cs @@ -1,11 +1,10 @@ using System; using System.Data.Common; -using EntityFrameworkCore.Ydb.Storage.Internal; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.Storage; -namespace EfCore.Ydb.Storage.Internal; +namespace EntityFrameworkCore.Ydb.Storage.Internal; public class YdbRelationalTransactionFactory(RelationalTransactionFactoryDependencies dependencies) : IRelationalTransactionFactory diff --git a/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatchFactory.cs b/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatchFactory.cs index 812f6ffb..22168dbb 100644 --- a/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatchFactory.cs +++ b/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatchFactory.cs @@ -1,6 +1,7 @@ +using EfCore.Ydb.Update.Internal; using Microsoft.EntityFrameworkCore.Update; -namespace EfCore.Ydb.Update.Internal; +namespace EntityFrameworkCore.Ydb.Update.Internal; public sealed class YdbModificationCommandBatchFactory(ModificationCommandBatchFactoryDependencies dependencies) : IModificationCommandBatchFactory diff --git a/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandFactory.cs b/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandFactory.cs index 9a89ddf2..3be7508c 100644 --- a/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandFactory.cs +++ b/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandFactory.cs @@ -1,6 +1,7 @@ +using EfCore.Ydb.Update.Internal; using Microsoft.EntityFrameworkCore.Update; -namespace EfCore.Ydb.Update.Internal; +namespace EntityFrameworkCore.Ydb.Update.Internal; public class YdbModificationCommandFactory : IModificationCommandFactory { diff --git a/src/EFCore.Ydb/src/Update/Internal/YdbUpdateSqlGenerator.cs b/src/EFCore.Ydb/src/Update/Internal/YdbUpdateSqlGenerator.cs index 1caec952..ee819ce0 100644 --- a/src/EFCore.Ydb/src/Update/Internal/YdbUpdateSqlGenerator.cs +++ b/src/EFCore.Ydb/src/Update/Internal/YdbUpdateSqlGenerator.cs @@ -4,7 +4,7 @@ using System.Text; using Microsoft.EntityFrameworkCore.Update; -namespace EfCore.Ydb.Update.Internal; +namespace EntityFrameworkCore.Ydb.Update.Internal; public class YdbUpdateSqlGenerator(UpdateSqlGeneratorDependencies dependencies) : UpdateSqlGenerator(dependencies) { From 0a26aed734e035f3465a63fe3a6171250b0b1b5e Mon Sep 17 00:00:00 2001 From: KirillKurdyukov Date: Wed, 9 Apr 2025 15:01:57 +0300 Subject: [PATCH 5/8] fix linter --- .../src/Query/Internal/Translators/StubTranslator.cs | 2 +- .../Translators/YdbQueryableAggregateMethodTranslator.cs | 5 ++--- .../Internal/YdbAggregateMethodCallTranslatorProvider.cs | 3 +-- .../src/Query/Internal/YdbMemberTranslatorProvider.cs | 2 +- .../src/Query/Internal/YdbMethodCallTranslatorProvider.cs | 2 +- .../src/Storage/Internal/Mapping/YdbBoolTypeMapping.cs | 2 +- .../src/Storage/Internal/Mapping/YdbBytesTypeMapping.cs | 2 +- .../src/Storage/Internal/Mapping/YdbDecimalTypeMapping.cs | 2 +- .../src/Storage/Internal/Mapping/YdbJsonTypeMapping.cs | 2 +- .../src/Storage/Internal/Mapping/YdbStringTypeMapping.cs | 2 +- src/EFCore.Ydb/src/Storage/Internal/YdbTypeMappingSource.cs | 2 +- src/EFCore.Ydb/src/Update/Internal/YdbModificationCommand.cs | 2 +- .../src/Update/Internal/YdbModificationCommandBatch.cs | 2 +- .../Update/Internal/YdbModificationCommandBatchFactory.cs | 1 - .../src/Update/Internal/YdbModificationCommandFactory.cs | 1 - src/EFCore.Ydb/src/Utilities/ArrayUtil.cs | 2 +- .../AllTests/ModelBuilding101YdbTest.cs | 2 +- .../AllTests/Query/NullKeysYdbTest.cs | 2 +- .../EntityFrameworkCore.Ydb.FunctionalTests/YdbFixture.cs | 2 +- 19 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/EFCore.Ydb/src/Query/Internal/Translators/StubTranslator.cs b/src/EFCore.Ydb/src/Query/Internal/Translators/StubTranslator.cs index 0e4a352d..30f5bd43 100644 --- a/src/EFCore.Ydb/src/Query/Internal/Translators/StubTranslator.cs +++ b/src/EFCore.Ydb/src/Query/Internal/Translators/StubTranslator.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.Query.SqlExpressions; -namespace EfCore.Ydb.Query.Internal.Translators; +namespace EntityFrameworkCore.Ydb.Query.Internal.Translators; // TODO: Remove this class. Temporary stub for debug only public class StubTranslator : IMethodCallTranslator, IMemberTranslator diff --git a/src/EFCore.Ydb/src/Query/Internal/Translators/YdbQueryableAggregateMethodTranslator.cs b/src/EFCore.Ydb/src/Query/Internal/Translators/YdbQueryableAggregateMethodTranslator.cs index 93fbe7d7..75e78927 100644 --- a/src/EFCore.Ydb/src/Query/Internal/Translators/YdbQueryableAggregateMethodTranslator.cs +++ b/src/EFCore.Ydb/src/Query/Internal/Translators/YdbQueryableAggregateMethodTranslator.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using EfCore.Ydb.Utilities; -using EntityFrameworkCore.Ydb.Query.Internal; +using EntityFrameworkCore.Ydb.Utilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.Query.SqlExpressions; using Microsoft.EntityFrameworkCore.Storage; -namespace EfCore.Ydb.Query.Internal.Translators; +namespace EntityFrameworkCore.Ydb.Query.Internal.Translators; public class YdbQueryableAggregateMethodTranslator( YdbSqlExpressionFactory sqlExpressionFactory, diff --git a/src/EFCore.Ydb/src/Query/Internal/YdbAggregateMethodCallTranslatorProvider.cs b/src/EFCore.Ydb/src/Query/Internal/YdbAggregateMethodCallTranslatorProvider.cs index 8e809c0f..94c0b29d 100644 --- a/src/EFCore.Ydb/src/Query/Internal/YdbAggregateMethodCallTranslatorProvider.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbAggregateMethodCallTranslatorProvider.cs @@ -1,5 +1,4 @@ -using EfCore.Ydb.Query.Internal; -using EfCore.Ydb.Query.Internal.Translators; +using EntityFrameworkCore.Ydb.Query.Internal.Translators; using Microsoft.EntityFrameworkCore.Query; namespace EntityFrameworkCore.Ydb.Query.Internal; diff --git a/src/EFCore.Ydb/src/Query/Internal/YdbMemberTranslatorProvider.cs b/src/EFCore.Ydb/src/Query/Internal/YdbMemberTranslatorProvider.cs index 5abd2bea..965d9fef 100644 --- a/src/EFCore.Ydb/src/Query/Internal/YdbMemberTranslatorProvider.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbMemberTranslatorProvider.cs @@ -1,4 +1,4 @@ -using EfCore.Ydb.Query.Internal.Translators; +using EntityFrameworkCore.Ydb.Query.Internal.Translators; using Microsoft.EntityFrameworkCore.Query; namespace EntityFrameworkCore.Ydb.Query.Internal; diff --git a/src/EFCore.Ydb/src/Query/Internal/YdbMethodCallTranslatorProvider.cs b/src/EFCore.Ydb/src/Query/Internal/YdbMethodCallTranslatorProvider.cs index 32044b96..800f1a41 100644 --- a/src/EFCore.Ydb/src/Query/Internal/YdbMethodCallTranslatorProvider.cs +++ b/src/EFCore.Ydb/src/Query/Internal/YdbMethodCallTranslatorProvider.cs @@ -1,4 +1,4 @@ -using EfCore.Ydb.Query.Internal.Translators; +using EntityFrameworkCore.Ydb.Query.Internal.Translators; using Microsoft.EntityFrameworkCore.Query; namespace EntityFrameworkCore.Ydb.Query.Internal; diff --git a/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbBoolTypeMapping.cs b/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbBoolTypeMapping.cs index 40542dfe..dae16c8c 100644 --- a/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbBoolTypeMapping.cs +++ b/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbBoolTypeMapping.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Storage; -namespace EfCore.Ydb.Storage.Internal.Mapping; +namespace EntityFrameworkCore.Ydb.Storage.Internal.Mapping; public class YdbBoolTypeMapping : BoolTypeMapping { diff --git a/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbBytesTypeMapping.cs b/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbBytesTypeMapping.cs index 8c73415a..1d7449ba 100644 --- a/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbBytesTypeMapping.cs +++ b/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbBytesTypeMapping.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage.Json; -namespace EfCore.Ydb.Storage.Internal.Mapping; +namespace EntityFrameworkCore.Ydb.Storage.Internal.Mapping; public class YdbBytesTypeMapping : RelationalTypeMapping { diff --git a/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbDecimalTypeMapping.cs b/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbDecimalTypeMapping.cs index 753e6498..68cd3a53 100644 --- a/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbDecimalTypeMapping.cs +++ b/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbDecimalTypeMapping.cs @@ -1,7 +1,7 @@ using System; using Microsoft.EntityFrameworkCore.Storage; -namespace EfCore.Ydb.Storage.Internal.Mapping; +namespace EntityFrameworkCore.Ydb.Storage.Internal.Mapping; public class YdbDecimalTypeMapping : DecimalTypeMapping { diff --git a/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbJsonTypeMapping.cs b/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbJsonTypeMapping.cs index ac710862..4d9df313 100644 --- a/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbJsonTypeMapping.cs +++ b/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbJsonTypeMapping.cs @@ -8,7 +8,7 @@ using System.Text.Json; using Microsoft.EntityFrameworkCore.Storage; -namespace EfCore.Ydb.Storage.Internal.Mapping; +namespace EntityFrameworkCore.Ydb.Storage.Internal.Mapping; public class YdbJsonTypeMapping : JsonTypeMapping { diff --git a/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbStringTypeMapping.cs b/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbStringTypeMapping.cs index 41ac981e..1f5eb5e0 100644 --- a/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbStringTypeMapping.cs +++ b/src/EFCore.Ydb/src/Storage/Internal/Mapping/YdbStringTypeMapping.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Storage.Json; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace EfCore.Ydb.Storage.Internal.Mapping; +namespace EntityFrameworkCore.Ydb.Storage.Internal.Mapping; public class YdbStringTypeMapping : RelationalTypeMapping { diff --git a/src/EFCore.Ydb/src/Storage/Internal/YdbTypeMappingSource.cs b/src/EFCore.Ydb/src/Storage/Internal/YdbTypeMappingSource.cs index 9388a6d3..67e11beb 100644 --- a/src/EFCore.Ydb/src/Storage/Internal/YdbTypeMappingSource.cs +++ b/src/EFCore.Ydb/src/Storage/Internal/YdbTypeMappingSource.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Data; using System.Text.Json; -using EfCore.Ydb.Storage.Internal.Mapping; +using EntityFrameworkCore.Ydb.Storage.Internal.Mapping; using Microsoft.EntityFrameworkCore.Storage; using Type = System.Type; diff --git a/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommand.cs b/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommand.cs index 139d2238..8bc849b2 100644 --- a/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommand.cs +++ b/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommand.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Update; -namespace EfCore.Ydb.Update.Internal; +namespace EntityFrameworkCore.Ydb.Update.Internal; public class YdbModificationCommand : ModificationCommand { diff --git a/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatch.cs b/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatch.cs index c563282d..b64da9d9 100644 --- a/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatch.cs +++ b/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatch.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Update; -namespace EfCore.Ydb.Update.Internal; +namespace EntityFrameworkCore.Ydb.Update.Internal; public class YdbModificationCommandBatch( ModificationCommandBatchFactoryDependencies dependencies, diff --git a/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatchFactory.cs b/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatchFactory.cs index 22168dbb..232835af 100644 --- a/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatchFactory.cs +++ b/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandBatchFactory.cs @@ -1,4 +1,3 @@ -using EfCore.Ydb.Update.Internal; using Microsoft.EntityFrameworkCore.Update; namespace EntityFrameworkCore.Ydb.Update.Internal; diff --git a/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandFactory.cs b/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandFactory.cs index 3be7508c..0507b245 100644 --- a/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandFactory.cs +++ b/src/EFCore.Ydb/src/Update/Internal/YdbModificationCommandFactory.cs @@ -1,4 +1,3 @@ -using EfCore.Ydb.Update.Internal; using Microsoft.EntityFrameworkCore.Update; namespace EntityFrameworkCore.Ydb.Update.Internal; diff --git a/src/EFCore.Ydb/src/Utilities/ArrayUtil.cs b/src/EFCore.Ydb/src/Utilities/ArrayUtil.cs index e3921316..e2d3fd09 100644 --- a/src/EFCore.Ydb/src/Utilities/ArrayUtil.cs +++ b/src/EFCore.Ydb/src/Utilities/ArrayUtil.cs @@ -1,4 +1,4 @@ -namespace EfCore.Ydb.Utilities; +namespace EntityFrameworkCore.Ydb.Utilities; internal static class ArrayUtil { diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/ModelBuilding101YdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/ModelBuilding101YdbTest.cs index 6d0c6391..d9083c33 100644 --- a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/ModelBuilding101YdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/ModelBuilding101YdbTest.cs @@ -1,7 +1,7 @@ using EntityFrameworkCore.Ydb.Extensions; using Microsoft.EntityFrameworkCore; -namespace EfCore.Ydb.FunctionalTests.AllTests; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests; public class ModelBuilding101YdbTest : ModelBuilding101RelationalTestBase { diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/NullKeysYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/NullKeysYdbTest.cs index 23d5300c..15bc3a6e 100644 --- a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/NullKeysYdbTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/AllTests/Query/NullKeysYdbTest.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EfCore.Ydb.FunctionalTests.AllTests.Query; +namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.Query; public class NullKeysYdbTest(NullKeysYdbTest.NullKeysYdbFixture fixture) : NullKeysTestBase(fixture) diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/YdbFixture.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/YdbFixture.cs index 0015ce5b..e46daaca 100644 --- a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/YdbFixture.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/YdbFixture.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace EfCore.Ydb.FunctionalTests; +namespace EntityFrameworkCore.Ydb.FunctionalTests; public class YdbFixture : ServiceProviderFixtureBase { From 52c23da0a89a205410d51cfa8a11588e454b23ad Mon Sep 17 00:00:00 2001 From: KirillKurdyukov Date: Wed, 9 Apr 2025 15:08:03 +0300 Subject: [PATCH 6/8] fix linter --- .../Migrations/YdbMigrationsTest.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Migrations/YdbMigrationsTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Migrations/YdbMigrationsTest.cs index 927604ba..ceaaecf9 100644 --- a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Migrations/YdbMigrationsTest.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Migrations/YdbMigrationsTest.cs @@ -547,7 +547,9 @@ public class YdbMigrationsFixture : MigrationsFixtureBase public override RelationalTestHelpers TestHelpers => YdbTestHelpers.Instance; protected override IServiceCollection AddServices(IServiceCollection serviceCollection) => +#pragma warning disable EF1001 base.AddServices(serviceCollection) .AddScoped(); +#pragma warning restore EF1001 } } From af9f21887ad6196aa505b3ec0dd08949fedeba0a Mon Sep 17 00:00:00 2001 From: KirillKurdyukov Date: Wed, 9 Apr 2025 15:18:27 +0300 Subject: [PATCH 7/8] fix --- .../TestUtilities/YdbTestStore.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/YdbTestStore.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/YdbTestStore.cs index 0b8ceb4a..05fef6cb 100644 --- a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/YdbTestStore.cs +++ b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/TestUtilities/YdbTestStore.cs @@ -23,9 +23,7 @@ public static YdbTestStore GetOrCreate( public override DbContextOptionsBuilder AddProviderOptions(DbContextOptionsBuilder builder) => UseConnectionString ? builder.UseYdb(Connection.ConnectionString) - .LogTo(Console.WriteLine) - : builder.UseYdb(Connection) - .LogTo(Console.WriteLine); + : builder.UseYdb(Connection); internal Task ExecuteNonQueryAsync(string sql, params object[] parameters) => ExecuteAsync(Connection, command => command.ExecuteNonQueryAsync(), sql, false, parameters); From 61b4b5900a36bb5e27b4a6b033585cffeb0d41b5 Mon Sep 17 00:00:00 2001 From: KirillKurdyukov Date: Wed, 9 Apr 2025 15:25:33 +0300 Subject: [PATCH 8/8] fix EntityFrameworkCore --- src/EFCore.Ydb/src/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/EFCore.Ydb/src/Properties/AssemblyInfo.cs b/src/EFCore.Ydb/src/Properties/AssemblyInfo.cs index d360517d..ecef835f 100644 --- a/src/EFCore.Ydb/src/Properties/AssemblyInfo.cs +++ b/src/EFCore.Ydb/src/Properties/AssemblyInfo.cs @@ -1,3 +1,3 @@ using Microsoft.EntityFrameworkCore.Design; -[assembly: DesignTimeProviderServices("EfCore.Ydb.Design.Internal.YdbDesignTimeServices")] +[assembly: DesignTimeProviderServices("EntityFrameworkCore.Ydb.Design.Internal.YdbDesignTimeServices")]