Merge pull request #3685 from MicrosoftDocs/master

10/26 PM Publish

Author: v-alje

docs/connect/jdbc/setting-the-connection-properties.md

@@ -59,7 +59,7 @@ ms.workload: "On Demand"
 
      For example, an UPDATE statement for a Customer table might have the following syntax:  
 
-    ```  
+    ```sql
     update CDCSample.Customer  
     set TerritoryID  = ?,  
         CustomerType  = ?,  
@@ -91,7 +91,7 @@ ms.workload: "On Demand"
 
      For example, a DELETE statement for a Customer table might have the following syntax:  
 
-    ```  
+    ```sql
     delete from Customer where CustomerID = ?  
   
     ```  

docs/integration-services/change-data-capture/apply-the-changes-to-the-destination.md

@@ -70,7 +70,7 @@ ms.workload: "Inactive"
 
     -   If you are programming in C#, enter the following lines of code:  
 
-        ```  
+        ```csharp 
         int dataReady;  
         System.DateTime extractStartTime;  
         System.DateTime extractEndTime;  
@@ -96,7 +96,7 @@ ms.workload: "Inactive"
 
     -   If you are programming in [!INCLUDE[vbprvb](../../includes/vbprvb-md.md)], enter the following lines of code:  
 
-        ```  
+        ```vb  
         Dim dataReady As Integer  
         Dim extractStartTime As Date  
         Dim extractEndTime As Date  
@@ -144,7 +144,7 @@ ms.workload: "Inactive"
 
     4.  For **SQLStatement**, enter the following SQL statement:  
 
-        ```  
+        ```sql
         declare @ExtractStartTime datetime,  
         @ExtractEndTime datetime,   
         @DataReady int  

docs/integration-services/change-data-capture/prepare-to-query-for-the-change-data.md

@@ -31,7 +31,7 @@ ms.workload: "Inactive"
 
  When using the Oracle CDC Designer console, changes are automatically detected. When updating the Oracle CDC configuration directly using SQL, the following procedure should be called for the Oracle CDC Service to notice the configuration change:  
 
-```  
+```sql
 DECLARE @dbname nvarchar(128) = 'HRcdc'  
 EXECUTE [MSXDBCDC].[dbo].[xdbcdc_update_config_version] @dbname  
 GO  
@@ -60,7 +60,7 @@ GO
 
  The log mining password is stored encrypted by means of an asymmetric key with the fixed name `xdbcdc_asym_key` that is automatically created with the following command:  
 
-```  
+```sql
 USE [<cdc-database-name>]  
 CREATE ASYMMETRIC KEY xdbcdc_asym_key  
     WITH ALGORITHM = RSA_1024  

docs/integration-services/change-data-capture/the-oracle-cdc-service.md

@@ -61,7 +61,7 @@ ms.workload: "On Demand"
 
 -   If you use Microsoft Visual Basic to write the application, set the **My.Application.CommandLineArgs** property. The following example sets the **My.Application.CommandLineArgs** property is to retrieve two arguments:  
 
-    ```  
+    ```vb  
     Dim variable1 As String = My.Application.CommandLineArgs.Item(0)  
     Dim variable2 As String = My.Application.CommandLineArgs.Item(1)   
     ```  

docs/integration-services/control-flow/execute-process-task.md

@@ -64,7 +64,7 @@ ms.workload: "Inactive"
 ### Use this script to isolate problems and reproduce them in SQL Server Management Studio  
  The CDC source operation is governed by the operation of the CDC Control task executed before invoking the CDC source. The CDC Control task prepares the value of the CDC state package variable to contain the start and end LSNs. It performs function equivalent to the following script:  
 
