Skip to content

Commit b659d13

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/sql-docs-pr (branch live)
2 parents 3b5b21b + 019b6f3 commit b659d13

File tree

11 files changed

+173
-161
lines changed

11 files changed

+173
-161
lines changed

docs/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ sudo apt-get install unixodbc-dev
141141
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
142142
brew tap microsoft/mssql-release https://github.com/Microsoft/homebrew-mssql-release
143143
brew update
144-
brew install --no-sandbox msodbcsql17 mssql-tools
144+
brew install msodbcsql17 mssql-tools
145145
```
146146

147147
## Microsoft ODBC Driver 13.1 for SQL Server

docs/relational-databases/performance/tuning-database-using-workload-from-query-store.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ The difference between the Query Store and Plan Cache options is that the former
4141

4242
## See Also
4343
[Database Engine Tuning Advisor](../../relational-databases/performance/database-engine-tuning-advisor.md)
44-
[Tutorial: Database Engine Tuning Advisor](Tutorial:%20Database%20Engine%20Tuning%20Advisor.md)
44+
[Tutorial: Database Engine Tuning Advisor](../../tools/dta/tutorial-database-engine-tuning-advisor.md)
4545
[How Query Store Collects Data](../../relational-databases/performance/how-query-store-collects-data.md)
4646
[Query Store Best Practices](../../relational-databases/performance/best-practice-with-the-query-store.md)

docs/reporting-services/application-integration/integrating-reporting-services-into-applications.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ ms.date: 09/18/2018
44
ms.prod: reporting-services
55
ms.prod_service: "reporting-services-native"
66
ms.technology: application-integration
7-
8-
97
ms.topic: reference
108
author: markingmyname
119
ms.author: maghan
1210
monikerRange: "= sql-server-2016 || = sqlallproducts-allversions"
11+
1312
---
1413
# Integrating Reporting Services into Applications
1514

docs/reporting-services/create-a-data-alert-in-data-alert-designer.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@ ms.date: 08/17/2017
44
ms.prod: reporting-services
55
ms.prod_service: "reporting-services-sharepoint, reporting-services-native"
66
ms.technology: reporting-services
7-
8-
97
ms.topic: conceptual
108
ms.assetid: 8464ab9d-afe1-4490-955f-9f3319bcbf8d
119
author: markingmyname
1210
ms.author: maghan
1311
monikerRange: ">=sql-server-2016 <=sql-server-2016||=sqlallproducts-allversions"
1412
---
13+
1514
# Create a Data Alert in Data Alert Designer
1615

1716
[!INCLUDE[ssrs-appliesto](../includes/ssrs-appliesto.md)] [!INCLUDE[ssrs-appliesto-2016](../includes/ssrs-appliesto-2016.md)] [!INCLUDE[ssrs-appliesto-not-pbirsi](../includes/ssrs-appliesto-not-pbirs.md)] [!INCLUDE[ssrs-appliesto-sharepoint-2013-2016i](../includes/ssrs-appliesto-sharepoint-2013-2016.md)]

docs/reporting-services/data-alert-designer.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ ms.date: 07/02/2017
44
ms.prod: reporting-services
55
ms.prod_service: "reporting-services-sharepoint, reporting-services-native"
66
ms.technology: reporting-services
7-
8-
97
ms.topic: conceptual
108
helpviewer_keywords:
119
- "editing, data alerts"
@@ -14,11 +12,11 @@ helpviewer_keywords:
1412
- "updating, alerts"
1513
- "creating, data alerts"
1614
- "creating, alerts"
17-
ms.assetid: b2018116-cf1a-4e54-b29c-39e0ca2bda77
1815
author: markingmyname
1916
ms.author: maghan
2017
monikerRange: ">=sql-server-2016 <=sql-server-2016||=sqlallproducts-allversions"
2118
---
19+
2220
# Data Alert Designer
2321

2422
[!INCLUDE [ssrs-appliesto](../includes/ssrs-appliesto.md)] [!INCLUDE [ssrs-appliesto-2016](../includes/ssrs-appliesto-2016.md)] [!INCLUDE [ssrs-appliesto-not-2017](../includes/ssrs-appliesto-not-2017.md)] [!INCLUDE[ssrs-appliesto-sharepoint-2013-2016i](../includes/ssrs-appliesto-sharepoint-2013-2016.md)] [!INCLUDE [ssrs-appliesto-not-pbirs](../includes/ssrs-appliesto-not-pbirs.md)]

docs/reporting-services/report-data/sql-azure-connection-type-ssrs.md

Lines changed: 126 additions & 106 deletions
Large diffs are not rendered by default.

docs/t-sql/functions/openxml-transact-sql.md

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ manager: "craigg"
2626

2727
OPENXML provides a rowset view over an XML document. Because OPENXML is a rowset provider, OPENXML can be used in [!INCLUDE[tsql](../../includes/tsql-md.md)] statements in which rowset providers such as a table, view, or the OPENROWSET function can appear.
2828

29-
![Topic link icon](../../database-engine/configure-windows/media/topic-link.gif "Topic link icon") [Transact-SQL Syntax Conventions](../../t-sql/language-elements/transact-sql-syntax-conventions-transact-sql.md)
29+
![Article link icon](../../database-engine/configure-windows/media/topic-link.gif "Article link icon") [Transact-SQL Syntax Conventions](../../t-sql/language-elements/transact-sql-syntax-conventions-transact-sql.md)
3030

3131
## Syntax
3232

@@ -41,17 +41,17 @@ OPENXML( idoc int [ in] , rowpattern nvarchar [ in ] , [ flags byte [ in ] ] )
4141
Is the document handle of the internal representation of an XML document. The internal representation of an XML document is created by calling **sp_xml_preparedocument**.
4242

4343
*rowpattern*
44-
Is the XPath pattern used to identify the nodes (in the XML document whose handle is passed in the *idoc* parameter) to be processed as rows.
44+
Is the XPath pattern used to identify the nodes to be processed as rows. The nodes come from the XML document whose handle is passed in the *idoc* parameter.
4545

4646
*flags*
47-
Indicates the mapping that should be used between the XML data and the relational rowset, and how the spill-over column should be filled. *flags* is an optional input parameter, and can be one of the following values.
47+
Indicates the mapping used between the XML data and the relational rowset, and how the spill-over column is filled. *flags* is an optional input parameter, and can be one of the following values.
4848

4949
|Byte value|Description|
5050
|----------------|-----------------|
5151
|**0**|Defaults to **attribute-centric** mapping.|
52-
|**1**|Use the **attribute-centric** mapping. Can be combined with XML_ELEMENTS. In this case, **attribute-centric** mapping is applied first, and then **element-centric** mapping is applied for all columns that are not yet dealt with.|
53-
|**2**|Use the **element-centric** mapping. Can be combined with XML_ATTRIBUTES. In this case, **attribute-centric** mapping is applied first, and then **element-centric** mapping is applied for all columns not yet dealt with.|
54-
|**8**|Can be combined (logical OR) with XML_ATTRIBUTES or XML_ELEMENTS. In the context of retrieval, this flag indicates that the consumed data should not be copied to the overflow property **\@mp:xmltext**.|
52+
|**1**|Use the **attribute-centric** mapping. Can be combined with XML_ELEMENTS. In this case, **attribute-centric** mapping is applied first. Next, **element-centric** mapping is applied for any remaining columns.|
53+
|**2**|Use the **element-centric** mapping. Can be combined with XML_ATTRIBUTES. In this case, **attribute-centric** mapping is applied first. Next, **element-centric** mapping is applied for any remaining columns.|
54+
|**8**|Can be combined (logical OR) with XML_ATTRIBUTES or XML_ELEMENTS. In the context of retrieval, this flag indicates that the consumed data shouldn't be copied to the overflow property **\@mp:xmltext**.|
5555

5656
_SchemaDeclaration_
5757
Is the schema definition of the form: _ColName_*ColType* [_ColPattern_ | _MetaProperty_] [**,**_ColNameColType_ [_ColPattern_ | _MetaProperty_]...]
@@ -63,43 +63,43 @@ OPENXML( idoc int [ in] , rowpattern nvarchar [ in ] , [ flags byte [ in ] ] )
6363
Is the [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] data type of the column in the rowset. If the column types differ from the underlying **xml** data type of the attribute, type coercion occurs.
6464

6565
*ColPattern*
66-
Is an optional, general XPath pattern that describes how the XML nodes should be mapped to the columns. If *ColPattern* is not specified, the default mapping (**attribute-centric** or **element-centric** mapping as specified by *flags*) takes place.
66+
Is an optional, general XPath pattern that describes how the XML nodes should be mapped to the columns. If *ColPattern* isn't specified, the default mapping (**attribute-centric** or **element-centric** mapping as specified by *flags*) takes place.
6767

68-
The XPath pattern specified as *ColPattern* is used to specify the special nature of the mapping (in the case of **attribute-centric** and **element-centric** mapping) that overwrites or enhances the default mapping indicated by *flags*.
68+
The XPath pattern specified as *ColPattern* is used to specify the special nature of the mapping (for **attribute-centric** and **element-centric** mapping) that overwrites or enhances the default mapping indicated by *flags*.
6969

7070
The general XPath pattern specified as *ColPattern* also supports the metaproperties.
7171

7272
*MetaProperty*
73-
Is one of the metaproperties provided by OPENXML. If *MetaProperty* is specified, the column contains information provided by the metaproperty. The metaproperties allow you to extract information (such as relative position and namespace information) about XML nodes. This provides more information than is visible in the textual representation.
73+
Is one of the metaproperties provided by OPENXML. If *MetaProperty* is specified, the column contains information provided by the metaproperty. The metaproperties allow you to extract information (such as relative position and namespace information) about XML nodes. These metaproperties provide more information than is visible in the textual representation.
7474

7575
*TableName*
7676
Is the table name that can be given (instead of *SchemaDeclaration*) if a table with the desired schema already exists and no column patterns are required.
7777

7878
## Remarks
79-
The WITH clause provides a rowset format (and additional mapping information as required) by using either *SchemaDeclaration* or specifying an existing *TableName*. If the optional WITH clause is not specified, the results are returned in an **edge** table format. Edge tables represent the fine-grained XML document structure (such as element/attribute names, the document hierarchy, the namespaces, PIs, and son on) in a single table.
79+
The WITH clause provides a rowset format (and additional mapping information as required) by using either *SchemaDeclaration* or specifying an existing *TableName*. If the optional WITH clause isn't specified, the results are returned in an **edge** table format. Edge tables represent the fine-grained XML document structure (such as element/attribute names, the document hierarchy, the namespaces, PIs, and son on) in a single table.
8080

8181
The following table describes the structure of the **edge** table.
8282

8383
|Column name|Data type|Description|
8484
|-----------------|---------------|-----------------|
8585
|**id**|**bigint**|Is the unique ID of the document node.<br /><br /> The root element has an ID value 0. The negative ID values are reserved.|
86-
|**parentid**|**bigint**|Identifies the parent of the node. The parent identified by this ID is not necessarily the parent element, but it depends on the NodeType of the node whose parent is identified by this ID. For example, if the node is a text node, the parent of it may be an attribute node.<br /><br /> If the node is at the top level in the XML document, its **ParentID** is NULL.|
86+
|**parentid**|**bigint**|Identifies the parent of the node. The parent identified by this ID isn't necessarily the parent element, but it depends on the NodeType of the node whose parent is identified by this ID. For example, if the node is a text node, the parent of it may be an attribute node.<br /><br /> If the node is at the top level in the XML document, its **ParentID** is NULL.|
8787
|**nodetype**|**int**|Identifies the node type. Is an integer that corresponds to the XML DOM node type numbering.<br /><br /> The node types are:<br /><br /> 1 = Element node<br /><br /> 2 = Attribute node<br /><br /> 3 = Text node|
88-
|**localname**|**nvarchar**|Gives the local name of the element or attribute. Is NULL if the DOM object does not have a name.|
88+
|**localname**|**nvarchar**|Gives the local name of the element or attribute. Is NULL if the DOM object doesn't have a name.|
8989
|**prefix**|**nvarchar**|Is the namespace prefix of the node name.|
9090
|**namespaceuri**|**nvarchar**|Is the namespace URI of the node. If the value is NULL, no namespace is present.|
9191
|**datatype**|**nvarchar**|Is the actual data type of the element or attribute row, otherwise is NULL. The data type is inferred from the inline DTD or from the inline schema.|
9292
|**prev**|**bigint**|Is the XML ID of the previous sibling element. Is NULL if there is no direct previous sibling.|
93-
|**text**|**ntext**|Contains the attribute value or the element content in text form (or is NULL if the **edge** table entry does not require a value).|
93+
|**text**|**ntext**|Contains the attribute value or the element content in text form (or is NULL if the **edge** table entry doesn't require a value).|
9494

9595
## Examples
9696

9797
### A. Using a simple SELECT statement with OPENXML
9898
The following example creates an internal representation of the XML image by using `sp_xml_preparedocument`. A `SELECT` statement that uses an `OPENXML` rowset provider is then executed against the internal representation of the XML document.
9999

100-
The *flag* value is set to `1`. This indicates **attribute-centric** mapping. Therefore, the XML attributes map to the columns in the rowset. The *rowpattern* specified as `/ROOT/Customer` identifies the `<Customers>` nodes to be processed.
100+
The *flag* value is set to `1`. This value indicates **attribute-centric** mapping. Therefore, the XML attributes map to the columns in the rowset. The *rowpattern* specified as `/ROOT/Customer` identifies the `<Customers>` nodes to be processed.
101101

102-
The optional *ColPattern* (column pattern) parameter is not specified because the column name matches the XML attribute names.
102+
The optional *ColPattern* (column pattern) parameter isn't specified because the column name matches the XML attribute names.
103103

104104
The `OPENXML` rowset provider creates a two-column rowset (`CustomerID` and `ContactName`) from which the `SELECT` statement retrieves the necessary columns (in this case, all the columns).
105105

@@ -138,7 +138,7 @@ VINET Paul Henriot
138138
LILAS Carlos Gonzlez
139139
```
140140

