Skip to content

Commit 3c26f93

Browse files
authored
Merge branch 'master' into terms05
2 parents 9c82bad + dc73f2f commit 3c26f93

44 files changed

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

docs/dma/dma-commandline.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ DmaCmd.exe /AssessmentName="string"
5656
|`/ImportFeatureDiscoveryReportJson` | Path to the feature discovery JSON report created earlier. Instead of source connections, this file will be used. | N
5757
|`/EnableAssessmentUploadToAzureMigrate` | Enables uploading and publishing assessment results to Azure Migrate | N
5858
|`/AzureCloudEnvironment` |Selects the Azure cloud environment to connect to, default is Azure Public Cloud. Supported values: Azure (default), AzureChina, AzureGermany,AzureUSGovernment. | N
59-
|`/SubscriptionId` |Azure subscription id. | Y <br> (Required if EnableAssessmentUploadToAzureMigrate argument is specified)
59+
|`/SubscriptionId` |Azure subscription ID. | Y <br> (Required if EnableAssessmentUploadToAzureMigrate argument is specified)
6060
|`/AzureMigrateProjectName` |The Azure Migrate Project name to upload assessment results to. | Y <br> (Required if EnableAssessmentUploadToAzureMigrate argument is specified)
6161
|`/ResourceGroupName` |Azure Migrate resource group name. | Y <br> (Required if EnableAssessmentUploadToAzureMigrate argument is specified)
6262
|`/AssessmentResultInputFolder` |The input folder path containing .DMA assessment files to upload to Azure Migrate. | Y <br> (Required if Action is AzureMigrateUpload)
@@ -264,7 +264,7 @@ DmaCmd.exe
264264
DmaCmd.exe
265265
/Action="AzureMigrateUpload"
266266
/AssessmentResultInputFolder="C:\assessments\results"
267-
/SubscriptionId="subscription Id"
267+
/SubscriptionId="Subscription Id"
268268
/AzureMigrateProjectName="Azure Migrate project name"
269269
/ResourceGroupName="Resource Group name"
270270
/AzureAuthenticationInteractiveAuthentication
@@ -311,7 +311,7 @@ These commands support recommendations for both Azure SQL Database single databa
311311

312312
`Dmacmd.exe /? or DmaCmd.exe /help`
313313

314-
**Azure SQL DB/MI SKU recommendation with price refresh (get latest prices) - Interactive authentication**
314+
**Azure SQL Database / Azure SQL Managed Instance SKU recommendation with price refresh (get latest prices) - Interactive authentication**
315315

316316
```
317317
.\DmaCmd.exe /Action=SkuRecommendation
@@ -328,7 +328,7 @@ These commands support recommendations for both Azure SQL Database single databa
328328
/AzureAuthenticationInteractiveAuthentication=true
329329
```
330330

331-
**Azure SQL DB/MI SKU recommendation with price refresh (get latest prices) - Certificate authentication**
331+
**Azure SQL Database / Azure SQL Managed Instance SKU recommendation with price refresh (get latest prices) - Certificate authentication**
332332

333333
```
334334
.\DmaCmd.exe /Action=SkuRecommendation
@@ -346,7 +346,7 @@ These commands support recommendations for both Azure SQL Database single databa
346346
/AzureAuthenticationCertificateThumbprint=<Your Certificate Thumbprint>
347347
```
348348

349-
**Azure SQL DB SKU/MI recommendation with price refresh (get latest prices) - Token authentication and specify databases to recommend**
349+
**Azure SQL Database / Azure SQL Managed Instance recommendation with price refresh (get latest prices) - Token authentication and specify databases to recommend**
350350

351351
```
352352
.\DmaCmd.exe /Action=SkuRecommendation
@@ -364,7 +364,7 @@ These commands support recommendations for both Azure SQL Database single databa
364364
/AzureAuthenticationToken=<Your Authentication Token>
365365
```
366366

