Merge pull request from rothja/connectquerysqlcmd

rothja · web-flow · commit 6248ff3938a0 · 2016-11-01T17:18:59.000-04:00
Current draft of sqlcmd topic
diff --git a/docs/linux/media/sql-server-linux-connect-and-query-sqlcmd/execute-query.png b/docs/linux/media/sql-server-linux-connect-and-query-sqlcmd/execute-query.png
diff --git a/docs/linux/media/sql-server-linux-connect-and-query-ssms/execute-query.png b/docs/linux/media/sql-server-linux-connect-and-query-ssms/execute-query.png
diff --git a/docs/linux/sql-server-linux-connect-and-query-sqlcmd.md b/docs/linux/sql-server-linux-connect-and-query-sqlcmd.md
@@ -6,7 +6,7 @@ description:
 author: rothja 
 ms.author: jroth 
 manager: jhubbard
-ms.date: 10-20-2016
+ms.date: 10-31-2016
 ms.topic: article
 ms.prod: sql-non-specified
 ms.service: 
@@ -26,8 +26,111 @@ ms.assetid:
 
 ---
 # Connect and query SQL Server on Linux (sqlcmd)
+This topic shows how to use [sqlcmd](https://msdn.microsoft.com/library/ms162773.aspx) to connect to SQL Server vNext CTP1 on Linux. 
 
-This topic provides a walkthrough for using sqlcmd.exe to connect and query SQL Server vNext CTP1 on Linux.
+After successfully connecting, you run a simple Transact-SQL (T-SQL) query to verify communication with the database.
+
+## Install the SQL Server command-line tools
+
+Sqlcmd is part of the SQL Server command-line tools, which are not installed automatically with SQL Server on Linux. If you have not already installed the SQL Server command-line tools on your Linux machine, you must install them. For more information on how to install the tools, select your Linux distribution from the following drop-down list.
+
+> [!div class="op_single_selector"]
+- [Ubuntu](sql-server-linux-setup-ubuntu.md#tools)
+- [Red Hat Enterprise Linux](sql-server-linux-setup-red-hat.md#tools)
+- [Docker](sql-server-linux-setup-docker.md#tools)
+
+## Connect to SQL Server on Linux
+
+The following steps show how to connect to SQL Server vNext on Linux with sqlcmd.
+
+1. On your Linux box, open a command terminal.
+
+2. Run **sqlcmd** with parameters for your SQL Server instance name (-H), the user name (-U), and the password (-P). 
+
+    The following command connects to the local SQL Server instance (**localhost**) on Linux.
+
+        sqlcmd -H localhost -U SA -P password
+
+    > [!TIP]
+    > You can omit the password on the command-line to be prompted to enter it manually.
+
+    If you are connecting to a remote instance, specify the machine name or IP address. 
+
+        sqlcmd -H 192.555.5.555 -U SA -P password
+
+    > [!TIP]
+    > If you get a connection failure, first attempt to diagnose the problem from the error message. Then review the [connection troubleshooting recommendations](sql-server-linux-connect-and-query.md#troubleshoot).
+
+## Run sample queries
+
+After you connect to your server, you can connect to a database and run a sample query. If you are new to writing queries, see [Writing Transact-SQL Statements](https://msdn.microsoft.com/library/ms365303.aspx).
+
+1. Identify a database to use to run a query against. This could be a new database you created in the [Transact-SQL tutorial](https://msdn.microsoft.com/library/ms365303.aspx). Or it could be the **AdventureWorks** sample database that you [downloaded and restored](sql-server-linux-restore-database.md).
+
+2. At the sqlcmd prompt, change the context to your target database. The following Transact-SQL statement changes the context to the **AdventureWorks** database.
+
+        USE AdventureWorks
+
+3. On a new line type **GO**, and press enter.
+
+        GO
+
+2. Next, write a Transact-SQL query to select data from one of the tables. You can press enter between lines of your query. The following example selects data from the **Production.Product** table of the **AdventureWorks** database.
+
+        SELECT TOP 10 Name, ProductNumber
+        FROM Production.Product
+        ORDER BY Name ASC
+
+3. Then type **GO** and press enter.
+
+4. The results output to the command window.
+
+	![Success. Connect to SQL Database server: SQL Server Management Studio](./media/sql-server-linux-connect-and-query-sqlcmd/execute-query.png)
+
+5. Type **exit** and press enter to quit sqlcmd. 
+
+## Run a Transact-SQL Script
+
+You can also use sqlcmd to run Transact-SQL script files. Use the following steps to run a script.
+
+1. In a Linux command terminal, use **vi** to create a new script file named sqlscript.sql.
+
+        vi sqlscript.sql
+
+2. In the **vi** editor, press **i** to enter INSERT mode.
+
+        i
+
+3. Enter the same Transact-SQL commands from the previous example.
+
+        USE AdventureWorks
+        GO
+
+        SELECT TOP 10 Name, ProductNumber
+        FROM Production.Product
+        ORDER BY Name ASC
+
+4. Press the Escape key to exit INSERT mode.
+
+5. Press **:x** to save and exit **vi**.
+
+        :x
+
+6. At the prompt, run sqlcmd with the sqlscript.sql file as an input file.
+
+        sqlcmd -H localhost -U SA -P password -i sqlscript.sql
+
+7. You should see 10 rows returned in the output window. Instead of staying at the sqlcmd prompt, you return immediately to the terminal prompt.
+
+> [!NOTE]
+> You can also send the output to a file with the **-o** parameter.
+>
+> **sqlcmd -H localhost -U SA -P password -i sqlscript.sql -o output.txt**
 
 # Next Steps
+
+In addition to queries, you can use T-SQL statements to create and manage databases.
+
+If you're new to T-SQL, see [Tutorial: Writing Transact-SQL Statements](https://msdn.microsoft.com/library/ms365303.aspx) and the [Transact-SQL Reference (Database Engine)](https://msdn.microsoft.com/library/bb510741.aspx).
+
 For more information on how to use sqlcmd.exe, see [sqlcmd Utility](https://msdn.microsoft.com/library/ms162773.aspx).
diff --git a/docs/linux/sql-server-linux-connect-and-query-ssms.md b/docs/linux/sql-server-linux-connect-and-query-ssms.md
@@ -26,7 +26,7 @@ ms.assetid:
 
 ---
 # Connect and query SQL Server on Linux (SSMS)
-This topic shows how to use SQL Server Management Studio (SSMS) to connect to SQL Server vNext CTP1 on Linux. SSMS is a Windows application, so use SSMS when you have a Windows machine that can connect to a remote SQL Server instance on Linux. 
+This topic shows how to use [SQL Server Management Studio (SSMS)](https://msdn.microsoft.com/library/mt238290.aspx) to connect to SQL Server vNext CTP1 on Linux. SSMS is a Windows application, so use SSMS when you have a Windows machine that can connect to a remote SQL Server instance on Linux. 
 
 After successfully connecting, you run a simple Transact-SQL (T-SQL) query to verify communication with the database.
 
@@ -73,10 +73,11 @@ After you connect to your server, you can connect to a database and run a sample
 
 	![New query. Connect to SQL Database server: SQL Server Management Studio](./media/sql-server-linux-connect-and-query-ssms/new-query.png)
 
-3. In the query window, write a Transact-SQL query to select data from one of the tables. The following example selects data from the **SalesLT.Customer** table of the **AdventureWorks** database.
+3. In the query window, write a Transact-SQL query to select data from one of the tables. The following example selects data from the **Production.Product** table of the **AdventureWorks** database.
 
-        SELECT CustomerId, Title, FirstName, LastName, CompanyName
-        FROM SalesLT.Customer;
+        SELECT TOP 10 Name, ProductNumber
+        FROM Production.Product
+        ORDER BY Name ASC
 
 4. Click the **Execute** button:
 
diff --git a/docs/linux/sql-server-linux-connect-and-query.md b/docs/linux/sql-server-linux-connect-and-query.md
@@ -34,13 +34,22 @@ To connect to SQL Server on Linux, you must use SQL Authentication (username and
 If you are running Linux on an Azure virtual machine, you must also [create a network security group rule](#azure).
 
 ## Tools
-The following table lists several tools that connect to SQL Server and allow you to run queries.
+The following sections describe several tools that connect to SQL Server and allow you to run queries.
 
-| Tool | Description |
-|-----|-----|
-| [sqlcmd](https://msdn.microsoft.com/library/ms162773.aspx) | **Sqlcmd.exe** is a command line tool that can be run from any Windows or Linux machine that has the SQL Server tools installed. It has a basic interface but is good for quickly connecting and running T-SQL commands. <br/>[Connect and query SQL Server on Linux (SqlCmd)](sql-server-linux-connect-and-query-sqlcmd.md) |
-| [Visual Studio Code](https://code.visualstudio.com) | **Visual Studio Code** is a lightweight, cross-platform development tool for writing code. The MSSQL extension provides the ability to execute TSQL commands. This is especially useful in development scenarios where you need to write both application code and database functionality. <br/>[Connect and query SQL Server on Linux (VS Code)](sql-server-linux-connect-and-query-vs-code.md) |
-| [SQL Server Management Studio (SSMS) for Windows](https://msdn.microsoft.com/library/mt238290.aspx) | **SQL Server Management Studio** is a Windows tool for both querying and managing SQL Server instances. This is best for when you are working with both Windows and Linux machines. You can connect SSMS running on Windows to SQL Server running on Linux. The advantage of SSMS is that it provide a graphical user interface for many server and database management tasks. <br/>[Connect and query SQL Server on Linux (SSMS)](sql-server-linux-connect-and-query-ssms.md) |
+### Sqlcmd
+[Sqlcmd](https://msdn.microsoft.com/library/ms162773.aspx) is a command line tool that can be run from any Windows or Linux machine that has the SQL Server tools installed. It has a basic interface but is good for quickly connecting and running T-SQL commands.
+
+For a tutorial for Sqlcmd, see [Connect and query SQL Server on Linux (Sqlcmd)](sql-server-linux-connect-and-query-sqlcmd.md).
+
+### Visual Studio Code
+[Visual Studio Code (VS Code)](https://code.visualstudio.com) is a lightweight, cross-platform development tool for writing code. The MSSQL extension provides the ability to execute TSQL commands. This is especially useful in development scenarios where you need to write both application code and database functionality.
+
+To see a tutorial for VS Code, see [Connect and query SQL Server on Linux (VS Code)](sql-server-linux-connect-and-query-vs-code.md).
+
+### SQL Server Management Studio for Windows
+[SQL Server Management Studio (SSMS)](https://msdn.microsoft.com/library/mt238290.aspx) is a Windows tool for both querying and managing SQL Server instances. This is best for when you are working with both Windows and Linux machines. You can connect SSMS running on Windows to SQL Server running on Linux. The advantage of SSMS is that it provide a graphical user interface for many server and database management tasks. <br/>
+
+To see a tutorial for SSMS, see [Connect and query SQL Server on Linux (SSMS)](sql-server-linux-connect-and-query-ssms.md).
 
 ## <a id="troubleshoot"></a> Troubleshoot connection failures
 If you are having difficulty connecting to your Linux SQL Server instance, there are a few things to check. 
diff --git a/docs/linux/sql-server-linux-setup-docker.md b/docs/linux/sql-server-linux-setup-docker.md
@@ -70,6 +70,9 @@ This topic explains how to pull and run the mssql-server Docker image. This imag
     > [!NOTE]
     > The **ACCEPT_EULA** and **SA_PASSWORD** environment variables are required to run the image.
 
+## <a id="tools"></a> SQL Server command-line tools
+The Docker image for SQL Server vNext comes with the SQL Server command-line tools and ODBC drivers pre-installed. For more details on these tools, see [Command-line tools and ODBC drivers](sql-server-linux-setup.md#tools).
+
 ## Next steps
 
 After installing SQL Server on Linux, next see [how to connect to the server and run basic Transact-SQL queries](sql-server-linux-connect-and-query.md).
diff --git a/docs/linux/sql-server-linux-setup-red-hat.md b/docs/linux/sql-server-linux-setup-red-hat.md
@@ -80,7 +80,7 @@ After installation on Red Hat Enterprise Linux you will need to do the following
         $ sudo firewall-cmd --zone=public --add-port=1433/tcp --permanent
         $ sudo firewall-cmd --reload
 
-## Install the tools
+## <a id="tools"></a> Install the tools
 The following steps installs the command-line tools, Microsoft ODBC drivers, and their dependencies. For the details on what gets installed, see [Command-line tools and ODBC drivers](sql-server-linux-setup.md#tools).
 
 > [!IMPORTANT]
diff --git a/docs/linux/sql-server-linux-setup-ubuntu.md b/docs/linux/sql-server-linux-setup-ubuntu.md
@@ -73,7 +73,7 @@ Use the following command to print the installed package name and version:
 
     $ dpkg-query -W | grep mssql
 
-## Install the tools
+## <a id="tools"></a> Install the tools
 The following steps installs the command-line tools, Microsoft ODBC drivers, and their dependencies. For the details on what gets installed, see [Command-line tools and ODBC drivers](sql-server-linux-setup.md#tools).
 
 > [!NOTE]
