Skip to content

Commit 0eef270

Browse files
committed
More include consolidation and fixes
1 parent aef8574 commit 0eef270

163 files changed

Lines changed: 208 additions & 219 deletions

File tree

Some content is hidden

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

docs/ado/reference/ado-api/execute-method-ado-connection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Set recordset = connection.Execute (CommandText, RecordsAffected, Options)
3737

3838
#### Parameters
3939
*CommandText*
40-
A **String** value that contains the SQL statement, stored procedure, a URL, or provider-specific text to execute. **Optionally**, table names can be used but only if the provider is SQL aware. For example if a table name of "Customers" is used, ADO will automatically prepend the standard SQL Select syntax to form and pass "SELECT * FROM Customers" as a [!INCLUDE[tsql](../../../includes/tsql_md.md)] statement to the provider.
40+
A **String** value that contains the SQL statement, stored procedure, a URL, or provider-specific text to execute. **Optionally**, table names can be used but only if the provider is SQL aware. For example if a table name of "Customers" is used, ADO will automatically prepend the standard SQL Select syntax to form and pass "SELECT * FROM Customers" as a [!INCLUDE[tsql](../../../includes/tsql-md.md)] statement to the provider.
4141

4242
*RecordsAffected*
4343
Optional. A **Long** variable to which the provider returns the number of records that the operation affected.

