From 1f225418ec716dbcf67e6a02bbe88c3ca3c5db9c Mon Sep 17 00:00:00 2001 From: Sergei Pavlov Date: Wed, 27 Dec 2023 12:34:00 -0800 Subject: [PATCH 1/4] Fix typo `occured` -> `occurred` --- .../Xtensive.Orm.Tracking/TrackingCompletedEventArgs.cs | 2 +- Orm/Xtensive.Orm/Orm/Exceptions/ConnectionErrorException.cs | 2 +- Orm/Xtensive.Orm/Orm/Exceptions/StorageExceptionInfo.cs | 4 ++-- Orm/Xtensive.Orm/Orm/Session.Validation.cs | 2 +- Orm/Xtensive.Orm/Strings.Designer.cs | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Extensions/Xtensive.Orm.Tracking/TrackingCompletedEventArgs.cs b/Extensions/Xtensive.Orm.Tracking/TrackingCompletedEventArgs.cs index c53101c1d1..6686e9a650 100644 --- a/Extensions/Xtensive.Orm.Tracking/TrackingCompletedEventArgs.cs +++ b/Extensions/Xtensive.Orm.Tracking/TrackingCompletedEventArgs.cs @@ -13,7 +13,7 @@ namespace Xtensive.Orm.Tracking public readonly struct TrackingCompletedEventArgs { /// - /// Gets session this changes occured in. + /// Gets session this changes occurred in. /// public Session Session { get; } diff --git a/Orm/Xtensive.Orm/Orm/Exceptions/ConnectionErrorException.cs b/Orm/Xtensive.Orm/Orm/Exceptions/ConnectionErrorException.cs index fbd20ed55a..d35c2991d8 100644 --- a/Orm/Xtensive.Orm/Orm/Exceptions/ConnectionErrorException.cs +++ b/Orm/Xtensive.Orm/Orm/Exceptions/ConnectionErrorException.cs @@ -11,7 +11,7 @@ namespace Xtensive.Orm { /// - /// An exception that is thrown when a connection error occured. + /// An exception that is thrown when a connection error occurred. /// [Serializable] public sealed class ConnectionErrorException : StorageException diff --git a/Orm/Xtensive.Orm/Orm/Exceptions/StorageExceptionInfo.cs b/Orm/Xtensive.Orm/Orm/Exceptions/StorageExceptionInfo.cs index 4879b0d990..6b85cf8502 100644 --- a/Orm/Xtensive.Orm/Orm/Exceptions/StorageExceptionInfo.cs +++ b/Orm/Xtensive.Orm/Orm/Exceptions/StorageExceptionInfo.cs @@ -20,11 +20,11 @@ namespace Xtensive.Orm public class StorageExceptionInfo { /// - /// Type in which error occured (if any). + /// Type in which error occurred (if any). /// public TypeInfo Type { get; private set; } /// - /// Field in which error occured (if any). + /// Field in which error occurred (if any). /// public FieldInfo Field { get; private set; } /// diff --git a/Orm/Xtensive.Orm/Orm/Session.Validation.cs b/Orm/Xtensive.Orm/Orm/Session.Validation.cs index 0e6cf49708..0a4473dc06 100644 --- a/Orm/Xtensive.Orm/Orm/Session.Validation.cs +++ b/Orm/Xtensive.Orm/Orm/Session.Validation.cs @@ -28,7 +28,7 @@ public partial class Session /// Validates all registered entities similar to method /// and returns all validation errors. /// - /// List errors occured during validation. + /// List errors occurred during validation. public IList ValidateAndGetErrors() => ValidationContext.ValidateAndGetErrors(); } } \ No newline at end of file diff --git a/Orm/Xtensive.Orm/Strings.Designer.cs b/Orm/Xtensive.Orm/Strings.Designer.cs index 284d869e30..bca638090a 100644 --- a/Orm/Xtensive.Orm/Strings.Designer.cs +++ b/Orm/Xtensive.Orm/Strings.Designer.cs @@ -7076,11 +7076,11 @@ internal static string SqlErrorDetailsX { } /// - /// Looks up a localized string similar to SQL error occured.. + /// Looks up a localized string similar to SQL error occurred.. /// internal static string SqlErrorOccured { get { - return ResourceManager.GetString("SqlErrorOccured", resourceCulture); + return ResourceManager.GetString("SqlErrorOccurred", resourceCulture); } } From 2f761fdf83fc00506f273e5aa88f2a10f699cac2 Mon Sep 17 00:00:00 2001 From: Sergei Pavlov Date: Wed, 27 Dec 2023 13:39:11 -0800 Subject: [PATCH 2/4] Recieved -> Received --- .../Issues/IssueJira0222_GroupByBooleanColumn.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Orm/Xtensive.Orm.Tests/Issues/IssueJira0222_GroupByBooleanColumn.cs b/Orm/Xtensive.Orm.Tests/Issues/IssueJira0222_GroupByBooleanColumn.cs index bd74201045..4a13d933bc 100644 --- a/Orm/Xtensive.Orm.Tests/Issues/IssueJira0222_GroupByBooleanColumn.cs +++ b/Orm/Xtensive.Orm.Tests/Issues/IssueJira0222_GroupByBooleanColumn.cs @@ -18,7 +18,7 @@ public class Message : Entity public int Id { get; private set; } [Field] - public bool IsRecieved { get; set; } + public bool IsReceived { get; set; } } } @@ -38,18 +38,18 @@ public void MainTest() { using (Domain.OpenSession()) { using (var t = Session.Current.OpenTransaction()) { - new Message {IsRecieved = true}; - new Message {IsRecieved = true}; - new Message {IsRecieved = false}; + new Message {IsReceived = true}; + new Message {IsReceived = true}; + new Message {IsReceived = false}; var result = Query.All() - .GroupBy(m => m.IsRecieved) + .GroupBy(m => m.IsReceived) .OrderBy(g => g.Key) - .Select(g => new {IsRecieved = g.Key, Count = g.Count()}) + .Select(g => new {IsReceived = g.Key, Count = g.Count()}) .ToList(); - var trueResult = result.Single(item => item.IsRecieved).Count; - var falseResult = result.Single(item => !item.IsRecieved).Count; + var trueResult = result.Single(item => item.IsReceived).Count; + var falseResult = result.Single(item => !item.IsReceived).Count; Assert.AreEqual(2, trueResult); Assert.AreEqual(1, falseResult); From 53a4ecc053bed259cbf048060a1207f39529a719 Mon Sep 17 00:00:00 2001 From: Sergei Pavlov Date: Wed, 27 Dec 2023 13:40:57 -0800 Subject: [PATCH 3/4] succesfully --- .../Sql.Drivers.SqlServer/InternalHelpers.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/InternalHelpers.cs b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/InternalHelpers.cs index bc767a3c27..4cdb6d094d 100644 --- a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/InternalHelpers.cs +++ b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/InternalHelpers.cs @@ -123,7 +123,7 @@ public static bool ShouldRetryOn(Exception ex) // The instance of SQL Server you attempted to connect to does not support encryption. case 20: return true; - // This exception can be thrown even if the operation completed succesfully, so it's safer to let the application fail. + // This exception can be thrown even if the operation completed successfully, so it's safer to let the application fail. // DBNETLIB Error Code: -2 // Timeout expired. The timeout period elapsed prior to completion of the operation or the server is not responding. The statement has been terminated. //case -2: From ae9e2641be1dc1dd957c2562aac51429e86030aa Mon Sep 17 00:00:00 2001 From: Sergei Pavlov Date: Wed, 27 Dec 2023 14:46:52 -0800 Subject: [PATCH 4/4] Correct spelling in .resx --- Orm/Xtensive.Orm/Strings.resx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Orm/Xtensive.Orm/Strings.resx b/Orm/Xtensive.Orm/Strings.resx index 730c44a495..0581d90422 100644 --- a/Orm/Xtensive.Orm/Strings.resx +++ b/Orm/Xtensive.Orm/Strings.resx @@ -681,8 +681,8 @@ Sequence '{0}' is not found in storage. - - SQL error occured. + + SQL error occurred. Storage error details '{0}'