Skip to content

Commit 6e0e82e

Browse files
committed
No ForcedServerVersion with unsupported versions
+ fixed certain issues in multidatabase/multischema tests
1 parent 699e035 commit 6e0e82e

8 files changed

Lines changed: 767 additions & 130 deletions

File tree

Orm/Xtensive.Orm.Tests/Configuration/MicrosoftConfigurationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ public void ForcedServerVersionTest(bool useRoot)
534534
{
535535
var domainConfig = LoadDomainConfiguration("DomainWithForcedServerVersion", useRoot);
536536
ValidateAllDefaultExcept(domainConfig,
537-
((d) => d.ForcedServerVersion, "10.0.0.0"));
537+
((d) => d.ForcedServerVersion, "16.0.0.0"));
538538
}
539539

540540
[Test]

Orm/Xtensive.Orm.Tests/Storage/ForceServerVersion.cs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Copyright (C) 2012 Xtensive LLC.
2-
// All rights reserved.
3-
// For conditions of distribution and use, see license.
1+
// Copyright (C) 2012-2025 Xtensive LLC.
2+
// This code is distributed under MIT license terms.
3+
// See the License.txt file in the project root for more information.
44
// Created by: Denis Krjuchkov
55
// Created: 2012.03.06
66

@@ -35,18 +35,21 @@ public class ForceServerVersion : AutoBuildTest
3535
protected override void CheckRequirements()
3636
{
3737
Require.ProviderIs(StorageProvider.SqlServer);
38-
Require.ProviderVersionAtLeast(new Version(10, 0));
38+
Require.ProviderVersionAtLeast(new Version(16, 0));
3939
}
4040

4141
protected override DomainConfiguration BuildConfiguration()
4242
{
4343
var configuration = base.BuildConfiguration();
44-
configuration.ForcedServerVersion = "9.0.0.0";
44+
configuration.ForcedServerVersion = "16.0.0.0";
4545
configuration.Types.Register(typeof (Forced));
4646
return configuration;
4747
}
4848

4949
[Test]
50+
[Ignore(
51+
"Test is inconclusive, due to shrinked number of version. " +
52+
"New versions are relatively the same in terms of types/supported features at the moment.")]
5053
public void MainTest()
5154
{
5255
// Check that DateTime is used instead of DateTime2

Orm/Xtensive.Orm.Tests/Upgrade/LegacyUpgrade/GeneratorUpgrade/MultidatabaseTest.cs

Lines changed: 260 additions & 11 deletions
Large diffs are not rendered by default.

Orm/Xtensive.Orm.Tests/Upgrade/LegacyUpgrade/GeneratorUpgrade/MultischemaTest.cs

Lines changed: 205 additions & 11 deletions
Large diffs are not rendered by default.

Orm/Xtensive.Orm.Tests/Upgrade/LegacyUpgrade/GeneratorUpgrade/SimpleSchemaTest.cs

Lines changed: 290 additions & 98 deletions
Large diffs are not rendered by default.

Orm/Xtensive.Orm.Tests/Upgrade/LegacyUpgrade/MySqlDateTimeUpgradeTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ private void BuildAndPopulateInitDomain()
159159
{
160160
var initDomainConfig = BuildConfiguration(DomainUpgradeMode.Recreate);
161161
initDomainConfig.Types.Register(typeof(DateTimeColumnTypeModifier));
162-
//initDomainConfig.ForcedServerVersion = "5.5";// in this version datetime type is used, the type we try to upgrade from
163162

164163
using (var initDomain = Domain.Build(initDomainConfig))
165164
using (var session = initDomain.OpenSession())

Orm/Xtensive.Orm.Tests/domainSettings.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169

170170
<domain name="DomainWithForcedServerVersion"
171171
connectionUrl="sqlserver://localhost/"
172-
forcedServerVersion="10.0.0.0" />
172+
forcedServerVersion="16.0.0.0" />
173173

174174
<domain name="DomainWithInitSql"
175175
connectionUrl="sqlserver://localhost/"
@@ -1119,7 +1119,7 @@
11191119

11201120
<Domain name="DomainWithForcedServerVersion">
11211121
<ConnectionUrl>sqlserver://localhost/</ConnectionUrl>
1122-
<ForcedServerVersion>10.0.0.0</ForcedServerVersion>
1122+
<ForcedServerVersion>16.0.0.0</ForcedServerVersion>
11231123
</Domain>
11241124

11251125
<Domain name="DomainWithInitSql">

Orm/Xtensive.Orm.Tests/domainSettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215

216216
"DomainWithForcedServerVersion": {
217217
"ConnectionUrl": "sqlserver://localhost/",
218-
"ForcedServerVersion": "10.0.0.0"
218+
"ForcedServerVersion": "16.0.0.0"
219219
},
220220
"DomainWithInitSql": {
221221
"ConnectionUrl": "sqlserver://localhost/",

0 commit comments

Comments
 (0)