367-
**Azure SQL DB/MI SKU recommendation without price refresh (use static prices)**
367+
**Azure SQL Database / Azure SQL Managed Instance SKU recommendation without price refresh (use static prices)**
368368
```
369369
.\DmaCmd.exe /Action=SkuRecommendation
370370
/SkuRecommendationInputDataFilePath="C:\TestOut\out.csv"

docs/index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@ additionalContent:
147147
url: connect/homepage-sql-connection-programming.md
148148
- text: DevOps using SQL Server
149149
url: https://www.microsoft.com/sql-server/developer-get-started/sql-devops/
150-
- text: Azure SQL DB applications
150+
- text: Azure SQL Database applications
151151
url: https://docs.microsoft.com/azure/sql-database/sql-database-develop-overview
152-
- text: Azure SQL DB connectivity libraries
152+
- text: Azure SQL Database connectivity libraries
153153
url: https://docs.microsoft.com/azure/sql-database/sql-database-connect-query#libraries
154154
- text: Transact-SQL (T-SQL)
155155
url: t-sql/language-reference.md

docs/relational-databases/system-dynamic-management-views/sys-dm-exec-query-stats-transact-sql.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ Returns aggregate performance statistics for cached query plans in [!INCLUDE[ssN
110110
|**min_spills**|**bigint**|The minimum number of pages that this query has ever spilled during a single execution.<br /><br /> **Applies to**: Starting with [!INCLUDE[ssSQL15](../../includes/sssql15-md.md)] SP2 and [!INCLUDE[ssSQL17](../../includes/sssql17-md.md)] CU3|
111111
|**max_spills**|**bigint**|The maximum number of pages that this query has ever spilled during a single execution.<br /><br /> **Applies to**: Starting with [!INCLUDE[ssSQL15](../../includes/sssql15-md.md)] SP2 and [!INCLUDE[ssSQL17](../../includes/sssql17-md.md)] CU3|
112112
|**pdw_node_id**|**int**|The identifier for the node that this distribution is on.<br /><br /> **Applies to**: [!INCLUDE[ssSDWfull](../../includes/sssdwfull-md.md)], [!INCLUDE[ssPDW](../../includes/sspdw-md.md)]|
113-
|**total_page_server_reads**|**bigint**|Total number of remote page server reads performed by executions of this plan since it was compiled.<br /><br /> **Applies to:** Azure SQL DB Hyperscale |
114-
|**last_page_server_reads**|**bigint**|Number of remote page server reads performed the last time the plan was executed.<br /><br /> **Applies To:** Azure SQL DB Hyperscale |
115-
|**min_page_server_reads**|**bigint**|Minimum number of remote page server reads that this plan has ever performed during a single execution.<br /><br /> **Applies To:** Azure SQL DB Hyperscale |
116-
|**max_page_server_reads**|**bigint**|Maximum number of remote page server reads that this plan has ever performed during a single execution.<br /><br /> **Applies To:** Azure SQL DB Hyperscale |
113+
|**total_page_server_reads**|**bigint**|Total number of remote page server reads performed by executions of this plan since it was compiled.<br /><br /> **Applies to:** Azure SQL Database Hyperscale |
114+
|**last_page_server_reads**|**bigint**|Number of remote page server reads performed the last time the plan was executed.<br /><br /> **Applies To:** Azure SQL Database Hyperscale |
115+
|**min_page_server_reads**|**bigint**|Minimum number of remote page server reads that this plan has ever performed during a single execution.<br /><br /> **Applies To:** Azure SQL Database Hyperscale |
116+
|**max_page_server_reads**|**bigint**|Maximum number of remote page server reads that this plan has ever performed during a single execution.<br /><br /> **Applies To:** Azure SQL Database Hyperscale |
117117
> [!NOTE]
118118
> <sup>1</sup> For natively compiled stored procedures when statistics collection is enabled, worker time is collected in milliseconds. If the query executes in less than one millisecond, the value will be 0.
119119

docs/ssdt/release-notes-ssdt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ _SSDT for Visual Studio 2015._
636636

637637
**AS projects**
638638
- Significant performance fixes made to improve experience when committing DAX measure changes and other model edits.
639-
- Fixed a number of issues with Power Query integration in Analysis Services projects using 1400-compatability level tabular models.
639+
- Fixed a number of issues with Power Query integration in Analysis Services projects using 1400-compatibility level tabular models.
640640
- Fixed an issue in Multi-Dimensional projects in VS2017 only where Design Aggregation designer may fail to load.
641641
- Fixed an issue when dragging an item in the Analysis Services multi-dimensional DSV diagram that could crash VS 2017.
642642
- Fixed an issue in AS projects where the Deploy Dialog was not always in the foreground on top of Visual Studio.

docs/ssma/access/connect-to-azure-sql-db-accesstosql.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Connect To Azure SQL DB (AccessToSQL) | Microsoft Docs"
2+
title: "Connect To Azure SQL Database (AccessToSQL) | Microsoft Docs"
33
ms.prod: sql
44
ms.date: "01/19/2017"
55
ms.reviewer: ""
@@ -11,7 +11,7 @@ ms.assetid: bf44b236-d9be-41ae-a5fd-bd73038e505f
1111
author: Shamikg
1212
ms.author: Shamikg
1313
---
14-
# Connect To Azure SQL DB (AccessToSQL)
14+
# Connect To Azure SQL Database (AccessToSQL)
1515
Use the Connect to SQL Azure dialog box to connect to the SQL Azure database that you want to migrate.
1616

1717
To access this dialog box, on the **File** menu, select **Connect to SQL Azure**. If you have previously connected, the command is **Reconnect to SQL Azure.**
@@ -40,16 +40,16 @@ Enter the password for the user name.
4040

4141
SSMA recommends encrypted connection to SQL Azure.
4242

43-
## Create Azure Database
44-
To create a new azure database, follow the following steps
43+
## Create database
44+
To create a new database, follow the following steps
4545

4646
1. click on browse button that is present in the Connect to SQL Azure dialog box
4747

4848
2. If there are no databases, two menu items appear
4949

5050
1. **(no databases found)** which is disabled and grayed out all the time
5151

52-
2. **Create new database** which is always enabled, enabling the user to create a new azure database on SQL Azure account. Upon clicking this menu item, create azure database dialog box is present with database name and size.
52+
2. **Create new database** which is always enabled, enabling the user to create a new database. Upon clicking this menu item, create database dialog box is present with database name and size.
5353

5454
3. At the time of database creation, these two parameters is given as input.
5555

docs/ssma/access/toc.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
href: save-metadata-accesstosql.md
1919
- name: Connecting to SQL Server
2020
href: connecting-to-sql-server-accesstosql.md
21-
- name: Migrating Access Data into Azure SQL DB
21+
- name: Migrating Access Data into Azure SQL Database
2222
href: migrating-access-data-into-sql-server-azure-sql-db-accesstosql.md
2323
- name: Creating & Managing Project
2424
href: creating-and-managing-projects-accesstosql.md
@@ -38,7 +38,7 @@
3838
href: new-project-ssma-accesstosql.md
3939
- name: Command-Line Options in SSMA Console
4040
href: command-line-options-in-ssma-console-accesstosql.md
41-
- name: Connect To Azure SQL DB
41+
- name: Connect To Azure SQL Database
4242
href: connect-to-azure-sql-db-accesstosql.md
4343
- name: Assessment Report
4444
href: assessment-report-accesstosql.md
@@ -60,15 +60,15 @@
6060
href: assessing-access-database-objects-for-conversion-accesstosql.md
6161
- name: Creating the Server Connection Files
6262
href: creating-the-server-connection-files-accesstosql.md
63-
- name: Linking Access Applications to Azure SQL DB
63+
- name: Linking Access Applications to Azure SQL Database
6464
href: linking-access-applications-to-sql-server-azure-sql-db-accesstosql.md
6565
- name: Creating Variable Value Files
6666
href: creating-variable-value-files-accesstosql.md
6767
- name: Edit Type Mapping
6868
href: edit-type-mapping-accesstosql.md
6969
- name: Exporting an Access Inventory
7070
href: exporting-an-access-inventory-accesstosql.md
71-
- name: Migrating Access Databases to Azure SQL DB
71+
- name: Migrating Access Databases to Azure SQL Database
7272
href: migrating-access-databases-to-sql-server-azure-sql-db-accesstosql.md
7373
- name: Mapping Source & Target Databases
7474
href: mapping-source-and-target-databases-accesstosql.md
@@ -92,7 +92,7 @@
9292
href: find-databases-wizard-select-files-accesstosql.md
9393
- name: Shortcut Keys
9494
href: shortcut-keys-accesstosql.md
95-
- name: Connecting to Azure SQL DB
95+
- name: Connecting to Azure SQL Database
9696
href: connecting-to-azure-sql-db-accesstosql.md
9797
- name: Setting Conversion & Migration Options
9898
href: setting-conversion-and-migration-options-accesstosql.md
@@ -112,7 +112,7 @@
112112
href: project-settings-gui-accesstosql.md
113113
- name: Conversion
114114
href: project-settings-conversion-accesstosql.md
115-
- name: Azure SQL DB
115+
- name: Azure SQL Database
116116
href: project-settings-azure-sql-db-accesstosql.md
117117
- name: Type-Mapping
118118
href: project-settings-type-mapping-accesstosql.md

docs/ssma/db2/connecting-to-sql-server-db2etosql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ When you define the connection properties, you also specify the database where o
6464

6565
7. Click **Connect**.
6666

67-
**Higher Version Compatability**
67+
**Higher Version compatibility**
6868

6969
- You will be able to connect to [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] 2008 and [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] 2012 and [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] 2014 and [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] 2016 when the migration project created is [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] 2005.
7070

docs/ssma/mysql/migrating-mysql-data-into-sql-server-azure-sql-db-mysqltosql.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Migrating MySQL Data into SQL Server - Azure SQL DB (MySQLToSQL) | Microsoft Docs"
2+
title: "Migrating MySQL Data into SQL Server - Azure SQL Database (MySQLToSQL) | Microsoft Docs"
33
ms.prod: sql
44
ms.custom: ""
55
ms.date: "01/19/2017"
@@ -13,7 +13,7 @@ ms.assetid: a6a7f4d6-68aa-4a38-93bf-53eba0d7dc82
1313
author: "Shamikg"
1414
ms.author: "Shamikg"
1515
---
16-
# Migrating MySQL Data into SQL Server - Azure SQL DB (MySQLToSQL)
16+
# Migrating MySQL Data into SQL Server - Azure SQL Database (MySQLToSQL)
1717
After you have successfully synchronized the converted objects with [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] or SQL Azure, you can migrate data from MySQL to [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] or SQL Azure.
1818

1919
> [!IMPORTANT]
@@ -94,13 +94,13 @@ To view migration messages, make sure that the Output pane is visible. Otherwise
9494

9595
If the target database is SQL Server, then, enter the connection credentials in the **Connect to SQL Server** dialog box, and click **Connect**. For more information on connecting to SQL Server, see [Connect to SQL Server](https://msdn.microsoft.com/bb8c4bde-cfc2-4636-92ae-5dd24abe9536)
9696

97-
If the target database is SQL Azure, then enter the connection credentials in the **Connect to SQL Azure** dialog box, and click **Connect**. For more information on connecting to SQL Azure, see [Connect to Azure SQL DB &#40;MySQLToSQL&#41;](../../ssma/mysql/connect-to-azure-sql-db-mysqltosql.md)
97+
If the target database is SQL Azure, then enter the connection credentials in the **Connect to SQL Azure** dialog box, and click **Connect**. For more information on connecting to SQL Azure, see [Connect to Azure SQL Database &#40;MySQLToSQL&#41;](../../ssma/mysql/connect-to-azure-sql-db-mysqltosql.md)
9898

9999
Messages will appear in the **Output** pane. When the migration is complete, the **Data Migration Report** appears. If any data did not migrate, click the row that contains the errors, and then click **Details**. When you are finished with the report, click **Close**. For more information on Data Migration Report, see [Data Migration Report (SSMA Common)](https://msdn.microsoft.com/bbfb9d88-5a98-4980-8d19-c5d78bd0d241)
100100

101101
> [!NOTE]
102102
> When SQL Express edition is used as the target database, only client side data migration is allowed and server side data migration is not supported.
103103
104104
## See Also
105-
[Migrating MySQL Databases to SQL Server - Azure SQL DB &#40;MySQLToSql&#41;](../../ssma/mysql/migrating-mysql-databases-to-sql-server-azure-sql-db-mysqltosql.md)
105+
[Migrating MySQL Databases to SQL Server - Azure SQL Database &#40;MySQLToSql&#41;](../../ssma/mysql/migrating-mysql-databases-to-sql-server-azure-sql-db-mysqltosql.md)
106106

docs/ssma/mysql/migrating-mysql-databases-to-sql-server-azure-sql-db-mysqltosql.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Migrate MySQL Databases to SQL Server - Azure SQL DB | Microsoft Docs"
2+
title: "Migrate MySQL Databases to SQL Server - Azure SQL Database | Microsoft Docs"
33
description: Use this recommended process to migrate MySQL databases to SQL Server or Azure SQL Database using SQL Server Migration Assistant (SSMA).
44
ms.prod: sql
55
ms.custom: ""
@@ -11,7 +11,7 @@ ms.assetid: 8006f9a0-394d-4238-8dc5-44255134628b
1111
author: "Shamikg"
1212
ms.author: "Shamikg"
1313
---
14-
# Migrating MySQL Databases to SQL Server - Azure SQL DB (MySQLToSql)
14+
# Migrating MySQL Databases to SQL Server - Azure SQL Database (MySQLToSql)
1515
SQL Server Migration Assistant (SSMA) for MySQL is a comprehensive environment that helps you quickly migrate MySQL databases to SQL Server or SQL Azure. By using SSMA for MySQL, you can review database objects and data, assess databases for migration, migrate database objects to SQL Server or SQL Azure, and then migrate data to SQL Server or SQL Azure.
1616

1717
## Recommended Migration Process
@@ -27,7 +27,7 @@ To successfully migrate objects and data from MySQL databases to SQL Server or S
2727

2828
4. [Mapping MySQL Databases to SQL Server Schemas &#40;MySQLToSQL&#41;](../../ssma/mysql/mapping-mysql-databases-to-sql-server-schemas-mysqltosql.md)
2929

30-
5. [Connecting to Azure SQL DB &#40;MySQLToSQL&#41;](../../ssma/mysql/connecting-to-azure-sql-db-mysqltosql.md)
30+
5. [Connecting to Azure SQL Database &#40;MySQLToSQL&#41;](../../ssma/mysql/connecting-to-azure-sql-db-mysqltosql.md)
3131

3232
6. Optionally, [Assessing MySQL Databases for Conversion &#40;MySQLToSQL&#41;](../../ssma/mysql/assessing-mysql-databases-for-conversion-mysqltosql.md) to assess database objects for conversion and estimate the conversion time.
3333

@@ -41,7 +41,7 @@ To successfully migrate objects and data from MySQL databases to SQL Server or S
4141

4242
- Synchronize the database objects.
4343

44-
10. [Migrating MySQL Data into SQL Server - Azure SQL DB &#40;MySQLToSQL&#41;](../../ssma/mysql/migrating-mysql-data-into-sql-server-azure-sql-db-mysqltosql.md)
44+
10. [Migrating MySQL Data into SQL Server - Azure SQL Database &#40;MySQLToSQL&#41;](../../ssma/mysql/migrating-mysql-data-into-sql-server-azure-sql-db-mysqltosql.md)
4545

4646
11. If necessary, update database applications.
4747

docs/ssma/mysql/project-settings-azure-sql-db-mysqltosql.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Project Settings (Azure SQL DB) (MySQLToSQL) | Microsoft Docs"
2+
title: "Project Settings (Azure SQL Database) (MySQLToSQL) | Microsoft Docs"
33
ms.prod: sql
44
ms.custom: ""
55
ms.date: "01/19/2017"
@@ -10,7 +10,7 @@ ms.assetid: 8c06420a-533b-4de0-948d-a0c6b368c544
1010
author: "Shamikg"
1111
ms.author: "Shamikg"
1212
---
13-
# Project Settings (Azure SQL DB) (MySQLToSQL)
13+
# Project Settings (Azure SQL Database) (MySQLToSQL)
1414
The SQL Azure project settings let you configure the SQL Azure database suffix to be added in the connection dialog and also allow implementing heartbeat mechanism in SQL Azure connection.
1515

1616
The SQL Azure pane is available in the **Project Settings** and **Default Project Settings** dialog boxes.

0 commit comments

Comments
 (0)