Skip to content

Commit 4bb2ba0

Browse files
alex-kulakovalex-kulakov
committed
Merge branch 'master-sqlserver-project'
2 parents 188bc73 + a729bdd commit 4bb2ba0

57 files changed

Lines changed: 5144 additions & 4835 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Extensions/Xtensive.Orm.Reprocessing/Xtensive.Orm.Reprocessing.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
<ItemGroup>
1717
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
1818
</ItemGroup>
19-
<ItemGroup>
20-
<ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />
21-
</ItemGroup>
2219
<ItemGroup>
2320
<None Include="Readme.txt" />
2421
</ItemGroup>
2522
<ItemGroup>
2623
<Folder Include="Properties\" />
2724
</ItemGroup>
25+
<ItemGroup>
26+
<ProjectReference Include="..\..\Orm\Xtensive.Orm.SqlServer\Xtensive.Orm.SqlServer.csproj" />
27+
</ItemGroup>
2828
</Project>

‎Orm.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
7474
EndProject
7575
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xtensive.Orm.Weaver", "Weaver\Xtensive.Orm.Weaver\Xtensive.Orm.Weaver.csproj", "{75B3DB45-3055-4A22-854A-BD271D5E4218}"
7676
EndProject
77+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xtensive.Orm.SqlServer", "Orm\Xtensive.Orm.SqlServer\Xtensive.Orm.SqlServer.csproj", "{45000ADE-F647-4171-A91A-428CDF682603}"
78+
EndProject
7779
Global
7880
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7981
Debug|Any CPU = Debug|Any CPU
@@ -192,6 +194,10 @@ Global
192194
{75B3DB45-3055-4A22-854A-BD271D5E4218}.Debug|Any CPU.Build.0 = Debug|Any CPU
193195
{75B3DB45-3055-4A22-854A-BD271D5E4218}.Release|Any CPU.ActiveCfg = Release|Any CPU
194196
{75B3DB45-3055-4A22-854A-BD271D5E4218}.Release|Any CPU.Build.0 = Release|Any CPU
197+
{45000ADE-F647-4171-A91A-428CDF682603}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
198+
{45000ADE-F647-4171-A91A-428CDF682603}.Debug|Any CPU.Build.0 = Debug|Any CPU
199+
{45000ADE-F647-4171-A91A-428CDF682603}.Release|Any CPU.ActiveCfg = Release|Any CPU
200+
{45000ADE-F647-4171-A91A-428CDF682603}.Release|Any CPU.Build.0 = Release|Any CPU
195201
EndGlobalSection
196202
GlobalSection(SolutionProperties) = preSolution
197203
HideSolutionNode = FALSE
@@ -224,6 +230,7 @@ Global
224230
{6CBBB146-851F-49A6-88EC-01FFE455815B} = {DC441957-AF79-423D-AA60-2F102926F6D2}
225231
{3AC7C076-26BA-4185-A0FC-2B97D7AF48D9} = {DC441957-AF79-423D-AA60-2F102926F6D2}
226232
{15CC7358-3A5B-4146-A5CB-78DAE75E88E6} = {DC441957-AF79-423D-AA60-2F102926F6D2}
233+
{45000ADE-F647-4171-A91A-428CDF682603} = {2302847B-292A-4650-A852-BDED40E1BB1C}
227234
EndGlobalSection
228235
GlobalSection(ExtensibilityGlobals) = postSolution
229236
SolutionGuid = {F995719A-8D35-49A3-B271-42898A587F57}

Orm/Xtensive.Orm/Orm/Providers/SqlServer/DomainHandler.cs renamed to Orm/Xtensive.Orm.SqlServer/Orm.Providers.SqlServer/DomainHandler.cs

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
// Copyright (C) 2003-2010 Xtensive LLC.
2-
// All rights reserved.
3-
// For conditions of distribution and use, see license.
4-
// Created by: Alexey Gamzov
5-
// Created: 2008.07.04
6-
7-
using System;
8-
using System.Collections.Generic;
9-
using Xtensive.Core;
10-
using Xtensive.Orm.Rse.Compilation;
11-
12-
namespace Xtensive.Orm.Providers.SqlServer
13-
{
14-
/// <summary>
15-
/// A domain handler specific to Microsoft SQL Server RDBMS.
16-
/// </summary>
17-
public class DomainHandler : Providers.DomainHandler
18-
{
19-
/// <inheritdoc/>
20-
protected override ICompiler CreateCompiler(CompilerConfiguration configuration)
21-
{
22-
return new SqlCompiler(Handlers, configuration);
23-
}
24-
25-
protected override SearchConditionCompiler CreateSearchConditionVisitor()
26-
{
27-
if (Domain.StorageProviderInfo.StorageVersion.Major < 11)
28-
return new SearchConditionCompilerV09();
29-
return new SearchConditionCompilerV11();
30-
}
31-
}
1+
// Copyright (C) 2003-2010 Xtensive LLC.
2+
// All rights reserved.
3+
// For conditions of distribution and use, see license.
4+
// Created by: Alexey Gamzov
5+
// Created: 2008.07.04
6+
7+
using System;
8+
using System.Collections.Generic;
9+
using Xtensive.Core;
10+
using Xtensive.Orm.Rse.Compilation;
11+
12+
namespace Xtensive.Orm.Providers.SqlServer
13+
{
14+
/// <summary>
15+
/// A domain handler specific to Microsoft SQL Server RDBMS.
16+
/// </summary>
17+
public class DomainHandler : Providers.DomainHandler
18+
{
19+
/// <inheritdoc/>
20+
protected override ICompiler CreateCompiler(CompilerConfiguration configuration)
21+
{
22+
return new SqlCompiler(Handlers, configuration);
23+
}
24+
25+
protected override SearchConditionCompiler CreateSearchConditionVisitor()
26+
{
27+
if (Domain.StorageProviderInfo.StorageVersion.Major < 11)
28+
return new SearchConditionCompilerV09();
29+
return new SearchConditionCompilerV11();
30+
}
31+
}
3232
}

Orm/Xtensive.Orm/Orm/Providers/SqlServer/HandlerFactory.cs renamed to Orm/Xtensive.Orm.SqlServer/Orm.Providers.SqlServer/HandlerFactory.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
// Copyright (C) 2003-2010 Xtensive LLC.
2-
// All rights reserved.
3-
// For conditions of distribution and use, see license.
4-
// Created by: Alexey Gamzov
5-
// Created: 2008.07.04
6-
7-
namespace Xtensive.Orm.Providers.SqlServer
8-
{
9-
/// <summary>
10-
/// Storage provider for Microsoft SQL Server.
11-
/// </summary>
12-
[Provider(WellKnown.Provider.SqlServer, typeof (Xtensive.Sql.Drivers.SqlServer.DriverFactory))]
13-
public class HandlerFactory : Providers.HandlerFactory
14-
{
15-
}
1+
// Copyright (C) 2003-2010 Xtensive LLC.
2+
// All rights reserved.
3+
// For conditions of distribution and use, see license.
4+
// Created by: Alexey Gamzov
5+
// Created: 2008.07.04
6+
7+
namespace Xtensive.Orm.Providers.SqlServer
8+
{
9+
/// <summary>
10+
/// Storage provider for Microsoft SQL Server.
11+
/// </summary>
12+
[Provider(WellKnown.Provider.SqlServer, typeof (Xtensive.Sql.Drivers.SqlServer.DriverFactory))]
13+
public class HandlerFactory : Providers.HandlerFactory
14+
{
15+
}
1616
}

0 commit comments

Comments
 (0)