Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Contributing: fix typos #397

Merged
merged 1 commit into from
Jan 24, 2020
Merged

Contributing: fix typos #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Microsoft.Data.SqlClient/netcore/src/Resources/SR.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/Microsoft.Data.SqlClient/netcore/src/Resources/SR.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1690,10 +1690,10 @@
<value>Internal Error. The given key id '{0}' is not valid. Error occurred when converting the key id to unsigned short. Error Message: {1}</value>
</data>
<data name="TCE_NoAttestationUrlSpecifiedForEnclaveBasedQueryGeneratingEnclavePackage" xml:space="preserve">
<value>Error occured when generating enclave package. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{0}'.</value>
<value>Error occurred when generating enclave package. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{0}'.</value>
</data>
<data name="TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe" xml:space="preserve">
<value>Error occured when reading '{0}' resultset. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{1}'.</value>
<value>Error occurred when reading '{0}' resultset. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{1}'.</value>
</data>
<data name="TCE_NotSupportedByServer" xml:space="preserve">
<value>{0} instance in use does not support column encryption.</value>
Expand Down Expand Up @@ -1849,7 +1849,7 @@
<value>Failed to initialize connection. The attestation protocol '{0}' does not support the enclave type '{1}'.</value>
</data>
<data name="TCE_AttestationProtocolNotSpecifiedForGeneratingEnclavePackage" xml:space="preserve">
<value>Error occured when generating enclave package. Attestation Protocol has not been specified in the connection string, but the query requires enclave computations.</value>
<value>Error occurred when generating enclave package. Attestation Protocol has not been specified in the connection string, but the query requires enclave computations.</value>
</data>
<data name="SQLUDT_InvalidSize" xml:space="preserve">
<value>UDT size must be less than {1}, size: {0}</value>
Expand Down
2 changes: 1 addition & 1 deletion ...ft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionTimeoutErrorInternal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ internal string GetErrorMessage()
// In all other cases, it will default to the original error message.
if ((currentPhase != SqlConnectionTimeoutErrorPhase.Undefined) && (currentPhase != SqlConnectionTimeoutErrorPhase.Complete))
{
// NOTE: In case of a failover scenario, add a string that this failure occured as part of the primary or secondary server
// NOTE: In case of a failover scenario, add a string that this failure occurred as part of the primary or secondary server
if (isFailoverScenario)
{
errorBuilder.Append(" ");
Expand Down
8 changes: 4 additions & 4 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ internal int ObjectID
internal volatile bool _attentionSent = false; // true if we sent an Attention to the server
internal bool _attentionReceived = false; // NOTE: Received is not volatile as it is only ever accessed\modified by TryRun its callees (i.e. single threaded access)
internal volatile bool _attentionSending = false;
internal bool _internalTimeout = false; // an internal timeout occured
internal bool _internalTimeout = false; // an internal timeout occurred
private readonly LastIOTimer _lastSuccessfulIOTimer;

// secure password information to be stored
Expand Down Expand Up @@ -206,7 +206,7 @@ internal int ObjectID
internal object _errorAndWarningsLock = new object();
private bool _hasErrorOrWarning = false;

// local exceptions to cache warnings and errors that occured prior to sending attention
// local exceptions to cache warnings and errors that occurred prior to sending attention
internal SqlErrorCollection _preAttentionErrors;
internal SqlErrorCollection _preAttentionWarnings;

Expand Down Expand Up @@ -3549,7 +3549,7 @@ private Task WriteSni(bool canAccumulate)
Debug.Assert(Parser.Connection._parserLock.ThreadMayHaveLock(), "Thread is writing without taking the connection lock");
Task task = SNIWritePacket(Handle, packet, out sniError, canAccumulate, callerHasConnectionLock: true);

// Check to see if the timeout has occured. This time out code is special case code to allow BCP writes to timeout to fix bug 350558, eventually we should make all writes timeout.
// Check to see if the timeout has occurred. This time out code is special case code to allow BCP writes to timeout to fix bug 350558, eventually we should make all writes timeout.
if (_bulkCopyOpperationInProgress && 0 == GetTimeoutRemaining())
{
_parser.Connection.ThreadHasParserLockForClose = true;
Expand Down Expand Up @@ -3895,7 +3895,7 @@ internal SqlErrorCollection GetFullErrorAndWarningCollection(out bool broken)
_errors = null;
_warnings = null;

// We also process the pre-attention error lists here since, if we are here and they are populated, then an error occured while sending attention so we should show the errors now (otherwise they'd be lost)
// We also process the pre-attention error lists here since, if we are here and they are populated, then an error occurred while sending attention so we should show the errors now (otherwise they'd be lost)
AddErrorsToCollection(_preAttentionErrors, ref allErrors, ref broken);
AddErrorsToCollection(_preAttentionWarnings, ref allErrors, ref broken);
_preAttentionErrors = null;
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlTypes/SqlFileStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ Int64 allocationSize
//-----------------------------------------------------------------

// normalize the provided path
// * compress path to remove any occurences of '.' or '..'
// * compress path to remove any occurrences of '.' or '..'
// * trim whitespace from the beginning and end of the path
// * ensure that the path starts with '\\'
// * ensure that the path does not start with '\\.\'
Expand Down
10 changes: 5 additions & 5 deletions src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2722,7 +2722,7 @@
<value>Connection Timeout Expired. The timeout period elapsed during the post-login phase. The connection could have timed out while waiting for server to complete the login process and respond; Or it could have timed out while attempting to create multiple active connections.</value>
</data>
<data name="SQL_Timeout_FailoverInfo" xml:space="preserve">
<value>This failure occured while attempting to connect to the {0} server.</value>
<value>This failure occurred while attempting to connect to the {0} server.</value>
</data>
<data name="SQL_Timeout_RoutingDestinationInfo" xml:space="preserve">
<value>This failure occurred while attempting to connect to the routing destination. The duration spent while attempting to connect to the original server was - [Pre-Login] initialization={0}; handshake={1}; [Login] initialization={2}; authentication={3}; [Post-Login] complete={4}; </value>
Expand Down Expand Up @@ -3964,7 +3964,7 @@
<value>A transport-level error has occurred while sending information to the server.</value>
</data>
<data name="Snix_ProcessSspi" xml:space="preserve">
<value>A transport-level error has occured during SSPI handshake.</value>
<value>A transport-level error has occurred during SSPI handshake.</value>
</data>
<data name="LocalDB_CreateFailed" xml:space="preserve">
<value>Local Database Runtime: Cannot create named instance.</value>
Expand Down Expand Up @@ -4309,10 +4309,10 @@
<value>Internal Error. SqlColumnEncryptionEnclaveProviderName cannot be null or empty.</value>
</data>
<data name="TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe" xml:space="preserve">
<value>Error occured when reading '{0}' resultset. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{1}'. </value>
<value>Error occurred when reading '{0}' resultset. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{1}'. </value>
</data>
<data name="TCE_NoAttestationUrlSpecifiedForEnclaveBasedQueryGeneratingEnclavePackage" xml:space="preserve">
<value>Error occured when generating enclave package. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{0}'. </value>
<value>Error occurred when generating enclave package. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{0}'. </value>
</data>
<data name="TCE_EnclaveTypeNullForEnclaveBasedQuery" xml:space="preserve">
<value>Internal Error. Enclave type received from SQL Server is null or empty when executing a query requiring enclave computations.</value>
Expand Down Expand Up @@ -4516,6 +4516,6 @@
<value>Failed to initialize connection. The attestation protocol '{0}' does not support the enclave type '{1}'.</value>
</data>
<data name="TCE_AttestationProtocolNotSpecifiedForGeneratingEnclavePackage" xml:space="preserve">
<value>Error occured when generating enclave package. Attestation Protocol has not been specified in the connection string, but the query requires enclave computations.</value>
<value>Error occurred when generating enclave package. Attestation Protocol has not been specified in the connection string, but the query requires enclave computations.</value>
</data>
</root>
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDSServerEndPoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public void Start()
}
catch (Exception e)
{
Log($"{GetType().Name} {EndpointName} Error occured while testing server endpoint {e.Message}");
Log($"{GetType().Name} {EndpointName} Error occurred while testing server endpoint {e.Message}");
throw;
}
}
Expand Down