Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

Commit c5a6781

Browse files
authored
Merge pull request #18232 from MicrosoftDocs/FromPublicRepo
Confirm merge from FromPublicRepo to master to sync with https://github.com/MicrosoftDocs/sql-docs (branch live)
2 parents b4f01e0 + 8f0ed64 commit c5a6781

13 files changed

Lines changed: 33 additions & 17 deletions

docs/includes/azure-sql-db-replication-supportability-note.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ ms.date: 05/30/2019
66
ms.author: mathoma
77
---
88
> [!NOTE]
9-
> Azure SQL Managed Instance can be a publisher, distributor, and subscriber for snapshot and transactional replication. Databases in Azure SQL Database can only be push subscribers for snapshot and transactional replication. For more information, see [Transactional replication with Azure SQL Database](/azure/sql-database/sql-database-managed-instance-transactional-replication).
9+
> Azure SQL Managed Instance can be a publisher, distributor, and subscriber for snapshot and transactional replication. Databases in Azure SQL Database can only be push subscribers for snapshot and transactional replication. For more information, see Transactional replication with [Azure SQL Database](/azure/azure-sql/database/replication-to-sql-database) and [Azure SQL Managed Instance](/azure/azure-sql/managed-instance/replication-transactional-overview).

docs/odbc/reference/syntax/sqlbindparameter-function.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ SQLRETURN SQLBindParameter(
125125
If *ParameterNumber* in the call to **SQLBindParameter** is greater than the value of SQL_DESC_COUNT, **SQLSetDescField** is called to increase the value of SQL_DESC_COUNT to *ParameterNumber*.
126126
127127
## InputOutputType Argument
128-
The *InputOutputType* argument specifies the type of the parameter. This argument sets the SQL_DESC_PARAMETER_TYPE field of the IPD. All parameters in SQL statements that do not call procedures, such as **INSERT** statements, are *input**parameters*. Parameters in procedure calls can be input, input/output, or output parameters. (An application calls **SQLProcedureColumns** to determine the type of a parameter in a procedure call; parameters whose type cannot be determined are assumed to be input parameters.)
128+
The *InputOutputType* argument specifies the type of the parameter. This argument sets the SQL_DESC_PARAMETER_TYPE field of the IPD. All parameters in SQL statements that do not call procedures, such as **INSERT** statements, are *input* *parameters*. Parameters in procedure calls can be input, input/output, or output parameters. (An application calls **SQLProcedureColumns** to determine the type of a parameter in a procedure call; parameters whose type cannot be determined are assumed to be input parameters.)
129129
130130
The *InputOutputType* argument is one of the following values:
131131

docs/odbc/reference/syntax/sqlgetconnectattr-function.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ SQLRETURN SQLGetConnectAttr(
5656
If *ValuePtr* is NULL, *StringLengthPtr* will still return the total number of bytes (excluding the null-termination character for character data) available to return in the buffer pointed to by *ValuePtr*.
5757
5858
*BufferLength*
59-
[Input] If *Attribute* is an ODBC-defined attribute and *ValuePtr* points to a character string or a binary buffer, this argument should be the length of \**ValuePtr*. If *Attribute* is an ODBC-defined attribute and \**ValuePtr* is an integer, *BufferLength* is ignored. If the value in *\*ValuePtr* is a Unicode string (when calling **SQLGetConnectAttrW**), the *BufferLength* argument must be an even number.
59+
[Input] If *Attribute* is an ODBC-defined attribute and *ValuePtr* points to a character string or a binary buffer, this argument should be the length of \**ValuePtr*. If *Attribute* is an ODBC-defined attribute and *\*ValuePtr* is an integer, *BufferLength* is ignored. If the value in *\*ValuePtr* is a Unicode string (when calling **SQLGetConnectAttrW**), the *BufferLength* argument must be an even number.
6060
6161
If *Attribute* is a driver-defined attribute, the application indicates the nature of the attribute to the Driver Manager by setting the *BufferLength* argument. *BufferLength* can have the following values:
6262
@@ -69,7 +69,7 @@ SQLRETURN SQLGetConnectAttr(
6969
- If *\*ValuePtr* contains a fixed-length data type, *BufferLength* is either SQL_IS_INTEGER or SQL_IS_UINTEGER, as appropriate.
7070
7171
*StringLengthPtr*
72-
[Output] A pointer to a buffer in which to return the total number of bytes (excluding the null-termination character) available to return in \**ValuePtr*. If \**ValuePtr* is a null pointer, no length is returned. If the attribute value is a character string and the number of bytes available to return is greater than *BufferLength* minus the length of the null-termination character, the data in *\*ValuePtr* is truncated to *BufferLength* minus the length of the null-termination character and is null-terminated by the driver.
72+
[Output] A pointer to a buffer in which to return the total number of bytes (excluding the null-termination character) available to return in \**ValuePtr*. If the attribute value is a character string and the number of bytes available to return is greater than *BufferLength* minus the length of the null-termination character, the data in *\*ValuePtr* is truncated to *BufferLength* minus the length of the null-termination character and is null-terminated by the driver.
7373
7474
## Returns
7575
SQL_SUCCESS, SQL_SUCCESS_WITH_INFO, SQL_NO_DATA, SQL_ERROR, or SQL_INVALID_HANDLE.
@@ -80,7 +80,7 @@ SQLRETURN SQLGetConnectAttr(
8080
|SQLSTATE|Error|Description|
8181
|--------------|-----------|-----------------|
8282
|01000|General warning|Driver-specific informational message. (Function returns SQL_SUCCESS_WITH_INFO.)|
83-
|01004|String data, right truncated|The data returned in \**ValuePtr* was truncated to be *BufferLength* minus the length of a null-termination character. The length of the untruncated string value is returned in **StringLengthPtr*. (Function returns SQL_SUCCESS_WITH_INFO.)|
83+
|01004|String data, right truncated|The data returned in \**ValuePtr* was truncated to be *BufferLength* minus the length of a null-termination character. The length of the untruncated string value is returned in *\*StringLengthPtr*. (Function returns SQL_SUCCESS_WITH_INFO.)|
8484
|08003|Connection not open|(DM) An *Attribute* value that required an open connection was specified.|
8585
|08S01|Communication link failure|The communication link between the driver and the data source to which the driver was connected failed before the function completed processing.|
8686
|HY000|General error|An error occurred for which there was no specific SQLSTATE and for which no implementation-specific SQLSTATE was defined. The error message returned from the diagnostic data structure by the argument *MessageText* in **SQLGetDiagField** describes the error and its cause.|

docs/odbc/reference/syntax/sqlgetenvattr-function.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ SQLRETURN SQLGetEnvAttr(
5757
[Input] If *ValuePtr* points to a character string, this argument should be the length of \**ValuePtr*. If \**ValuePtr* is an integer, *BufferLength* is ignored. If *\*ValuePtr* is a Unicode string (when calling **SQLGetEnvAttrW**), the *BufferLength* argument must be an even number. If the attribute value is not a character string, *BufferLength* is unused.
5858
5959
*StringLengthPtr*
60-
[Output] A pointer to a buffer in which to return the total number of bytes (excluding the null-termination character) available to return in *\*ValuePtr*. If *ValuePtr* is a null pointer, no length is returned. If the attribute value is a character string and the number of bytes available to return is greater than or equal to *BufferLength*, the data in \**ValuePtr* is truncated to *BufferLength* minus the length of a null-termination character and is null-terminated by the driver.
60+
[Output] A pointer to a buffer in which to return the total number of bytes (excluding the null-termination character) available to return in *\*ValuePtr*. If the attribute value is a character string and the number of bytes available to return is greater than or equal to *BufferLength*, the data in \**ValuePtr* is truncated to *BufferLength* minus the length of a null-termination character and is null-terminated by the driver.
6161
6262
## Returns
6363
SQL_SUCCESS, SQL_SUCCESS_WITH_INFO, SQL_NO_DATA, SQL_ERROR, or SQL_INVALID_HANDLE.

docs/odbc/reference/syntax/sqlgetstmtattr-function.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ SQLRETURN SQLGetStmtAttr(
6969
- If *\*ValuePtr* is contains a fixed-length data type, then *BufferLength* is either SQL_IS_INTEGER or SQL_IS_UINTEGER, as appropriate.
7070
7171
*StringLengthPtr*
72-
[Output] A pointer to a buffer in which to return the total number of bytes (excluding the null-termination character) available to return in *\*ValuePtr*. If *ValuePtr* is a null pointer, no length is returned. If the attribute value is a character string, and the number of bytes available to return is greater than or equal to *BufferLength*, the data in *\*ValuePtr* is truncated to *BufferLength* minus the length of a null-termination character and is null-terminated by the driver.
72+
[Output] A pointer to a buffer in which to return the total number of bytes (excluding the null-termination character) available to return in *\*ValuePtr*. If the attribute value is a character string, and the number of bytes available to return is greater than or equal to *BufferLength*, the data in *\*ValuePtr* is truncated to *BufferLength* minus the length of a null-termination character and is null-terminated by the driver.
7373
7474
## Returns
7575
SQL_SUCCESS, SQL_SUCCESS_WITH_INFO, SQL_ERROR, or SQL_INVALID_HANDLE.

docs/relational-databases/replication/administration/enable-coordinated-backups-for-transactional-replication.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ms.author: "mathoma"
2626

2727
### To enable coordinated backups for a database published with transactional replication
2828

29-
1. At the Publisher, use the [DATABASEPROPERTYEX (Transact-SQL)](../../../t-sql/functions/databasepropertyex-transact-sql.md) function to return the **IsSyncWithBackup** property of the publication database. If the function returns **1**, coordinated backups are already enabled for the published database.
29+
1. At the Publisher, use the `SELECT DATABASEPROPERTYEX(DB_NAME(),'IsSyncWithBackup')` [DATABASEPROPERTYEX (Transact-SQL)](../../../t-sql/functions/databasepropertyex-transact-sql.md) function to return the **IsSyncWithBackup** property of the publication database. If the function returns **1**, coordinated backups are already enabled for the published database.
3030

3131
2. If the function in step 1 returns **0**, execute [sp_replicationdboption (Transact-SQL)](../../../relational-databases/system-stored-procedures/sp-replicationdboption-transact-sql.md) at the Publisher on the publication database. Specify a value of **sync with backup** for **\@optname**, and **true** for **\@value**.
3232

@@ -43,4 +43,20 @@ ms.author: "mathoma"
4343

4444
1. At either the Publisher on the publication database or at the Distributor on the distribution database, execute [sp_replicationdboption (Transact-SQL)](../../../relational-databases/system-stored-procedures/sp-replicationdboption-transact-sql.md). Specify a value of **sync with backup** for **\@optname** and **false** for **\@value**.
4545

46+
## Examples
4647

48+
### A. Retrieve the `IsSyncWithBackup` property for the current database
49+
50+
This example returns the `IsSyncWithBackup` property for the current database:
51+
52+
```sql
53+
SELECT DATABASEPROPERTYEX(DB_NAME(),'IsSyncWithBackup')`
54+
```
55+
56+
### B. Retrieve the `IsSyncWithBackup` property for a specific database
57+
58+
This example returns the `IsSyncWithBackup` property for the database `NameOfDatabaseToCheck`:
59+
60+
```sql
61+
SELECT DATABASEPROPERTYEX('NameOfDatabaseToCheck','IsSyncWithBackup')`
62+
```

docs/relational-databases/replication/security/view-and-modify-replication-security-settings.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ monikerRange: "=azuresqldb-mi-current||>=sql-server-2016"
9999
- Enter a new strong password in the **Password** and **Confirm Password** text boxes.
100100

101101
> [!NOTE]
102-
> If the Publisher is an Oracle Publisher, the connection context is specified in the **Distributor Properties - \<Distributor>**dialog box. See below for the procedure to change the context.
102+
> If the Publisher is an Oracle Publisher, the connection context is specified in the **Distributor Properties - \<Distributor>** dialog box. See below for the procedure to change the context.
103103
104104
4. [!INCLUDE[clickOK](../../../includes/clickok-md.md)]
105105

@@ -120,7 +120,7 @@ monikerRange: "=azuresqldb-mi-current||>=sql-server-2016"
120120
- Enter a new strong password in the **Password** and **Confirm Password** text boxes.
121121

122122
> [!NOTE]
123-
> If the Publisher is an Oracle Publisher, the connection context is specified in the **Distributor Properties - \<Distributor>**dialog box. Change the context using the next procedure.
123+
> If the Publisher is an Oracle Publisher, the connection context is specified in the **Distributor Properties - \<Distributor>** dialog box. Change the context using the next procedure.
124124
125125
4. [!INCLUDE[clickOK](../../../includes/clickok-md.md)]
126126

docs/relational-databases/sqlxml-annotated-xsd-schemas-xpath-queries/updategrams/introduction-to-updategrams-sqlxml-4-0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ monikerRange: "=azuresqldb-current||>=sql-server-2016||>=sql-server-linux-2017||
105105
With default mapping (when the mapping schema is not specified in the updategram), the updategram elements map to tables and the child elements (in the case of element-centric mapping) and the attributes (in the case of attribute-centric mapping) map to columns.
106106

107107
### Element-centric Mapping
108-
In an element-centric updategram, an element contains child elements that denote the properties of the element. As an example, refer to the following updategram. The **\<Person.Contact>** element contains the **\<FirstName>**and **\<LastName>** child elements. These child elements are properties of the **\<Person.Contact>** element.
108+
In an element-centric updategram, an element contains child elements that denote the properties of the element. As an example, refer to the following updategram. The **\<Person.Contact>** element contains the **\<FirstName>** and **\<LastName>** child elements. These child elements are properties of the **\<Person.Contact>** element.
109109

110110
Because this updategram does not specify a mapping schema, the updategram uses implicit mapping, where the **\<Person.Contact>** element maps to the Person.Contact table and its child elements map to the FirstName and LastName columns.
111111

docs/relational-databases/tables/system-versioned-temporal-tables-with-memory-optimized-tables.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ The data flush task is activated regularly with a schedule that varies based on
6565
Data flush deletes all records from in-memory internal buffer that are older than the oldest currently running transaction to move these records to the disk-based history table.
6666

6767
You can enforce a data flush by invoking [sp_xtp_flush_temporal_history](../../relational-databases/system-stored-procedures/temporal-table-sp-xtp-flush-temporal-history.md) and specifying the schema and table name:
68-
**sys.sp_xtp_flush_temporal_history @schema_name, @object_name**. With this user-executed command, the same data movement process is invoked as when data flush task is invoked by the system on internal schedule.
68+
**sys.sp_xtp_flush_temporal_history \@schema_name, \@object_name**. With this user-executed command, the same data movement process is invoked as when data flush task is invoked by the system on internal schedule.
6969

7070
## See Also
7171

@@ -77,4 +77,4 @@ You can enforce a data flush by invoking [sp_xtp_flush_temporal_history](../../r
7777
- [Temporal Table Considerations and Limitations](../../relational-databases/tables/temporal-table-considerations-and-limitations.md)
7878
- [Temporal Table Security](../../relational-databases/tables/temporal-table-security.md)
7979
- [Manage Retention of Historical Data in System-Versioned Temporal Tables](../../relational-databases/tables/manage-retention-of-historical-data-in-system-versioned-temporal-tables.md)
80-
- [Temporal Table Metadata Views and Functions](../../relational-databases/tables/temporal-table-metadata-views-and-functions.md)
80+
- [Temporal Table Metadata Views and Functions](../../relational-databases/tables/temporal-table-metadata-views-and-functions.md)

docs/ssma/db2/project-settings-conversion-db2tosql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ This setting specifies how DB2 schemas are mapped to SQL Server schemas. Two opt
6565

6666
1. **Schema to database:** In this mode DB2 schema 'sch1' will be mapped by default to 'dbo' SQL Server schema in SQL Server database 'sch1'.
6767

68-
2. **Schema to schema:**In this mode DB2 schema 'sch1' will be mapped by default to 'sch1' SQL Server schema in default SQL Server database provided in the connection dialog.
68+
2. **Schema to schema:** In this mode DB2 schema 'sch1' will be mapped by default to 'sch1' SQL Server schema in default SQL Server database provided in the connection dialog.
6969

7070
When you select a conversion mode in the **Mode** box, SSMA applies the following setting:
7171

0 commit comments

Comments
 (0)