Skip to content

Commit fb58045

Browse files
author
MightyPen
committed
4. Remove Firewall bullet from includes file. Finish all other 'sql-database-connect-query-*.md' files.
1 parent 70df6b9 commit fb58045

12 files changed

+67
-150
lines changed

articles/sql-database/sql-database-connect-query-dotnet-core.md

+5-17
Original file line numberDiff line numberDiff line change
@@ -16,36 +16,24 @@ ms.devlang: dotnet
1616
ms.topic: quickstart
1717
ms.date: 07/05/2017
1818
ms.author: carlrab
19-
2019
---
2120
# Use .NET Core (C#) to query an Azure SQL database
2221

23-
This quick start tutorial demonstrates how to use [.NET Core](https://www.microsoft.com/net/) on Windows/Linux/macOS to create a C# program to connect to an Azure SQL database and use Transact-SQL statements to query data.
22+
This quickstart tutorial demonstrates how to use [.NET Core](https://www.microsoft.com/net/) on Windows/Linux/macOS to create a C# program to connect to an Azure SQL database and use Transact-SQL statements to query data.
2423

2524
## Prerequisites
2625

27-
To complete this quick start tutorial, make sure you have the following:
26+
To complete this quickstart tutorial, make sure you have the following:
2827

29-
- An Azure SQL database. This quick start uses the resources created in one of these quick starts:
28+
[!INCLUDE [prerequisites-create-db](../../includes/sql-database-connect-query-prerequisites-create-db-includes.md)]
3029

31-
- [Create DB - Portal](sql-database-get-started-portal.md)
32-
- [Create DB - CLI](sql-database-get-started-cli.md)
33-
- [Create DB - PowerShell](sql-database-get-started-powershell.md)
30+
- A [server-level firewall rule](sql-database-get-started-portal.md#create-a-server-level-firewall-rule) for the public IP address of the computer you use for this quickstart tutorial.
3431

35-
- A [server-level firewall rule](sql-database-get-started-portal.md#create-a-server-level-firewall-rule) for the public IP address of the computer you use for this quick start tutorial.
3632
- You have installed [.NET Core for your operating system](https://www.microsoft.com/net/core).
3733

3834
## SQL server connection information
3935

40-
Get the connection information needed to connect to the Azure SQL database. You will need the fully qualified server name, database name, and login information in the next procedures.
41-
42-
1. Log in to the [Azure portal](https://portal.azure.com/).
43-
2. Select **SQL Databases** from the left-hand menu, and click your database on the **SQL databases** page.
44-
3. On the **Overview** page for your database, review the fully qualified server name as shown in the following image. You can hover over the server name to bring up the **Click to copy** option.
45-
46-
![server-name](./media/sql-database-connect-query-dotnet/server-name.png)
47-
48-
4. If you forget your Azure SQL Database server login information, navigate to the SQL Database server page to view the server admin name. You can reset the password if necessary.
36+
[!INCLUDE [prerequisites-server-connection-info](../../includes/sql-database-connect-query-prerequisites-server-connection-info-includes.md)]
4937

5038
5. Click **Show database connection strings**.
5139

articles/sql-database/sql-database-connect-query-dotnet-visual-studio.md

+5-17
Original file line numberDiff line numberDiff line change
@@ -17,36 +17,24 @@ ms.topic: quickstart
1717
ms.date: 07/05/2017
1818
ms.author: carlrab
1919
ms.custom: devcenter
20-
2120
---
2221
# Use .NET (C#) with Visual Studio to connect and query an Azure SQL database
2322

24-
This quick start tutorial demonstrates how to use the [.NET framework](https://www.microsoft.com/net/) to create a C# program with Visual Studio to connect to an Azure SQL database and use Transact-SQL statements to query data.
23+
This quickstart tutorial demonstrates how to use the [.NET framework](https://www.microsoft.com/net/) to create a C# program with Visual Studio to connect to an Azure SQL database and use Transact-SQL statements to query data.
2524

2625
## Prerequisites
2726

28-
To complete this quick start tutorial, make sure you have the following:
27+
To complete this quickstart tutorial, make sure you have the following:
2928

30-
- An Azure SQL database. This quick start uses the resources created in one of these quick starts:
29+
[!INCLUDE [prerequisites-create-db](../../includes/sql-database-connect-query-prerequisites-create-db-includes.md)]
3130

32-
- [Create DB - Portal](sql-database-get-started-portal.md)
33-
- [Create DB - CLI](sql-database-get-started-cli.md)
34-
- [Create DB - PowerShell](sql-database-get-started-powershell.md)
31+
- A [server-level firewall rule](sql-database-get-started-portal.md#create-a-server-level-firewall-rule) for the public IP address of the computer you use for this quickstart tutorial.
3532

36-
- A [server-level firewall rule](sql-database-get-started-portal.md#create-a-server-level-firewall-rule) for the public IP address of the computer you use for this quick start tutorial.
3733
- An installation of [Visual Studio Community 2017, Visual Studio Professional 2017, or Visual Studio Enterprise 2017](https://www.visualstudio.com/downloads/).
3834

3935
## SQL server connection information
4036

41-
Get the connection information needed to connect to the Azure SQL database. You will need the fully qualified server name, database name, and login information in the next procedures.
42-
43-
1. Log in to the [Azure portal](https://portal.azure.com/).
44-
2. Select **SQL Databases** from the left-hand menu, and click your database on the **SQL databases** page.
45-
3. On the **Overview** page for your database, review the fully qualified server name as shown in the following image. You can hover over the server name to bring up the **Click to copy** option.
46-
47-
![server-name](./media/sql-database-connect-query-dotnet/server-name.png)
48-
49-
4. If you forget your Azure SQL Database server login information, navigate to the SQL Database server page to view the server admin name. You can reset the password if necessary.
37+
[!INCLUDE [prerequisites-server-connection-info](../../includes/sql-database-connect-query-prerequisites-server-connection-info-includes.md)]
5038

5139
5. Click **Show database connection strings**.
5240

articles/sql-database/sql-database-connect-query-go.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ This quickstart demonstrates how to use [Go](https://godoc.org/github.com/denise
2525

2626
To complete this quickstart tutorial, make sure you have the following prerequisites:
2727

28-
[!INCLUDE [prerequisites-create-db-firewall](../../includes/sql-database-connect-query-prerequisites-create-db-firewall-includes.md)]
28+
[!INCLUDE [prerequisites-create-db](../../includes/sql-database-connect-query-prerequisites-create-db-includes.md)]
29+
30+
- A [server-level firewall rule](../articles/sql-database/sql-database-get-started-portal.md#create-a-server-level-firewall-rule) for the public IP address of the computer you use for this quickstart tutorial.
2931

3032
- You have installed Go and related software for your operating system.
3133

articles/sql-database/sql-database-connect-query-java.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ This quickstart demonstrates how to use [Java](https://docs.microsoft.com/sql/co
2525

2626
To complete this quickstart tutorial, make sure you have the following prerequisites:
2727

28-
[!INCLUDE [prerequisites-create-db-firewall](../../includes/sql-database-connect-query-prerequisites-create-db-firewall-includes.md)]
28+
[!INCLUDE [prerequisites-create-db](../../includes/sql-database-connect-query-prerequisites-create-db-includes.md)]
29+
30+
- A [server-level firewall rule](sql-database-get-started-portal.md#create-a-server-level-firewall-rule) for the public IP address of the computer you use for this quickstart tutorial.
2931

3032
- You have installed Java and related software for your operating system.
3133

articles/sql-database/sql-database-connect-query-nodejs.md

+6-19
Original file line numberDiff line numberDiff line change
@@ -14,41 +14,29 @@ ms.workload: "On Demand"
1414
ms.tgt_pltfrm: na
1515
ms.devlang: nodejs
1616
ms.topic: quickstart
17-
ms.date: 07/05/2017
17+
ms.date: 07/06/2017
1818
ms.author: carlrab
19-
2019
---
2120
# Use Node.js to query an Azure SQL database
2221

23-
This quick start tutorial demonstrates how to use [Node.js](https://nodejs.org/en/) to create a program to connect to an Azure SQL database and use Transact-SQL statements to query data.
22+
This quickstart tutorial demonstrates how to use [Node.js](https://nodejs.org/en/) to create a program to connect to an Azure SQL database and use Transact-SQL statements to query data.
2423

2524
## Prerequisites
2625

27-
To complete this quick start tutorial, make sure you have the following:
26+
To complete this quickstart tutorial, make sure you have the following:
2827

29-
- An Azure SQL database. This quick start uses the resources created in one of these quick starts:
28+
[!INCLUDE [prerequisites-create-db](../../includes/sql-database-connect-query-prerequisites-create-db-includes.md)]
3029

31-
- [Create DB - Portal](sql-database-get-started-portal.md)
32-
- [Create DB - CLI](sql-database-get-started-cli.md)
33-
- [Create DB - PowerShell](sql-database-get-started-powershell.md)
30+
- A [server-level firewall rule](sql-database-get-started-portal.md#create-a-server-level-firewall-rule) for the public IP address of the computer you use for this quickstart tutorial.
3431

35-
- A [server-level firewall rule](sql-database-get-started-portal.md#create-a-server-level-firewall-rule) for the public IP address of the computer you use for this quick start tutorial.
3632
- You have installed Node.js and related software for your operating system.
3733
- **MacOS**: Install Homebrew and Node.js, and then install the ODBC driver and SQLCMD. See [Step 1.2 and 1.3](https://www.microsoft.com/sql-server/developer-get-started/node/mac/).
3834
- **Ubuntu**: Install Node.js, and then install the ODBC driver and SQLCMD. See [Step 1.2 and 1.3](https://www.microsoft.com/sql-server/developer-get-started/node/ubuntu/) .
3935
- **Windows**: Install Chocolatey and Node.js, and then install the ODBC driver and SQL CMD. See [Step 1.2 and 1.3](https://www.microsoft.com/sql-server/developer-get-started/node/windows/).
4036

4137
## SQL server connection information
4238

43-
Get the connection information needed to connect to the Azure SQL database. You will need the fully qualified server name, database name, and login information in the next procedures.
44-
45-
1. Log in to the [Azure portal](https://portal.azure.com/).
46-
2. Select **SQL Databases** from the left-hand menu, and click your database on the **SQL databases** page.
47-
3. On the **Overview** page for your database, review the fully qualified server name as shown in the following image. You can hover over the server name to bring up the **Click to copy** option.
48-
49-
![server-name](./media/sql-database-connect-query-dotnet/server-name.png)
50-
51-
4. If you have forgotten the login information for your Azure SQL Database server, navigate to the SQL Database server page to view the server admin name and, if necessary, reset the password.
39+
[!INCLUDE [prerequisites-server-connection-info](../../includes/sql-database-connect-query-prerequisites-server-connection-info-includes.md)]
5240

5341
> [!IMPORTANT]
5442
> You must have a firewall rule in place for the public IP address of the computer on which you perform this tutorial. If you are on a different computer or have a different public IP address, create a [server-level firewall rule using the Azure portal](sql-database-get-started-portal.md#create-a-server-level-firewall-rule).
@@ -142,4 +130,3 @@ Open a command prompt and create a folder named *sqltest*. Navigate to the folde
142130
- Learn how to [Connect and query with SSMS](sql-database-connect-query-ssms.md)
143131
- Learn how to [Connect and query with Visual Studio Code](sql-database-connect-query-vscode.md).
144132

145-

articles/sql-database/sql-database-connect-query-php.md

+5-18
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,18 @@ ms.devlang: php
1616
ms.topic: quickstart
1717
ms.date: 08/08/2017
1818
ms.author: carlrab
19-
2019
---
2120
# Use PHP to query an Azure SQL database
2221

23-
This quick start tutorial demonstrates how to use [PHP](http://php.net/manual/en/intro-whatis.php) to create a program to connect to an Azure SQL database and use Transact-SQL statements to query data.
22+
This quickstart tutorial demonstrates how to use [PHP](http://php.net/manual/en/intro-whatis.php) to create a program to connect to an Azure SQL database and use Transact-SQL statements to query data.
2423

2524
## Prerequisites
2625

27-
To complete this quick start tutorial, make sure you have the following:
28-
29-
- An Azure SQL database. This quick start uses the resources created in one of these quick starts:
26+
To complete this quickstart tutorial, make sure you have the following:
3027

31-
- [Create DB - Portal](sql-database-get-started-portal.md)
32-
- [Create DB - CLI](sql-database-get-started-cli.md)
33-
- [Create DB - PowerShell](sql-database-get-started-powershell.md)
28+
[!INCLUDE [prerequisites-create-db](../../includes/sql-database-connect-query-prerequisites-create-db-includes.md)]
3429

35-
- A [server-level firewall rule](sql-database-get-started-portal.md#create-a-server-level-firewall-rule) for the public IP address of the computer you use for this quick start tutorial.
30+
- A [server-level firewall rule](sql-database-get-started-portal.md#create-a-server-level-firewall-rule) for the public IP address of the computer you use for this quickstart tutorial.
3631

3732
- You have installed PHP and related software for your operating system.
3833

@@ -42,15 +37,7 @@ To complete this quick start tutorial, make sure you have the following:
4237

4338
## SQL server connection information
4439

45-
Get the connection information needed to connect to the Azure SQL database. You will need the fully qualified server name, database name, and login information in the next procedures.
46-
47-
1. Log in to the [Azure portal](https://portal.azure.com/).
48-
2. Select **SQL Databases** from the left-hand menu, and click your database on the **SQL databases** page.
49-
3. On the **Overview** page for your database, review the fully qualified server name as shown in the following image. You can hover over the server name to bring up the **Click to copy** option.
50-
51-
![server-name](./media/sql-database-connect-query-dotnet/server-name.png)
52-
53-
4. If you forget your server login information, navigate to the SQL Database server page to view the server admin name and, if necessary, reset the password.
40+
[!INCLUDE [prerequisites-server-connection-info](../../includes/sql-database-connect-query-prerequisites-server-connection-info-includes.md)]
5441

5542
## Insert code to query SQL database
5643

articles/sql-database/sql-database-connect-query-portal.md

+3-6
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,13 @@ ms.author: ayolubek
2121
---
2222
# Azure portal: Use the SQL Query Editor to connect and query data
2323

24-
The SQL Query Editor is a browser query tool that provides an efficient and lightweight way to execute SQL queries on your Azure SQL Database or Azure SQL Data Warehouse without leaving the Azure portal. This quick start demonstrates how to use the Query Editor to connect to a SQL database, and then use Transact-SQL statements to query, insert, update, and delete data in the database.
24+
The SQL Query Editor is a browser query tool that provides an efficient and lightweight way to execute SQL queries on your Azure SQL Database or Azure SQL Data Warehouse without leaving the Azure portal. This quickstart demonstrates how to use the Query Editor to connect to a SQL database, and then use Transact-SQL statements to query, insert, update, and delete data in the database.
2525

2626
## Prerequisites
2727

28-
This quick start uses as its starting point the resources created in one of these quick starts:
29-
30-
- [Create DB - Portal](sql-database-get-started-portal.md)
31-
- [Create DB - CLI](sql-database-get-started-cli.md)
32-
- [Create DB - PowerShell](sql-database-get-started-powershell.md)
28+
This quickstart uses as its starting point the resources created in one of these quickstarts:
3329

30+
[!INCLUDE [prerequisites-create-db](../../includes/sql-database-connect-query-prerequisites-create-db-includes.md)]
3431

3532
## Log in to the Azure portal
3633

articles/sql-database/sql-database-connect-query-python.md

+5-17
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,15 @@ ms.author: carlrab
1919
---
2020
# Use Python to query an Azure SQL database
2121

22-
This quick start demonstrates how to use [Python](https://python.org) to connect to an Azure SQL database and use Transact-SQL statements to query data.
22+
This quickstart demonstrates how to use [Python](https://python.org) to connect to an Azure SQL database and use Transact-SQL statements to query data.
2323

2424
## Prerequisites
2525

26-
To complete this quick start tutorial, make sure you have the following:
26+
To complete this quickstart tutorial, make sure you have the following:
2727

28-
- An Azure SQL database. This quick start uses the resources created in one of these quick starts:
28+
[!INCLUDE [prerequisites-create-db](../../includes/sql-database-connect-query-prerequisites-create-db-includes.md)]
2929

30-
- [Create DB - Portal](sql-database-get-started-portal.md)
31-
- [Create DB - CLI](sql-database-get-started-cli.md)
32-
- [Create DB - PowerShell](sql-database-get-started-powershell.md)
33-
34-
- A [server-level firewall rule](sql-database-get-started-portal.md#create-a-server-level-firewall-rule) for the public IP address of the computer you use for this quick start tutorial.
30+
- A [server-level firewall rule](sql-database-get-started-portal.md#create-a-server-level-firewall-rule) for the public IP address of the computer you use for this quickstart tutorial.
3531

3632
- You have installed Python and related software for your operating system.
3733

@@ -41,15 +37,7 @@ To complete this quick start tutorial, make sure you have the following:
4137

4238
## SQL server connection information
4339

44-
Get the connection information needed to connect to the Azure SQL database. You will need the fully qualified server name, database name, and login information in the next procedures.
45-
46-
1. Log in to the [Azure portal](https://portal.azure.com/).
47-
2. Select **SQL Databases** from the left-hand menu, and click your database on the **SQL databases** page.
48-
3. On the **Overview** page for your database, review the fully qualified server name as shown in the following image. You can hover over the server name to bring up the **Click to copy** option.
49-
50-
![server-name](./media/sql-database-connect-query-dotnet/server-name.png)
51-
52-
4. If you forget your server login information, navigate to the SQL Database server page to view the server admin name and, if necessary, reset the password.
40+
[!INCLUDE [prerequisites-server-connection-info](../../includes/sql-database-connect-query-prerequisites-server-connection-info-includes.md)]
5341

5442
## Insert code to query SQL database
5543

0 commit comments

Comments
 (0)