Skip to content

Commit 4a0c8fc

Browse files
committed
Improved some configurations
- added contants with default values - fixed typo in default constant
1 parent ace0243 commit 4a0c8fc

3 files changed

Lines changed: 31 additions & 6 deletions

File tree

Orm/Xtensive.Orm/Orm/Configuration/DomainConfiguration.cs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
using System.Linq;
1010
using JetBrains.Annotations;
1111
using Xtensive.Core;
12-
using Xtensive.Orm.Configuration.Elements;
12+
using Xtensive.Orm.Configuration.Internals;
1313
using Xtensive.Orm.Internals;
14-
using ConfigurationSection=Xtensive.Orm.Configuration.Elements.ConfigurationSection;
14+
using ConfigurationSection = Xtensive.Orm.Configuration.Elements.ConfigurationSection;
1515

1616
namespace Xtensive.Orm.Configuration
1717
{
@@ -95,8 +95,14 @@ public class DomainConfiguration : ConfigurationBase
9595
/// <summary>
9696
/// Default <see cref="ForeignKeyMode"/> value.
9797
/// </summary>
98+
[Obsolete ("User DefaultForeignKeyMode")]
9899
public const ForeignKeyMode DefauktForeignKeyMode = ForeignKeyMode.Default;
99100

101+
/// <summary>
102+
/// Default <see cref="ForeignKeyMode"/> value.
103+
/// </summary>
104+
public const ForeignKeyMode DefaultForeignKeyMode = ForeignKeyMode.Default;
105+
100106
/// <summary>
101107
/// Default <see cref="FullTextChangeTrackingMode"/> value.
102108
/// </summary>
@@ -154,7 +160,7 @@ public class DomainConfiguration : ConfigurationBase
154160
private bool ensureConnectionIsAlive = DefaultEnsureConnectionIsAlive;
155161
private bool preferTypeIdsAsQueryParameters = DefaultPreferTypeIdsAsQueryParameters;
156162
private DomainUpgradeMode upgradeMode = DefaultUpgradeMode;
157-
private ForeignKeyMode foreignKeyMode = DefauktForeignKeyMode;
163+
private ForeignKeyMode foreignKeyMode = DefaultForeignKeyMode;
158164
private FullTextChangeTrackingMode fullTextChangeTrackingMode = DefaultFullTextChangeTrackingMode;
159165
private DomainOptions options = DefaultDomainOptions;
160166
private SchemaSyncExceptionFormat schemaSyncExceptionFormat = DefaultSchemaSyncExceptionFormat;

Orm/Xtensive.Orm/Orm/Configuration/NamingConvention.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ namespace Xtensive.Orm.Configuration
1818
public class NamingConvention : LockableBase,
1919
ICloneable
2020
{
21+
public const LetterCasePolicy DefaultLetterCasePolicy = LetterCasePolicy.Default;
22+
public const NamespacePolicy DefaultNamespacePolicy = NamespacePolicy.Default;
23+
public const NamingRules DefaultNamingRules = NamingRules.Default;
24+
2125
private LetterCasePolicy letterCasePolicy;
2226
private NamespacePolicy namespacePolicy;
2327
private NamingRules namingRules;

Orm/Xtensive.Orm/Orm/Configuration/SessionConfiguration.cs

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,27 @@ public class SessionConfiguration : ConfigurationBase
2323
/// Default cache size.
2424
/// </summary>
2525
public const int DefaultCacheSize = 16 * 1024;
26-
26+
27+
/// <summary>
28+
/// Default session options.
29+
/// </summary>
30+
public const SessionOptions DefaultSessionOptions = SessionOptions.Default;
31+
2732
///<summary>
2833
/// Default isolation level.
2934
///</summary>
3035
public const IsolationLevel DefaultDefaultIsolationLevel = IsolationLevel.RepeatableRead;
3136

37+
/// <summary>
38+
/// Default cache type.
39+
/// </summary>
40+
public const SessionCacheType DefaultCacheType = SessionCacheType.Default;
41+
42+
/// <summary>
43+
/// Default reader preloading policy.
44+
/// </summary>
45+
public const ReaderPreloadingPolicy DefaultReaderPreloadingPolicy = ReaderPreloadingPolicy.Default;
46+
3247
/// <summary>
3348
/// Default batch size.
3449
/// </summary>
@@ -46,13 +61,13 @@ public class SessionConfiguration : ConfigurationBase
4661
/// </summary>
4762
public static readonly SessionConfiguration Default = new SessionConfiguration(WellKnown.Sessions.Default);
4863

49-
private SessionOptions options = SessionOptions.Default;
64+
private SessionOptions options = DefaultSessionOptions;
5065
private string userName = string.Empty;
5166
private string password = string.Empty;
5267
private int cacheSize = DefaultCacheSize;
5368
private int batchSize = DefaultBatchSize;
5469
private int entityChangeRegistrySize = DefaultEntityChangeRegistrySize;
55-
private SessionCacheType cacheType = SessionCacheType.Default;
70+
private SessionCacheType cacheType = DefaultCacheType;
5671
private IsolationLevel defaultIsolationLevel = DefaultDefaultIsolationLevel; // what a fancy name?
5772
private int? defaultCommandTimeout = null;
5873
private ReaderPreloadingPolicy readerPreloading = ReaderPreloadingPolicy.Default;

0 commit comments

Comments
 (0)