141-
If the same `SELECT` statement is executed with *flags* set to `2`, indicating **element-centric** mapping, the values of `CustomerID` and `ContactName` for both of the customers in the XML document are returned as NULL, because there are not any elements named `CustomerID` or `ContactName` in the XML document.
141+
If the same `SELECT` statement is executed with *flags* set to `2`, indicating **element-centric** mapping, the values of `CustomerID` and `ContactName` for both of the customers in the XML document are returned as NULL, because there aren't any elements named `CustomerID` or `ContactName` in the XML document.
142142

143143
[!INCLUDE[ssResult](../../includes/ssresult-md.md)]
144144

@@ -150,9 +150,9 @@ NULL NULL
150150
```
151151

152152
### B. Specifying ColPattern for mapping between columns and the XML attributes
153-
The following query returns customer ID, order date, product ID and quantity attributes from the XML document. The *rowpattern* identifies the `<OrderDetails>` elements. `ProductID` and `Quantity` are the attributes of the `<OrderDetails>` element. However, `OrderID`, `CustomerID`, and `OrderDate` are the attributes of the parent element (`<Orders>`).
153+
The following query returns customer ID, order date, product ID, and quantity attributes from the XML document. The *rowpattern* identifies the `<OrderDetails>` elements. `ProductID` and `Quantity` are the attributes of the `<OrderDetails>` element. However, `OrderID`, `CustomerID`, and `OrderDate` are the attributes of the parent element (`<Orders>`).
154154

155-
The optional *ColPattern* is specified. This indicates the following:
155+
The optional *ColPattern* is specified for the following mappings:
156156

157157
- The `OrderID`, `CustomerID`, and `OrderDate` in the rowset map to the attributes of the parent of the nodes identified by *rowpattern* in the XML document.
158158

@@ -206,7 +206,7 @@ OrderID CustomerID OrderDate ProdID Qty
206206
### C. Obtaining results in an edge table format
207207
The sample XML document in the following example consists of `<Customers>`, `<Orders>`, and `<Order_0020_Details>` elements. First, **sp_xml_preparedocument** is called to obtain a document handle. This document handle is passed to `OPENXML`.
208208

209-
In the `OPENXML` statement, the *rowpattern* (`/ROOT/Customers`) identifies the `<Customers>` nodes to process. Because the WITH clause is not provided, `OPENXML` returns the rowset in an **edge** table format.
209+
In the `OPENXML` statement, the *rowpattern* (`/ROOT/Customers`) identifies the `<Customers>` nodes to process. Because the WITH clause isn't provided, `OPENXML` returns the rowset in an **edge** table format.
210210

211211
Finally the `SELECT` statement retrieves all the columns in the **edge** table.
212212

@@ -242,4 +242,3 @@ EXEC sp_xml_removedocument @idoc;
242242
## See Also
243243
[Examples: Using OPENXML](../../relational-databases/xml/examples-using-openxml.md)
244244

245-

docs/t-sql/functions/trim-transact-sql.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ TRIM ( [ characters FROM ] string )
3737
## Arguments
3838

3939
characters
40-
Is a literal, variable, or function call of any non-LOB character type (`nvarchar`, `varchar`, `nchar`, or `char`) containing characters that should be removed. `nvarchar(max)` and `varchar(max)` types are not allowed.
40+
Is a literal, variable, or function call of any non-LOB character type (`nvarchar`, `varchar`, `nchar`, or `char`) containing characters that should be removed. `nvarchar(max)` and `varchar(max)` types aren't allowed.
4141

4242
string
4343
Is an expression of any character type (`nvarchar`, `varchar`, `nchar`, or `char`) where characters should be removed.
@@ -46,7 +46,7 @@ Is an expression of any character type (`nvarchar`, `varchar`, `nchar`, or `char
4646
Returns a character expression with a type of string argument where the space character `char(32)` or other specified characters are removed from both sides. Returns `NULL` if input string is `NULL`.
4747

