Skip to content

Commit 91a5c40

Browse files
Ron Petrushamairaw
andauthored
Moved more enum member remarks (#2454)
* Moved enum member remarks * Corrected badly formed XML * Apply suggestions from code review Co-Authored-By: Maira Wenzel <[email protected]>
1 parent 0749045 commit 91a5c40

File tree

8 files changed

+76
-142
lines changed

8 files changed

+76
-142
lines changed

xml/System.Data.Common/CatalogLocation.xml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,8 @@
5959
</ReturnValue>
6060
<MemberValue>2</MemberValue>
6161
<Docs>
62-
<summary>Indicates that the position of the catalog name occurs after the schema portion of a fully qualified table name in a text command.</summary>
63-
<remarks>
64-
<format type="text/markdown"><![CDATA[
65-
66-
## Remarks
67-
The value of this field and the value of the Start field are mutually exclusive.
68-
69-
]]></format>
70-
</remarks>
62+
<summary>Indicates that the position of the catalog name occurs after the schema portion of a fully qualified table name in a text command. <c>End</c> and <c>Start</c> are mutually exclusive.</summary>
63+
<remarks>To be added.</remarks>
7164
<related type="Article" href="~/docs/framework/data/adonet/ado-net-overview.md">ADO.NET Overview</related>
7265
</Docs>
7366
</Member>
@@ -100,15 +93,8 @@
10093
</ReturnValue>
10194
<MemberValue>1</MemberValue>
10295
<Docs>
103-
<summary>Indicates that the position of the catalog name occurs before the schema portion of a fully qualified table name in a text command.</summary>
104-
<remarks>
105-
<format type="text/markdown"><![CDATA[
106-
107-
## Remarks
108-
The value of this field and the value of the End field are mutually exclusive.
109-
110-
]]></format>
111-
</remarks>
96+
<summary>Indicates that the position of the catalog name occurs before the schema portion of a fully qualified table name in a text command. <c>Start</c> and <c>End</c> are mutually exclusive. </summary>
97+
<remarks>To be added.</remarks>
11298
<related type="Article" href="~/docs/framework/data/adonet/ado-net-overview.md">ADO.NET Overview</related>
11399
</Docs>
114100
</Member>

xml/System.Data.Objects/MergeOption.xml

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,21 @@
1919
<format type="text/markdown"><![CDATA[
2020
2121
## Remarks
22-
The [!INCLUDE[adonet_ef](~/includes/adonet-ef-md.md)] only maintains a single instance of an object with a specific entity key in the cache. The <xref:System.Data.EntityKey> objects are immutable objects that represent object's identity. Entity keys are used to perform identity resolution in the object context. For more information, see [Working with Entity Keys](https://docs.microsoft.com/previous-versions/dotnet/netframework-4.0/dd283139(v=vs.100)). If an entity with the same identity is already being tracked, the data coming from the data source and the data already in the state manager are merged according to the <xref:System.Data.Objects.MergeOption> of the query.
22+
The Entity Framework only maintains a single instance of an object with a specific entity key in the cache. The <xref:System.Data.EntityKey> objects are immutable objects that represent object's identity. Entity keys are used to perform identity resolution in the object context. For more information, see [Working with Entity Keys](https://docs.microsoft.com/previous-versions/dotnet/netframework-4.0/dd283139(v=vs.100)). If an entity with the same identity is already being tracked, the data coming from the data source and the data already in the state manager are merged according to the <xref:System.Data.Objects.MergeOption> of the query.
23+
24+
### Additional information on `MergeOption.PreserveChanges`
25+
26+
If the state of the entity is <xref:System.Data.EntityState.Unchanged?displayProperty=nameWithType>, the current and original values in the entry are overwritten with data source values. The state of the entity remains <xref:System.Data.EntityState.Unchanged?displayProperty=nameWithType> and no properties are marked as modified.
27+
28+
If the state of the entity is <xref:System.Data.EntityState.Modified?displayProperty=nameWithType>, the current values of modified properties are not overwritten with data source values. The original values of unmodified properties are overwritten with the values from the data source.
29+
30+
In .NET Framework 4, the Entity Framework compares the current values of unmodified properties with the values that were returned from the data source. If the values are not the same, the property is marked as modified.
31+
32+
In .NET Framework 3.5 SP1, the Entity Framework does not mark the property as modified even if the value in the data source is different.
33+
34+
Only modified properties are persisted to the data source when you call <xref:System.Data.Objects.ObjectContext.SaveChanges%2A?displayProperty=nameWithType>.
35+
36+
To preserve the .NET Framework 3.5 SP1 behavior, set <xref:System.Data.Objects.ObjectContextOptions.UseLegacyPreserveChangesBehavior%2A?displayProperty=nameWithType> to `true`. The `PreserveChanges` option can be used to resolve optimistic concurrency exceptions while preserving changes in the local context. For more information, see [Saving Changes and Managing Concurrency](https://docs.microsoft.com/en-us/previous-versions/dotnet/netframework-4.0/bb738618(v=vs.100)).
2337
2438
]]></format>
2539
</remarks>
@@ -107,24 +121,7 @@
107121
<MemberValue>2</MemberValue>
108122
<Docs>
109123
<summary>Objects that do not exist in the object context are attached to the context.</summary>
110-
<remarks>
111-
<format type="text/markdown"><![CDATA[
112-
113-
## Remarks
114-
If the state of the entity is <xref:System.Data.EntityState.Unchanged>, the current and original values in the entry are overwritten with data source values. The state of the entity remains <xref:System.Data.EntityState.Unchanged> and no properties are marked as modified.
115-
116-
If the state of the entity is <xref:System.Data.EntityState.Modified>, the current values of modified properties are not overwritten with data source values. The original values of unmodified properties are overwritten with the values from the data source.
117-
118-
In the [!INCLUDE[dnprdnshort](~/includes/dnprdnshort-md.md)] version 4, the [!INCLUDE[adonet_ef](~/includes/adonet-ef-md.md)] compares the current values of unmodified properties with the values that were returned from the data source. If the values are not the same, the property is marked as modified.
119-
120-
In the [!INCLUDE[dnprdnshort](~/includes/dnprdnshort-md.md)] version 3.5 SP1, the [!INCLUDE[adonet_ef](~/includes/adonet-ef-md.md)] does not mark the property as modified, even if the value in the data source is different.
121-
122-
Only modified properties are persisted to the data source when you call <xref:System.Data.Objects.ObjectContext.SaveChanges%2A>.
123-
124-
To preserve the 3.5 SP1 behavior, set <xref:System.Data.Objects.ObjectContextOptions.UseLegacyPreserveChangesBehavior%2A> to `true`. The PreserveChanges option can be used to resolve optimistic concurrency exceptions while preserving changes in the local context. For more information, see [Saving Changes and Managing Concurrency](https://msdn.microsoft.com/library/b8378601-4f26-4a05-a24a-f50aeb68610e).
125-
126-
]]></format>
127-
</remarks>
124+
<remarks>To be added.</remarks>
128125
</Docs>
129126
</Member>
130127
</Members>

xml/System.Data.OleDb/OleDbType.xml

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -415,15 +415,11 @@
415415
</ReturnValue>
416416
<MemberValue>9</MemberValue>
417417
<Docs>
418-
<summary>A pointer to an <see langword="IDispatch" /> interface (DBTYPE_IDISPATCH). This maps to <see cref="T:System.Object" />.</summary>
419-
<remarks>
420-
<format type="text/markdown"><![CDATA[
421-
422-
## Remarks
423-
This data type is not currently supported by ADO.NET. Usage may cause unpredictable results.
424-
425-
]]></format>
426-
</remarks>
418+
<summary>A pointer to an <see langword="IDispatch" /> interface (DBTYPE_IDISPATCH). This maps to <see cref="T:System.Object" />.
419+
420+
This data type is not currently supported by ADO.NET. Its usage may cause unpredictable results.
421+
</summary>
422+
<remarks>To be added.</remarks>
427423
</Docs>
428424
</Member>
429425
<Member MemberName="Integer">
@@ -469,15 +465,10 @@
469465
</ReturnValue>
470466
<MemberValue>13</MemberValue>
471467
<Docs>
472-
<summary>A pointer to an <see langword="IUnknown" /> interface (DBTYPE_UNKNOWN). This maps to <see cref="T:System.Object" />.</summary>
473-
<remarks>
474-
<format type="text/markdown"><![CDATA[
475-
476-
## Remarks
477-
This data type is not currently supported by ADO.NET. Usage may cause unpredictable results.
478-
479-
]]></format>
480-
</remarks>
468+
<summary>A pointer to an <see langword="IUnknown" /> interface (DBTYPE_UNKNOWN). This maps to <see cref="T:System.Object" />.
469+
This data type is not currently supported by ADO.NET. Its usage may cause unpredictable results.
470+
</summary>
471+
<remarks>To be added.</remarks>
481472
</Docs>
482473
</Member>
483474
<Member MemberName="LongVarBinary">

xml/System.Data.OracleClient/OracleType.xml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -324,15 +324,11 @@
324324
</ReturnValue>
325325
<MemberValue>9</MemberValue>
326326
<Docs>
327-
<summary>An Oracle <see langword="LONGRAW" /> data type that contains variable-length binary data with a maximum size of 2 gigabytes. Use the .NET Framework <see langword="Byte[]" /> or OracleClient <see cref="T:System.Data.OracleClient.OracleBinary" /> data type in <see cref="P:System.Data.OracleClient.OracleParameter.Value" />.</summary>
328-
<remarks>
329-
<format type="text/markdown"><![CDATA[
330-
331-
## Remarks
332-
When you update a column with the `LONG RAW` data type, an exception is thrown when you enter a value of `NULL` in the column. The Oracle `LONG RAW` data type is a deprecated type in Oracle version 8.0. To avoid this error, use the `BLOB` data type instead of `LONG RAW`.
333-
334-
]]></format>
335-
</remarks>
327+
<summary>An Oracle <see langword="LONGRAW" /> data type that contains variable-length binary data with a maximum size of 2 gigabytes. Use the .NET Framework <see langword="Byte[]" /> or OracleClient <see cref="T:System.Data.OracleClient.OracleBinary" /> data type in <see cref="P:System.Data.OracleClient.OracleParameter.Value" />.
328+
329+
When you update a column with the <c>LONG RAW</c> data type, an exception is thrown when you enter a value of <c>NULL</c> in the column. The Oracle <c>LONG RAW</c> data type is a deprecated type in Oracle version 8.0. To avoid this error, use the <c>BLOB</c> data type instead of <c>LONG RAW</c>.
330+
</summary>
331+
<remarks>To be added.</remarks>
336332
</Docs>
337333
</Member>
338334
<Member MemberName="LongVarChar">

xml/System.Data/CommandBehavior.xml

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,21 @@
3838
<format type="text/markdown"><![CDATA[
3939
4040
## Remarks
41-
The <xref:System.Data.CommandBehavior> values are used by the <xref:System.Data.IDbCommand.ExecuteReader%2A> method of <xref:System.Data.IDbCommand> and any classes derived from it.
41+
The `CommandBehavior` values are used by the <xref:System.Data.IDbCommand.ExecuteReader%2A> method of <xref:System.Data.IDbCommand> and any implementing classes.
4242
4343
A bitwise combination of these values may be used.
4444
45-
<xref:System.Data.CommandBehavior> is ignored when used to define a <xref:System.Data.Sql.SqlNotificationRequest> or <xref:System.Data.SqlClient.SqlDependency> and should therefore not be used. Use the constructor that does not require a `CommandBehavior` parameter in these two cases.
46-
45+
`CommandBehavior` is ignored when used to define a <xref:System.Data.Sql.SqlNotificationRequest> or <xref:System.Data.SqlClient.SqlDependency> and should therefore not be used. Use the constructor that does not require a `CommandBehavior` parameter in these two cases.
46+
47+
### Notes on individual enumeration members
48+
49+
When using `KeyInfo`, the .NET Framework Data Provider for SQL Server precedes the statement being executed with `SET FMTONLY OFF` and `SET NO_BROWSETABLE ON`. The user should be aware of potential side effects, such as interference with the use of `SET FMTONLY ON` statements. For more information, see [SET FMTONLY (Transact-SQL)](/sql/t-sql/statements/set-fmtonly-transact-sql).
50+
4751
> [!NOTE]
48-
> Use SequentialAccess to retrieve large values and binary data. Otherwise, an <xref:System.OutOfMemoryException> might occur and the connection will be closed.
49-
52+
> Use `SequentialAccess` to retrieve large values and binary data. Otherwise, an <xref:System.OutOfMemoryException> might occur and the connection will be closed.
53+
54+
When you specify `SequentialAccess`, you are required to read from the columns in the order they are returned, although you are not required to read each column. Once you have read past a location in the returned stream of data, data at or before that location can no longer be read from the `DataReader`. When using the <xref:System.Data.OleDb.OleDbDataReader>, you can reread the current column value until reading past it. When using the <xref:System.Data.SqlClient.SqlDataReader>, you can read a column value only once.
55+
5056
]]></format>
5157
</remarks>
5258
</Docs>
@@ -153,17 +159,8 @@
153159
</ReturnValue>
154160
<MemberValue>4</MemberValue>
155161
<Docs>
156-
<summary>The query returns column and primary key information.</summary>
157-
<remarks>
158-
<format type="text/markdown"><![CDATA[
159-
160-
## Remarks
161-
When KeyInfo is used for command execution, the provider will append extra columns to the result set for existing primary key and timestamp columns.
162-
163-
When using KeyInfo, the .NET Framework Data Provider for SQL Server precedes the statement being executed with SET FMTONLY OFF and SET NO_BROWSETABLE ON. The user should be aware of potential side effects, such as interference with the use of SET FMTONLY ON statements. For more information, see [SET FMTONLY (Transact-SQL)](/sql/t-sql/statements/set-fmtonly-transact-sql).
164-
165-
]]></format>
166-
</remarks>
162+
<summary>The query returns column and primary key information. The provider appends extra columns to the result set for existing primary key and timestamp columns.</summary>
163+
<remarks>To be added.</remarks>
167164
</Docs>
168165
</Member>
169166
<Member MemberName="SchemaOnly">
@@ -234,14 +231,7 @@
234231
<MemberValue>16</MemberValue>
235232
<Docs>
236233
<summary>Provides a way for the <see langword="DataReader" /> to handle rows that contain columns with large binary values. Rather than loading the entire row, <see langword="SequentialAccess" /> enables the <see langword="DataReader" /> to load data as a stream. You can then use the <see langword="GetBytes" /> or <see langword="GetChars" /> method to specify a byte location to start the read operation, and a limited buffer size for the data being returned.</summary>
237-
<remarks>
238-
<format type="text/markdown"><![CDATA[
239-
240-
## Remarks
241-
When you specify `SequentialAccess`, you are required to read from the columns in the order they are returned, although you are not required to read each column. Once you have read past a location in the returned stream of data, data at or before that location can no longer be read from the `DataReader`. When using the <xref:System.Data.OleDb.OleDbDataReader>, you can reread the current column value until reading past it. When using the <xref:System.Data.SqlClient.SqlDataReader>, you can read a column value only once.
242-
243-
]]></format>
244-
</remarks>
234+
<remarks>To be added.</remarks>
245235
</Docs>
246236
</Member>
247237
<Member MemberName="SingleResult">

xml/System.Data/IsolationLevel.xml

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,14 @@
3737
<remarks>
3838
<format type="text/markdown"><![CDATA[
3939
40-
## Remarks
41-
The <xref:System.Data.IsolationLevel> values are used by a .NET Framework data provider when performing a transaction.
42-
43-
The <xref:System.Data.IsolationLevel> remains in effect until explicitly changed, but it can be changed at any time. The new value is used at execution time, not parse time. If changed during a transaction, the expected behavior of the server is to apply the new locking level to all statements remaining.
44-
45-
46-
40+
## Remarks
41+
42+
The `IsolationLevel` values are used by a .NET data provider when performing a transaction.
43+
44+
The `IsolationLevel` remains in effect until explicitly changed, but it can be changed at any time. The new value is used at execution time, not parse time. If changed during a transaction, the expected behavior of the server is to apply the new locking level to all statements remaining.
45+
46+
When using <xref:System.Data.Odbc.OdbcTransaction>, if you do not set <xref:System.Data.Odbc.OdbcTransaction.IsolationLevel?displayProperty=nameWithType> or you set it to `Unspecified`, the transaction executes according to the isolation level determined by the driver in use.
47+
4748
## Examples
4849
This application demonstrates how to use <xref:System.Data.IsolationLevel> in <xref:System.Data.Common.DbTransaction>. The sample will demonstrate which of the following behaviors are allowed in the different isolation levels:
4950
@@ -388,15 +389,8 @@
388389
<MemberValue>-1</MemberValue>
389390
<Docs>
390391
<summary>A different isolation level than the one specified is being used, but the level cannot be determined.</summary>
391-
<remarks>
392-
<format type="text/markdown"><![CDATA[
393-
394-
## Remarks
395-
When using <xref:System.Data.Odbc.OdbcTransaction>, if you do not set <xref:System.Data.IsolationLevel> or you set <xref:System.Data.IsolationLevel> to `Unspecified`, the transaction executes according to the isolation level that is determined by the driver that is being used.
396-
397-
]]></format>
398-
</remarks>
392+
<remarks>To be added.</remarks>
399393
</Docs>
400394
</Member>
401395
</Members>
402-
</Type>
396+
</Type>

0 commit comments

Comments
 (0)