docs/ado/reference/rds-api/execute-method-rds.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ object.Execute(ConnectionString As String, HandlerString As String, QueryString
3939
A two-part string that identifies the handler to be used with this execution. The string contains two parts. The first part contains the name (ProgID) of the handler to be used. The second part contains arguments to be passed to the handler. The details of how the arguments string is interpreted are specific to each handler. The two parts are separated by the first instance of a comma in the string. The arguments string can contain additional commas. The arguments are optional.
4040

4141
*QueryString*
42-
A command in the command language supported by the OLE DB provider identified in the connection string. For SQL-based providers, *QueryString* might contain a Transact-SQL command statement, but for non-SQL providers (for example, MSDataShape) this may not be a [!INCLUDE[tsql](../../../includes/tsql_md.md)] query statement.
42+
A command in the command language supported by the OLE DB provider identified in the connection string. For SQL-based providers, *QueryString* might contain a Transact-SQL command statement, but for non-SQL providers (for example, MSDataShape) this may not be a [!INCLUDE[tsql](../../../includes/tsql-md.md)] query statement.
4343

4444
If a handler is being used, the handler can alter or replace the value specified here. For example, the handler typically replaces *QueryString* with a query string from its .ini file. By default, the Msdfmap.ini file is used.
4545

docs/ado/reference/rds-api/execute21-method-rds.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ object.Execute21(ConnectionString As String, HandlerString As String, QueryStrin
3939
The string identifies the handler to be used with this execution. The string contains two parts. The first part contains the name (ProgID) of the handler to be used. The second part of the string contains arguments to be passed to the handler. How the arguments string is interpreted is handler specific. The two parts are separated by the first instance of a comma in the string (although the arguments string can contain additional commas). The arguments are optional.
4040

4141
*QueryString*
42-
A command in the command language supported by the OLE DB provider identified in the connection string. For SQL-based providers, it might contain a [!INCLUDE[tsql](../../../includes/tsql_md.md)] command statement, but for non-SQL providers (for example, MSDataShape) this may not be a [!INCLUDE[tsql](../../../includes/tsql_md.md)] query statement.
42+
A command in the command language supported by the OLE DB provider identified in the connection string. For SQL-based providers, it might contain a [!INCLUDE[tsql](../../../includes/tsql-md.md)] command statement, but for non-SQL providers (for example, MSDataShape) this may not be a [!INCLUDE[tsql](../../../includes/tsql-md.md)] query statement.
4343

4444
Also, if a handler is being used (and it is highly recommended that a handler be used), the handler can alter or replace the value specified here. For example, the handler typically replaces *QueryString* with a query string from its .ini file. By default, the Msdfmap.ini file is used.
4545

docs/connect/jdbc/accessing-diagnostic-information-in-the-extended-events-log.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ com.microsoft.sqlserver.jdbc.traceactivity = on
3737

3838
For more information, see [Tracing Driver Operation](../../connect/jdbc/tracing-driver-operation.md). This trace flag is used with corresponding JDBC object loggers to decide whether to trace and send the ActivityId in the JDBC driver. In addition to updating the Logging.Properties file, the logger com.microsoft.sqlserver.jdbc needs to be enabled at FINER or higher. If you want to send ActivityId to the server for requests that are made by a particular class, the corresponding class logger needs to be enabled at FINER or FINEST. For example, if the class is, SQLServerStatement, enable the logger com.microsoft.sqlserver.jdbc.SQLServerStatement.
3939

40-
The following sample uses [!INCLUDE[tsql](../../includes/tsql_md.md)] to start an extended events session that will be stored in a ring buffer and will record the activity ID sent from a client on RPC and batch operations:
40+
The following sample uses [!INCLUDE[tsql](../../includes/tsql-md.md)] to start an extended events session that will be stored in a ring buffer and will record the activity ID sent from a client on RPC and batch operations:
4141

4242
```sql
4343
create event session MySession on server

docs/connect/jdbc/reference/setmaxrows-method-sqlserverstatement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public final void setMaxRows(int max)
4545

4646
This setMaxRows method has no effect for dynamic scrollable cursors. The application should use SELECT TOP N SQL syntax to limit the number of rows returned from potentially large result sets.
4747

48-
When the setMaxRows method is called, the [!INCLUDE[jdbcNoVersion](../../../includes/jdbcnoversion_md.md)] executes the SET ROWCOUNT SQL statement when it runs the application's query. This causes the JDBC driver to limit the maximum number of rows affected by all the [!INCLUDE[tsql](../../../includes/tsql_md.md)] statements executed by that query, not just the number of rows returned by that query. If the application needs to set a limit only on the top-level [SQLServerResultSet](../../../connect/jdbc/reference/sqlserverresultset-class.md) object, it should use SELECT TOP N SQL syntax in the query instead of the setMaxRows method.
48+
When the setMaxRows method is called, the [!INCLUDE[jdbcNoVersion](../../../includes/jdbcnoversion_md.md)] executes the SET ROWCOUNT SQL statement when it runs the application's query. This causes the JDBC driver to limit the maximum number of rows affected by all the [!INCLUDE[tsql](../../../includes/tsql-md.md)] statements executed by that query, not just the number of rows returned by that query. If the application needs to set a limit only on the top-level [SQLServerResultSet](../../../connect/jdbc/reference/sqlserverresultset-class.md) object, it should use SELECT TOP N SQL syntax in the query instead of the setMaxRows method.
4949

5050
For more information about the SET ROWCOUNT SQL statement, see the "[SET ROWCOUNT (Transact-SQL)](http://go.microsoft.com/fwlink/?LinkId=139522)" topic in [!INCLUDE[ssNoVersion](../../../includes/ssnoversion_md.md)] Books Online.
5151

docs/connect/jdbc/supporting-xml-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ manager: craigg
1818
# Supporting XML Data
1919
[!INCLUDE[Driver_JDBC_Download](../../includes/driver_jdbc_download.md)]
2020

21-
[!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] provides an **xml** data type that lets you store XML documents and fragments in a [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] database. The **xml** data type is a built-in data type in [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)], and is in some ways similar to other built-in types, such as **int** and **varchar**. Like other built-in types, you can use the **xml** data type as: a variable type, a parameter type, a function-return type, or a column type when you create a table; or in [!INCLUDE[tsql](../../includes/tsql_md.md)] CAST and CONVERT functions. In the JDBC driver, the **xml** data type can be mapped as a String, byte array, stream, CLOB, BLOB, or SQLXML object. String is the default mapping.
21+
[!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] provides an **xml** data type that lets you store XML documents and fragments in a [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] database. The **xml** data type is a built-in data type in [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)], and is in some ways similar to other built-in types, such as **int** and **varchar**. Like other built-in types, you can use the **xml** data type as: a variable type, a parameter type, a function-return type, or a column type when you create a table; or in [!INCLUDE[tsql](../../includes/tsql-md.md)] CAST and CONVERT functions. In the JDBC driver, the **xml** data type can be mapped as a String, byte array, stream, CLOB, BLOB, or SQLXML object. String is the default mapping.
2222

2323
The JDBC driver provides support for the JDBC 4.0 API, which introduces the SQLXML interface. The SQLXML interface defines methods to interact with and manipulate XML data. The **SQLXML** is a JDBC 4.0 data type and it maps to the [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)]**xml** data type. Therefore, in order to use the SQLXML data type in your applications, you must set the classpath to include the sqljdbc4.jar file. If the application tries to use the sqljdbc3.jar when accessing the SQLXML object and its methods, an exception is thrown.
2424

docs/connect/jdbc/tracing-driver-operation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ manager: craigg
9090
|TDS.Channel|This category traces actions of the TCP communications channel with SQL Server. The logged messages include socket opening and closing as well as reads and writes. It also traces messages related to establishing a Secure Sockets Layer (SSL) connection with SQL Server.<br /><br /> This category can only be enabled by setting the logging level to FINE, FINER, or FINEST.|
9191
|TDS.Writer|This category traces writes to the TDS channel. Note that only the length of the writes is traced, not the contents. This category also traces issues when an attention signal is sent to the server to cancel a statement's execution.<br /><br /> This category can only be enabled by setting the logging level to FINEST.|
9292
|TDS.Reader|This category traces certain read operations from the TDS channel at the FINEST level. At the FINEST level, tracing can be verbose. At WARNING and SEVERE levels, this category traces when the driver receives an invalid TDS protocol from SQL Server before the driver closes the connection.<br /><br /> This category can only be enabled by setting the logging level to FINER and FINEST.|
93-
|TDS.Command|This category traces low-level state transitions and other information associated with executing TDS commands, such as [!INCLUDE[tsql](../../includes/tsql_md.md)] statement executions, ResultSet cursor fetches, commits, and so on.<br /><br /> This category can only be enabled by setting the logging level to FINEST.|
93+
|TDS.Command|This category traces low-level state transitions and other information associated with executing TDS commands, such as [!INCLUDE[tsql](../../includes/tsql-md.md)] statement executions, ResultSet cursor fetches, commits, and so on.<br /><br /> This category can only be enabled by setting the logging level to FINEST.|
9494
|TDS.TOKEN|This category logs only the tokens within the TDS packets, and is less verbose than the TDS.DATA category. It can only be enabled by setting the logging level to FINEST.<br /><br /> At the FINEST level, this category traces TDS tokens as they're processed in the response. At the SEVERE level, this category traces when an invalid TDS token is encountered.|
9595
|SQLServerDatabaseMetaData|Logs messages in the [SQLServerDatabaseMetaData](../../connect/jdbc/reference/sqlserverdatabasemetadata-class.md) class. The applications can set the logging level as FINE.|
9696
|SQLServerResultSetMetaData|Logs messages in the [SQLServerResultSetMetaData](../../connect/jdbc/reference/sqlserverresultsetmetadata-class.md) class. The applications can set the logging level as FINE.|

docs/connect/jdbc/understanding-xa-transactions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,15 +147,15 @@ When you install a new version of the JDBC driver, you should also use sqljdbc_x
147147
> [!IMPORTANT]
148148
> You should upgrade sqljdbc_xa.dll during a maintenance window or when there are no MS DTC transactions in process.
149149

150-
1. Unload sqljdbc_xa.dll using the [!INCLUDE[tsql](../../includes/tsql_md.md)] command **DBCC sqljdbc_xa (FREE)**.
150+
1. Unload sqljdbc_xa.dll using the [!INCLUDE[tsql](../../includes/tsql-md.md)] command **DBCC sqljdbc_xa (FREE)**.
151151

152152
2. Copy the new sqljdbc_xa.dll from the JDBC driver installation directory to the Binn directory of every [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] computer that will participate in distributed transactions.
153153

154154
The new DLL will be loaded when an extended procedure in sqljdbc_xa.dll is called. You don't need to restart [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] to load the new definitions.
155155

156156
### Configuring the User-Defined Roles
157157

158-
To grant permissions to a specific user to participate in distributed transactions with the JDBC driver, add the user to the SqlJDBCXAUser role. For example, use the following [!INCLUDE[tsql](../../includes/tsql_md.md)] code to add a user named 'shelby' (SQL standard login user named 'shelby') to the SqlJDBCXAUser role:
158+
To grant permissions to a specific user to participate in distributed transactions with the JDBC driver, add the user to the SqlJDBCXAUser role. For example, use the following [!INCLUDE[tsql](../../includes/tsql-md.md)] code to add a user named 'shelby' (SQL standard login user named 'shelby') to the SqlJDBCXAUser role:
159159

160160
```sql
161161
USE master

docs/connect/jdbc/using-advanced-data-types.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The JDBC driver implements all the methods of the java.sql.Blob, java.sql.Clob,
4646
4747
## Large Value Data Types
4848

49-
In earlier versions of [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)], working with large-value data types required special handling. Large-value data types are those that exceed the maximum row size of 8 KB. [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] introduces a max specifier for **varchar**, **nvarchar**, and **varbinary** data types to allow storage of values as large as 2^31 bytes. Table columns and [!INCLUDE[tsql](../../includes/tsql_md.md)] variables can specify **varchar(max)**, **nvarchar(max)**, or **varbinary(max)** data types.
49+
In earlier versions of [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)], working with large-value data types required special handling. Large-value data types are those that exceed the maximum row size of 8 KB. [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] introduces a max specifier for **varchar**, **nvarchar**, and **varbinary** data types to allow storage of values as large as 2^31 bytes. Table columns and [!INCLUDE[tsql](../../includes/tsql-md.md)] variables can specify **varchar(max)**, **nvarchar(max)**, or **varbinary(max)** data types.
5050