-```  
+```sql
 use <cdc-enabled-database-name>  
                declare @start_lsn binary(10), @end_lsn binary(10)  
                set @start_lsn = sys.fn_cdc_increment_lsn(  

docs/integration-services/data-flow/cdc-source.md

@@ -107,7 +107,7 @@ ms.workload: "On Demand"
 
     3.  For **SQL command text**, enter the following query:  
 
-        ```  
+        ```sql 
         SELECT     Person.Contact.EmailAddress, Person.Contact.FirstName, CONVERT(float, Sales.SalesPerson.Bonus) AS Bonus  
         FROM         Sales.SalesPerson INNER JOIN  
                               Person.Contact ON Sales.SalesPerson.SalesPersonID = Person.Contact.ContactID  

docs/integration-services/data-flow/use-a-recordset-destination.md

@@ -190,7 +190,7 @@ ms.workload: "Inactive"
 ### Create a Linked Server using the OLE DB Provider for SSIS  
  Create a linked server using the OLE DB Provider for SSIS (SSISOLEDB) by running the following query in SQL Server Management Studio.  
 
-```  
+```sql 
 
 USE [master]  
 GO  
@@ -211,7 +211,7 @@ GO
 
 1.  Before creating the view, type and run the following query in the new query window. OPENQUERY is a rowset function supported by SQL Server. It executes the specified pass-through query on the specified linked server using the OLE DB Provider associated with the linked server. OPENQUERY can be referenced in the FROM clause of a query as if it were a table name. See [OPENQUERY documentation on MSDN Library](http://msdn.microsoft.com/library/ms188427.aspx) for more information.  
 
-    ```  
+    ```sql
     SELECT * FROM OPENQUERY(SSISFeedServer,N'Folder=Eldorado;Project=SSISPackagePublishing;Package=Package.dtsx')   
     GO  
     ```  
@@ -221,7 +221,7 @@ GO
 
 2.  Create a view in the database **TestDB** for the purpose of this walkthrough) by running the following query.  
 
-    ```  
+    ```sql
   
     USE [TestDB]   
     GO   
@@ -234,14 +234,14 @@ GO
 
 3.  Test the view by running the following query.  
 
-    ```  
+    ```sql
     SELECT * FROM SSISPackageView  
     ```  
 
 ### OPENQUERY Function  
  The syntax for OPENQUERY function is:  
 
-```  
+```sql 
 SELECT * FROM OPENQUERY(<LinkedServer Name>, N’Folder=<Folder Name from SSIS Catalog>; Project=<SSIS Project Name>; Package=<SSIS Package Name>; Use32BitRuntime=[True | False];Parameters=”<parameter_name_1>=<value1>; parameter_name_2=<value2>”;Timeout=<Number of Seconds>;’)  
 ```  
 

docs/integration-services/data-flow/walkthrough-publish-an-ssis-package-as-a-sql-view.md

@@ -1,28 +1,28 @@
----
-title: "Creating an ODBC Destination with the Script Component | Microsoft Docs"
-ms.custom: ""
-ms.date: "03/17/2017"
-ms.prod: "sql-server-2016"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: 
-  - "docset-sql-devref"
-ms.tgt_pltfrm: ""
-ms.topic: "reference"
-applies_to: 
-  - "SQL Server 2016 Preview"
-helpviewer_keywords: 
-  - "Script component [Integration Services], destination components"
-  - "ODBC destination [Integration Services]"
-  - "destinations [Integration Services], components"
-  - "Script component [Integration Services], examples"
-ms.assetid: d198c866-78f4-4a50-ae15-333160645815
-caps.latest.revision: 42
-author: "douglaslMS"
-ms.author: "douglasl"
-manager: "jhubbard"
----
-# Creating an ODBC Destination with the Script Component
+---
+title: "Creating an ODBC Destination with the Script Component | Microsoft Docs"
+ms.custom: ""
+ms.date: "03/17/2017"
+ms.prod: "sql-server-2016"
+ms.reviewer: ""
+ms.suite: ""
+ms.technology: 
+  - "docset-sql-devref"
+ms.tgt_pltfrm: ""
+ms.topic: "reference"
+applies_to: 
+  - "SQL Server 2016 Preview"
+helpviewer_keywords: 
+  - "Script component [Integration Services], destination components"
+  - "ODBC destination [Integration Services]"
+  - "destinations [Integration Services], components"
+  - "Script component [Integration Services], examples"
+ms.assetid: d198c866-78f4-4a50-ae15-333160645815
+caps.latest.revision: 42
+author: "douglaslMS"
+ms.author: "douglasl"
+manager: "jhubbard"
+---
+# Creating an ODBC Destination with the Script Component
   In [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] [!INCLUDE[ssISnoversion](../../includes/ssisnoversion-md.md)], you typically save data to an ODBC destination by using an [!INCLUDE[vstecado](../../includes/vstecado-md.md)] destination and the [!INCLUDE[dnprdnshort](../../includes/dnprdnshort-md.md)] Data Provider for ODBC. However, you can also create an ad hoc ODBC destination for use in a single package. To create this ad hoc ODBC destination, you use the Script component as shown in the following example.  
 
 > [!NOTE]  
@@ -45,7 +45,7 @@ manager: "jhubbard"
 
 2.  Create a destination table by running the following Transact-SQL command in the **AdventureWorks** database:  
 
-    ```  
+    ```sql
     CREATE TABLE [Person].[Address2]([AddressID] [int] NOT NULL,  
         [City] [nvarchar](30) NOT NULL)  
     ```  

docs/integration-services/extending-packages-scripting-data-flow-script-component-examples/creating-an-odbc-destination-with-the-script-component.md

@@ -112,7 +112,7 @@ manager: "jhubbard"
 
 2.  Create a destination table by running the following [!INCLUDE[tsql](../../includes/tsql-md.md)] command in the **AdventureWorks** database:  
 
-    ```  
+    ```sql
     CREATE TABLE [Person].[Address2]([AddressID] [int] NOT NULL,  
         [City] [nvarchar](30) NOT NULL)  
     ```  

docs/integration-services/extending-packages-scripting-data-flow-script-component-types/creating-a-destination-with-the-script-component.md

@@ -155,7 +155,7 @@ else
 
 6.  Create and configure a destination component that expects the **AddressID** and **City** columns, such as a [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] destination, or the sample destination component demonstrated in [Creating a Destination with the Script Component](../../integration-services/extending-packages-scripting-data-flow-script-component-types/creating-a-destination-with-the-script-component.md). Then connect the output of the transformation to the destination component. You can create a destination table by running the following [!INCLUDE[tsql](../../includes/tsql-md.md)] command in the **AdventureWorks** database:  
 
-    ```  
+    ```sql
     CREATE TABLE [Person].[Address2]([AddressID] [int] NOT NULL,  
         [City] [nvarchar](30) NOT NULL)  
     ```  
@@ -209,7 +209,7 @@ public class ScriptMain:
 
 7.  Create and configure two destination components that expect the **AddressID** and **City** columns, such as a [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] destination, a Flat File destination, or the sample destination component demonstrated in [Creating a Destination with the Script Component](../../integration-services/extending-packages-scripting-data-flow-script-component-types/creating-a-destination-with-the-script-component.md). Then connect each of the outputs of the transformation to one of the destination components. You can create destination tables by running a [!INCLUDE[tsql](../../includes/tsql-md.md)] command similar to the following (with unique table names) in the **AdventureWorks** database:  
 
-    ```  
+    ```sql
     CREATE TABLE [Person].[Address2](  
         [AddressID] [int] NOT NULL,  
         [City] [nvarchar](30) NOT NULL  

docs/integration-services/extending-packages-scripting-data-flow-script-component-types/creating-a-synchronous-transformation-with-the-script-component.md

@@ -126,7 +126,7 @@ manager: "jhubbard"
 
 7.  Create and configure a destination component for the first output that expects the **AddressID** and **City** columns, such as a [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] destination, or the sample destination component demonstrated in [Creating a Destination with the Script Component](../../integration-services/extending-packages-scripting-data-flow-script-component-types/creating-a-destination-with-the-script-component.md), . Then connect the first output of the transformation, **MyAddressOutput**, to the destination component. You can create a destination table by running the following [!INCLUDE[tsql](../../includes/tsql-md.md)] command in the **AdventureWorks** database:  
 
-    ```  
+    ```sql
     CREATE TABLE [Person].[Address2]([AddressID] [int] NOT NULL,  
         [City] [nvarchar](30) NOT NULL)  
     ```  

docs/integration-services/extending-packages-scripting-data-flow-script-component-types/creating-an-asynchronous-transformation-with-the-script-component.md

@@ -74,13 +74,12 @@ manager: "jhubbard"
   
  The following example displays the number of rows sent between components of a package.  
 
-```  
+```sql
 use SSISDB  
 select package_name, task_name, source_component_name, destination_component_name, rows_sent  
 from catalog.execution_data_statistics  
 where execution_id = 132  
-order by source_component_name, destination_component_name  
-  
+order by source_component_name, destination_component_name   
 ```  
 
  The following example calculates the number of rows per millisecond sent by each component for a specific execution. The calculated values are:  
@@ -104,7 +103,6 @@ where execution_id = 132
 group by source_component_name, destination_component_name  
 having (datediff(ms,min(created_time),max(created_time))) > 0  
 order by source_component_name desc  
-  
 ```  
 
 ## Configure an Error Output in a Data Flow Component
@@ -224,13 +222,11 @@ order by source_component_name desc
 
  Here is a sample SQL script that performs the steps described in the above scenario:  
 
-```  
-  
+```sql
 Declare @execid bigint  
 EXEC [SSISDB].[catalog].[create_execution] @folder_name=N'ETL Folder', @project_name=N'ETL Project', @package_name=N'Package.dtsx', @execution_id=@execid OUTPUT  
 EXEC [SSISDB].[catalog].add_data_tap @execution_id = @execid, @task_package_path = '\Package\Data Flow Task', @dataflow_path_id_string = 'Paths[Flat File Source.Flat File Source Output]', @data_filename = 'output.txt'  
 EXEC [SSISDB].[catalog].[start_execution] @execid  
-  
 ```  
 
  The folder name, project name, and package name parameters of the create_execution stored procedure correspond to the folder, project, and package names in the Integration Services catalog. You can get the folder, project, and package names to use in the create_execution call from the SQL Server Management Studio as shown in the following image. If you do not see your SSIS project here, you may not have deployed the project to SSIS server yet. Right-click on SSIS project in Visual Studio and click Deploy to deploy the project to the expected SSIS server.  
@@ -254,18 +250,16 @@ EXEC [SSISDB].[catalog].[start_execution] @execid
 ### Removing a data tap  
  You can remove a data tap before starting the execution by using the [catalog.remove_data_tap](../../integration-services/system-stored-procedures/catalog-remove-data-tap.md) stored procedure. This stored procedure takes the ID of data tap as a parameter, which you can get as an output of the add_data_tap stored procedure.  
 
-```  
-  
+```sql
 DECLARE @tap_id bigint  
 EXEC [SSISDB].[catalog].add_data_tap @execution_id = @execid, @task_package_path = '\Package\Data Flow Task', @dataflow_path_id_string = 'Paths[Flat File Source.Flat File Source Output]', @data_filename = 'output.txt' @data_tap_id=@tap_id OUTPUT  
 EXEC [SSISDB].[catalog].remove_data_tap @tap_id  
-  
 ```  
 
 ### Listing all data taps  
  You can also list all the data taps by using the catalog.execution_data_taps view. The following example extracts data taps for a specification execution instance (ID: 54).  
 
-```  
+```sql 
 select * from [SSISDB].[catalog].execution_data_taps where execution_id=@execid  
 ```  
 

docs/integration-services/troubleshooting/debugging-data-flow.md

@@ -91,6 +91,18 @@ To rollback or downgrade SQL Server to a previous release, use the following ste
 > [!IMPORTANT]
 > Downgrade is only supported between RTM, RC2, and RC1 at this time.
 
+## <a id="versioncheck"></a> Check installed SQL Server version
+
+To verify your current version and edition of SQL Server on Linux, use the following procedure:
+
+1. If not already installed, install the [SQL Server command-line tools](sql-server-linux-setup-tools.md).
+
+1. Use **sqlcmd** to run a Transact-SQL command that displays your SQL Server version and edition.
+
+   ```bash
+   sqlcmd -S localhost -U SA -Q 'select @@VERSION'
+   ```
+
 ## <a id="uninstall"></a> Uninstall SQL Server
 
 To remove the **mssql-server** package on Linux, use one of the following commands based on your platform:
@@ -121,6 +133,22 @@ There are two main types of repositories for each distribution:
 
 Each CU and GDR release contains the full SQL Server package and all previous updates for that repository. Updating from a GDR release to a CU release is supported by changing your configured repository for SQL Server. You can also [downgrade](#rollback) to any release within your major version (ex: 2017). Updating from a CU release to a GDR release is not supported.
 
+### Check your configured repository
+
+If you want to verify what repository is configured, use the following platform-dependent techniques.
+
+| Platform | Procedure |
+|-----|-----|
+| RHEL | 1. View the files in the **/etc/yum.repos.d** directory: `sudo ls /etc/yum.repos.d`<br/>2. Look for a file that configures the SQL Server directory, such as **mssql-server.repo**.<br/>3. Print out the contents of the file: `sudo cat /etc/yum.repos.d/mssql-server.repo`<br/>4. The **name** property is the configured repository.|
+| SLES | 1. Run the following command: `sudo zypper info mssql-server`<br/>2. The **Repository** property is the configured repository. |
+| Ubuntu | 1. Run the following command: `sudo cat /etc/apt/sources.list`<br/>2. Examine the package URL for mssql-server. |
+
+The end of the repository URL confirms the repository type:
+
+- **mssql-server**: preview repository.
+- **mssql-server-2017**: CU repository.
+- **mssql-server-2017-gdr**: GDR repository.
+
 ### Change the source repository
 
 To configure the CU or GDR repositories, use the following steps:
@@ -130,11 +158,15 @@ To configure the CU or GDR repositories, use the following steps:
 
 1. If necessary, remove the previously configured repository.
 
-   | Platform | Repository removal command |
-   |-----|-----|
-   | RHEL | `sudo rm -rf /etc/yum.repos.d/mssql-server.repo` |
-   | SLES | `sudo zypper removerepo 'packages-microsoft-com-mssql-server'` |
-   | Ubuntu | `sudo add-apt-repository -r 'deb [arch=amd64] https://packages.microsoft.com/ubuntu/16.04/mssql-server xenial main'` |
+   | Platform | Repository | Repository removal command |
+   |---|---|---|
+   | RHEL | **All** | `sudo rm -rf /etc/yum.repos.d/mssql-server.repo` |
+   | SLES | **CTP** | `sudo zypper removerepo 'packages-microsoft-com-mssql-server'` |
+   | | **CU** | `sudo zypper removerepo 'packages-microsoft-com-mssql-server-2017'` |
+   | | **GDR** | `sudo zypper removerepo 'packages-microsoft-com-mssql-server-2017-gdr'`|
+   | Ubuntu | **CTP** | `sudo add-apt-repository -r 'deb [arch=amd64] https://packages.microsoft.com/ubuntu/16.04/mssql-server xenial main'` 
+   | | **CU** | `sudo add-apt-repository -r 'deb [arch=amd64] https://packages.microsoft.com/ubuntu/16.04/mssql-server-2017 xenial main'` | 
+   | | **GDR** | `sudo add-apt-repository -r 'deb [arch=amd64] https://packages.microsoft.com/ubuntu/16.04/mssql-server-2017-gdr xenial main'` |
 
 1. For **Ubuntu only**, import the public repository GPG keys.