Skip to content

Commit 13cc327

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/sql-docs-pr into 20230901-tsql-syntax-sp_rename
2 parents a0baa52 + 9803883 commit 13cc327

431 files changed

Lines changed: 6656 additions & 5247 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.

.acrolinx-config.edn

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,31 @@
11
{:allowed-branchname-matches ["main" "release-.*" "sandbox-.*"]
22
:allowed-filename-matches ["(?i)docs/(?:(?!toc.yml))" "docs-msdn" "(?i)azure-sql/(?:(?!toc.yml))" "(?i)data-migration/(?:(?!toc.yml))"]
33

4-
:template-header
5-
"
6-
## Acrolinx scorecard
4+
:guidance-profile "1889ea46-76de-460c-a27c-6667b60e201e" ;; testing March 2023 updated guidelines - Microsoft standard.
75

8-
**A minimum total score of 80 is required.**
9-
10-
Select the total score link to review all feedback on brand, terms, spelling, grammar, readability, and inclusive language. *You should fix all spelling errors regardless of your total score.* This helps maintain customer trust in overall content quality.
6+
:template-header ;; This displays in the pull request results pane.
7+
"
8+
## Acrolinx Scorecards
119
12-
| Article | **Total score**<br />**Required:80** | Word and phrases<br />(Brand, terms)<br />Preferred: 100 | Correctness<br />(Spelling, grammar)<br />Preferred: 100 | Clarity<br />(Readability)<br />Preferred: 80 |
10+
**A minimum total score of 80 is required. The total score is an average of the subscores.**
11+
Select **Total score** to review the Acrolinx scorecard for your article. Try to increase your individual scores, ex. Correctness. Your article will be clearer and more consistent with Microsoft standards.
12+
13+
14+
| Article | **Total score**<br />**Required: 80** | Word and phrases<br />(Brand, terms)<br />Preferred: 100 | Correctness<br />(Spelling, grammar)<br />Preferred: 100 | Clarity<br />(Readability)<br />Preferred: 80 |
1315
|---------|:------------------------------------:|:--------------------------------------------------------:|:--------------------------------------------------------:|:---------------------------------------------:|
1416
"
1517

16-
:template-change
17-
"| ${s/status} ${s/file} | [${acrolinx/qualityscore}](${acrolinx/scorecard}) | ${acrolinx/scores/words_and_phrases} | ${acrolinx/scores/correctness} | ${acrolinx/scores/clarity} | ${acrolinx/scores/inclusive} |
18+
:template-change ;; Can be overriden in repo-specific edn file. This displays in the pull request results pane.
19+
"| ${s/status} ${s/file} | [${acrolinx/qualityscore}](${acrolinx/scorecard}) | ${acrolinx/scores/words_and_phrases} | ${acrolinx/scores/correctness} | ${acrolinx/scores/clarity} |
20+
"
21+
22+
:template-footer
23+
"
24+
**More information about Acrolinx**
25+
26+
- [Install Acrolinx locally for VSCode](https://review.learn.microsoft.com/en-us/help/platform/acrolinx-vscode-setup)
27+
- [False positives or issues](https://aka.ms/acrolinxbug)
28+
- [Troubleshooting issues with Acrolinx](https://review.docs.microsoft.com/help/contribute/acrolinx-error-messages)
29+
1830
"
1931
}

.openpublishing.redirection.azure-sql.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,11 @@
629629
"source_path_from_root": "/azure-sql/database/authentication-mfa-ssms-configure.md",
630630
"redirect_url": "/azure/azure-sql/database/authentication-mfa-ssms-overview",
631631
"redirect_document_id": false
632+
},
633+
{
634+
"source_path_from_root": "/azure-sql/database/change-data-capture-overview.md",
635+
"redirect_url": "/sql/relational-databases/track-changes/about-change-data-capture-sql-server",
636+
"redirect_document_id": false
632637
}
633638
]
634639
}

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41785,6 +41785,11 @@
4178541785
"redirect_url": "/sql/sql-server/versioning-system-monikers-ui-sql-server",
4178641786
"redirect_document_id": false
4178741787
},
41788+
{
41789+
"source_path_from_root": "/docs/relational-databases/track-changes/known-issues-and-limitations.md",
41790+
"redirect_url": "/sql/relational-databases/track-changes/about-change-data-capture-sql-server",
41791+
"redirect_document_id": false
41792+
},
4178841793
{
4178941794
"source_path": "docs/relational-databases/track-changes/known-issues-resolutions-with-cdc-for-oracle-attunity.md",
4179041795
"redirect_url": "/sql/integration-services/change-data-capture/known-issues-resolutions-with-cdc-for-oracle-attunity",

azure-sql/database/automated-backups-overview.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how Azure SQL Database automatically backs up all databases a
55
author: SudhirRaparla
66
ms.author: nvraparl
77
ms.reviewer: mathoma, wiassaf, danil
8-
ms.date: 09/14/2022
8+
ms.date: 09/12/2023
99
ms.service: sql-database
1010
ms.subservice: backup-restore
1111
ms.topic: conceptual
@@ -195,8 +195,6 @@ Azure SQL Database provides both short-term and long-term retention of backups.
195195

196196
For all new, restored, and copied databases, Azure SQL Database retains sufficient backups to allow PITR within the last 7 days by default. The service takes regular full, differential, and log backups to ensure that databases are restorable to any point in time within the retention period that's defined for the database.
197197

198-
Short-term back up retention of 1 to 35 days for Hyperscale databases is now in preview. To learn more, review [Managing backup retention in Hyperscale](hyperscale-automated-backups-overview.md#backup-retention).
199-
200198
Differential backups can be configured to occur either once in 12 hours or once in 24 hours. A 24-hour differential backup frequency might increase the time required to restore the database, compared to the 12-hour frequency. In the vCore model, the default frequency for differential backups is once in 12 hours. In the DTU model, the default frequency is once in 24 hours.
201199

202200
You can specify your backup storage redundancy option for STR when you create your database, and then change it at a later time. If you change your backup redundancy option after your database is created, new backups will use the new redundancy option. Backup copies made with the previous STR redundancy option are not moved or copied. They're left in the original storage account until the retention period expires, which can be 1 to 35 days.
@@ -210,14 +208,18 @@ If you delete a database, the system keeps backups in the same way that it would
210208
211209
### Long-term retention
212210

213-
For SQL Database, you can configure full LTR backups for up to 10 years in Azure Blob Storage. After the LTR policy is configured, full backups are automatically copied to a different storage container weekly.
211+
For SQL Database, you can configure full long-term retention (LTR) backups for up to 10 years in Azure Blob Storage. After the LTR policy is configured, full backups are automatically copied to a different storage container weekly.
214212

215213
To meet various compliance requirements, you can select different retention periods for weekly, monthly, and/or yearly full backups. The frequency depends on the policy. For example, setting `W=0, M=1` would create an LTR copy monthly. For more information about LTR, see [Long-term retention](long-term-retention-overview.md).
216214

217215
Updating the backup storage redundancy for an existing database applies the change only to subsequent backups taken in the future and not for existing backups. All existing LTR backups for the database will continue to reside in the existing storage blob. New backups will be replicated based on the configured backup storage redundancy.
218216

219217
Storage consumption depends on the selected frequency and retention periods of LTR backups. You can use the [LTR pricing calculator](https://azure.microsoft.com/pricing/calculator/?service=sql-database) to estimate the cost of LTR storage.
220218

219+
When restoring a Hyperscale database from an LTR backup, the read scale property is disabled. To enable, read scale on the restored database, update the database after it has been created. You need to specify the target service level objective when restoring from an LTR backup.
220+
221+
Long-term retention can be enabled for Hyperscale databases created or migrated from other service tiers after June 2022. LTR support for all other Hyperscale databases will be added over the next several weeks. If you attempt to enable LTR for a Hyperscale database where it is not yet supported, you will receive the following error: "An error has occurred while enabling Long-term backup retention for this database. Please reach out to Microsoft support to enable long-term backup retention." In this case, reach out to Microsoft support and please create a support ticket to resolve this.
222+
221223
## Backup storage costs
222224

223225
The price for backup storage varies and depends on your [purchasing model (DTU or vCore)](purchasing-models.md), chosen backup storage redundancy option, and region. Backup storage is charged based on gigabytes consumed per month, at the same rate for all backups.

azure-sql/database/connect-query-content-reference-guide.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ titleSuffix: Azure SQL Database & SQL Managed Instance
44
description: Links to Azure SQL Database quickstarts showing how to connect to and query Azure SQL Database, and Azure SQL Managed Instance.
55
author: dzsquared
66
ms.author: drskwier
7-
ms.reviewer: wiassaf, mathoma
8-
ms.date: 07/19/2023
7+
ms.reviewer: wiassaf, mathoma, randolphwest
8+
ms.date: 09/15/2023
99
ms.service: sql-database
1010
ms.subservice: connect
1111
ms.topic: conceptual
1212
ms.custom: sqldbrb=1
13-
monikerRange: "= azuresql || = azuresql-db || = azuresql-mi"
13+
monikerRange: "=azuresql || =azuresql-db || =azuresql-mi"
1414
---
1515
# Azure SQL Database and Azure SQL Managed Instance connect and query articles
1616

17-
[!INCLUDE[appliesto-sqldb-sqlmi](../includes/appliesto-sqldb-sqlmi.md)]
17+
[!INCLUDE [appliesto-sqldb-sqlmi](../includes/appliesto-sqldb-sqlmi.md)]
1818

1919
The following document includes links to Azure examples showing how to connect and query Azure SQL Database and Azure SQL Managed Instance. For some related recommendations for Transport Level Security, see [TLS considerations for database connectivity](#tls-considerations-for-database-connectivity).
2020

@@ -54,7 +54,7 @@ Get the connection information you need to connect to the database in Azure SQL
5454

5555
1. Review the complete **ADO.NET** connection string.
5656

57-
:::image type="content" source="./media/connect-query-dotnet-core/adonet-connection-string2.png" alt-text="Screenshot showing the ADO.NET connection string.":::
57+
:::image type="content" source="media/connect-query-dotnet-core/adonet-connection-string2.png" alt-text="Screenshot showing the ADO.NET connection string.":::
5858

5959
1. Copy the **ADO.NET** connection string if you intend to use it.
6060

@@ -76,20 +76,20 @@ Non-Microsoft drivers might not use TLS by default. This can be a factor when co
7676

7777
## Libraries
7878

79-
You can use various libraries and frameworks to connect to Azure SQL Database or Azure SQL Managed Instance. Check out our [Get started tutorials](https://aka.ms/sqldev) to quickly get started with programming languages such as C#, Java, Node.js, PHP, and Python. Then build an app by using SQL Server on Linux or Windows, or a SQL Server container on Linux.
79+
You can use various libraries and frameworks to connect to Azure SQL Database or Azure SQL Managed Instance. You can then build an app by using SQL Server on Linux or Windows, or a SQL Server container on Linux.
8080

8181
The following table lists connectivity libraries or *drivers* that client applications can use from a variety of languages to connect to and use SQL Server running on-premises or in the cloud. You can use them on Linux, Windows, or in containers, and use them to connect to Azure SQL Database, Azure SQL Managed Instance, and Azure Synapse Analytics.
8282

8383
| Language | Platform | Additional resources | Download | Get started |
8484
| :-- | :-- | :-- | :-- | :-- |
85-
| C# | Windows, Linux, macOS | [Microsoft ADO.NET for SQL Server](/sql/connect/ado-net/microsoft-ado-net-sql-server) | [Download](https://dotnet.microsoft.com/download) | [Get started](https://www.microsoft.com/sql-server/developer-get-started/csharp/ubuntu)
85+
| C# | Windows, Linux, macOS | [Microsoft ADO.NET for SQL Server](/sql/connect/ado-net/microsoft-ado-net-sql-server) | [Download](https://dotnet.microsoft.com/download) |
8686
| C++ | Windows, Linux, macOS | [Microsoft ODBC driver for SQL Server](/sql/connect/odbc/microsoft-odbc-driver-for-sql-server/) | [Download](/sql/connect/odbc/microsoft-odbc-driver-for-sql-server/) |
8787
| Go | Windows, Linux, macOS | [Microsoft Go driver for SQL Server](https://github.com/microsoft/go-mssqldb#readme) | [Install](https://github.com/microsoft/go-mssqldb#install) | [Get started](connect-query-go.md)
88-
| Java | Windows, Linux, macOS | [Microsoft JDBC driver for SQL Server](/sql/connect/jdbc/microsoft-jdbc-driver-for-sql-server/) | [Download](/sql/connect/jdbc/download-microsoft-jdbc-driver-for-sql-server) | [Get started](https://www.microsoft.com/sql-server/developer-get-started/java/ubuntu)
89-
| Node.js | Windows, Linux, macOS | [Node.js driver for SQL Server](/sql/connect/node-js/node-js-driver-for-sql-server/) | [Install](/sql/connect/node-js/step-1-configure-development-environment-for-node-js-development/) | [Get started](https://www.microsoft.com/sql-server/developer-get-started/node/ubuntu)
90-
| PHP | Windows, Linux, macOS| [PHP SQL driver for SQL Server](/sql/connect/php/microsoft-php-driver-for-sql-server) | [Download](/sql/connect/php/download-drivers-php-sql-server) | [Get started](https://www.microsoft.com/sql-server/developer-get-started/php/ubuntu/)
91-
| Python | Windows, Linux, macOS | [Python SQL driver](/sql/connect/python/python-driver-for-sql-server/) | Install choices: <br/> \* [pymssql](/sql/connect/python/pymssql/step-1-configure-development-environment-for-pymssql-python-development/) <br/> \* [pyodbc](/sql/connect/python/pyodbc/step-1-configure-development-environment-for-pyodbc-python-development/) | [Get started](https://www.microsoft.com/sql-server/developer-get-started/python/ubuntu)
92-
| Ruby | Windows, Linux, macOS | [Ruby driver for SQL Server](/sql/connect/ruby/ruby-driver-for-sql-server/) | [Install](/sql/connect/ruby/step-1-configure-development-environment-for-ruby-development/) | [Get started](https://www.microsoft.com/sql-server/developer-get-started/ruby/ubuntu)
88+
| Java | Windows, Linux, macOS | [Microsoft JDBC driver for SQL Server](/sql/connect/jdbc/microsoft-jdbc-driver-for-sql-server/) | [Download](/sql/connect/jdbc/download-microsoft-jdbc-driver-for-sql-server) |
89+
| Node.js | Windows, Linux, macOS | [Node.js driver for SQL Server](/sql/connect/node-js/node-js-driver-for-sql-server/) | [Install](/sql/connect/node-js/step-1-configure-development-environment-for-node-js-development/) |
90+
| PHP | Windows, Linux, macOS | [PHP SQL driver for SQL Server](/sql/connect/php/microsoft-php-driver-for-sql-server) | [Download](/sql/connect/php/download-drivers-php-sql-server) |
91+
| Python | Windows, Linux, macOS | [Python SQL driver](/sql/connect/python/python-driver-for-sql-server/) | Install choices:<br />\* [pymssql](/sql/connect/python/pymssql/step-1-configure-development-environment-for-pymssql-python-development/)<br />\* [pyodbc](/sql/connect/python/pyodbc/step-1-configure-development-environment-for-pyodbc-python-development/) |
92+
| Ruby | Windows, Linux, macOS | [Ruby driver for SQL Server](/sql/connect/ruby/ruby-driver-for-sql-server/) | [Install](/sql/connect/ruby/step-1-configure-development-environment-for-ruby-development/) |
9393

9494
### Data-access frameworks
9595

0 commit comments

Comments
 (0)