5151
The primary scenarios for working with large-value types involve retrieving them from a database, or adding them to a database. The following sections describe different approaches to accomplish these tasks.
5252

@@ -117,7 +117,7 @@ try (PreparedStatement pstmt = con.prepareStatement("INSERT INTO test1 (Col1, Co
117117
118118
### Modifying Large-Value Types in a Database
119119

120-
In most cases, the recommended method for updating or modifying large values on the database is to pass parameters through the [SQLServerPreparedStatement](../../connect/jdbc/reference/sqlserverpreparedstatement-class.md) and [SQLServerCallableStatement](../../connect/jdbc/reference/sqlservercallablestatement-class.md) classes by using [!INCLUDE[tsql](../../includes/tsql_md.md)] commands like `UPDATE`, `WRITE`, and `SUBSTRING`.
120+
In most cases, the recommended method for updating or modifying large values on the database is to pass parameters through the [SQLServerPreparedStatement](../../connect/jdbc/reference/sqlserverpreparedstatement-class.md) and [SQLServerCallableStatement](../../connect/jdbc/reference/sqlservercallablestatement-class.md) classes by using [!INCLUDE[tsql](../../includes/tsql-md.md)] commands like `UPDATE`, `WRITE`, and `SUBSTRING`.
121121

122122
If you have to replace the instance of a word in a large text file, such as an archived HTML file, you can use a Clob object, as in the following:
123123

@@ -141,7 +141,7 @@ For more information about large-value types, see "Using Large-Value Types" in S
141141

142142
## XML Data Type
143143

144-
[!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] provides an **xml** data type that lets you store XML documents and fragments in a [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] database. The **xml** data type is a built-in data type in [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)], and is in some ways similar to other built-in types, such as **int** and **varchar**. As with other built-in types, you can use the **xml** data type as a column type when you create a table; as a variable type, a parameter type, or a function-return type; or in [!INCLUDE[tsql](../../includes/tsql_md.md)] CAST and CONVERT functions.
144+
[!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] provides an **xml** data type that lets you store XML documents and fragments in a [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] database. The **xml** data type is a built-in data type in [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)], and is in some ways similar to other built-in types, such as **int** and **varchar**. As with other built-in types, you can use the **xml** data type as a column type when you create a table; as a variable type, a parameter type, or a function-return type; or in [!INCLUDE[tsql](../../includes/tsql-md.md)] CAST and CONVERT functions.
145145