4848
## Remarks
49-
By default `TRIM` function removes the space character `char(32)` from both sides. This is equivalent to `LTRIM(RTRIM(@string))`. Behavior of `TRIM ` function with specified characters is identical to behavior of `REPLACE` function where characters from start or end are replaced with empty strings.
49+
By default `TRIM` function removes the space character `char(32)` from both sides. This behavior is equivalent to `LTRIM(RTRIM(@string))`. Behavior of `TRIM ` function with specified characters is identical to behavior of `REPLACE` function where characters from start or end are replaced with empty strings.
5050

5151

5252
## Examples
@@ -78,4 +78,5 @@ SELECT TRIM( '.,! ' FROM '# test .') AS Result;
7878
[RTRIM &#40;Transact-SQL&#41;](../../t-sql/functions/rtrim-transact-sql.md)
7979
[STRING_SPLIT &#40;Transact-SQL&#41;](../../t-sql/functions/string-split-transact-sql.md)
8080
[SUBSTRING &#40;Transact-SQL&#41;](../../t-sql/functions/substring-transact-sql.md)
81-
[String Functions &#40;Transact-SQL&#41;](../../t-sql/functions/string-functions-transact-sql.md)
81+
[String Functions &#40;Transact-SQL&#41;](../../t-sql/functions/string-functions-transact-sql.md)
82+

docs/t-sql/functions/user-name-transact-sql.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ monikerRange: ">=aps-pdw-2016||=azuresqldb-current||=azure-sqldw-latest||>=sql-s
3131

3232
Returns a database user name from a specified identification number.
3333

34-
![Topic link icon](../../database-engine/configure-windows/media/topic-link.gif "Topic link icon") [Transact-SQL Syntax Conventions](../../t-sql/language-elements/transact-sql-syntax-conventions-transact-sql.md)
34+
![Article link icon](../../database-engine/configure-windows/media/topic-link.gif "Article link icon") [Transact-SQL Syntax Conventions](../../t-sql/language-elements/transact-sql-syntax-conventions-transact-sql.md)
3535

3636
## Syntax
3737

@@ -158,5 +158,3 @@ User7
158158
[System Functions &#40;Transact-SQL&#41;](../../relational-databases/system-functions/system-functions-for-transact-sql.md)
159159
[SYSTEM_USER &#40;Transact-SQL&#41;](../../t-sql/functions/system-user-transact-sql.md)
160160

161-
162-

0 commit comments

Comments
 (0)