146146
In the JDBC driver, the **xml** data type can be mapped as a String, byte array, stream, CLOB, BLOB, or SQLXML object. String is the default. Starting with the JDBC Driver version 2.0, the JDBC driver provides support for the JDBC 4.0 API, which introduces the SQLXML interface. The SQLXML interface defines methods to interact and manipulate XML data. The **SQLXML** data type maps to the [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)]**xml** data type. For more information about how to read and write XML data from and to the relational database with the **SQLXML** Java data type, see [Supporting XML Data](../../connect/jdbc/supporting-xml-data.md).
147147

@@ -161,7 +161,7 @@ For more information about the **xml** data type, see "xml Data Type" in [!INCLU
161161

162162
The introduction of user-defined types (UDTs) in [!INCLUDE[ssVersion2005](../../includes/ssversion2005-md.md)] extends the SQL type system by letting you store objects and custom data structures in a [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] database. UDTs can contain multiple data types and can have behaviors, differentiating them from the traditional alias data types that consist of a single [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] system data type. UDTs are defined by using any of the languages supported by the Microsoft .NET common language runtime (CLR) that produce verifiable code. This includes Microsoft Visual C# and Visual Basic .NET. The data is exposed as fields and properties of a .NET Framework-based class or structure, and behaviors are defined by methods of the class or structure.
163163

164-
In [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)], a UDT can be used as the column definition of a table, as a variable in a [!INCLUDE[tsql](../../includes/tsql_md.md)] batch, or as an argument of a [!INCLUDE[tsql](../../includes/tsql_md.md)] function or stored procedure.
164+
In [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)], a UDT can be used as the column definition of a table, as a variable in a [!INCLUDE[tsql](../../includes/tsql-md.md)] batch, or as an argument of a [!INCLUDE[tsql](../../includes/tsql-md.md)] function or stored procedure.
165165

166166
For more information about user-defined data types, see "Using and Modifying Instances of User-defined Types" in [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] Books Online.
167167

0 commit comments

Comments
 (0)