Skip to content

Commit 531d024

Browse files
authored
Merge pull request MicrosoftDocs#4153 from MicrosoftDocs/master
11/30 PM Publish
2 parents 578bd1c + a9f4863 commit 531d024

16 files changed

+65
-53
lines changed

docs/connect/odbc/linux-mac/programming-guidelines.md

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,36 @@ The following features are not available in this release of the ODBC driver on m
7171

7272
## Character Set Support
7373

74-
The client encoding can be one of the following:
74+
SQLCHAR data in one of the following character sets is supported by the driver:
75+
7576
- UTF-8
76-
- ISO-8859-1
77-
- ISO-8859-2
77+
- CP437
78+
- CP850
79+
- CP874
80+
- CP932
81+
- CP936
82+
- CP949
83+
- CP950
84+
- CP1251
85+
- CP1253
86+
- CP1256
87+
- CP1257
88+
- CP1258
89+
- ISO-8859-1 / CP1252
90+
- ISO-8859-2 / CP1250
7891
- ISO-8859-3
7992
- ISO-8859-4
8093
- ISO-8859-5
8194
- ISO-8859-6
8295
- ISO-8859-7
83-
- ISO-8859-8
84-
- ISO-8859-9
96+
- ISO-8859-8 / CP1255
97+
- ISO-8859-9 / CP1254
8598
- ISO-8859-13
8699
- ISO-8859-15
87-
88-
SQLCHAR data must be one of the supported character sets. SQLWCHAR data must be UTF-16LE (Little Endian).
100+
101+
Upon connection, the driver detects the current locale of the process it is loaded in. If it is one of the supported encodings above, the driver will use that encoding for SQLCHAR (narrow-character) data; otherwise, it defaults to UTF-8. Since all processes start in the "C" locale by default (and thus cause the driver to default to UTF-8), if an application needs to use one of the encodings above, it should use the **setlocale** function to set the locale appropriately before connecting; either by specifying the desired locale explicitly, or using an empty string e.g. `setlocale(LC_ALL, "")`, to use the locale settings of the environment.
102+
103+
SQLWCHAR data must be UTF-16LE (Little Endian).
89104

90105
If SQLDescribeParameter does not specify a SQL type on the server, the driver uses the SQL type specified in the *ParameterType* parameter of SQLBindParameter. If a narrow character SQL type, such as SQL_VARCHAR, is specified in SQLBindParameter, the driver converts the supplied data from the client code page to the default [!INCLUDE[ssNoVersion](../../../includes/ssnoversion_md.md)] code page. (The default [!INCLUDE[ssNoVersion](../../../includes/ssnoversion_md.md)] code page is typically 1252.) If the client code page is not supported, it will be set to UTF-8. In this case, the driver then converts the UTF-8 data to the default code page. However, data loss is possible. If code page 1252 cannot represent a character, the driver converts the character to a question mark ('?'). To avoid this data loss, specify a Unicode SQL character type, such as SQL_NVARCHAR, in SQLBindParameter. In this case, the driver converts the supplied Unicode data in UTF-8 encoding to UTF-16 without loss of data.
91106

docs/integration-services/TOC.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
## Follow the blog
178178
### [SSIS team blog](https://blogs.msdn.microsoft.com/ssis/)
179179
## Get help
180-
### [SSIS forum on MSDN](https://social.msdn.microsoft.com/Forums/en-us/home?forum=sqlintegrationservices)
180+
### [SSIS forum on MSDN](https://social.msdn.microsoft.com/Forums/home?forum=sqlintegrationservices)
181181
### [SSIS tag on Stack Overflow](http://stackoverflow.com/questions/tagged/ssis)
182182
## Give feedback
183183
### [Microsoft Connect](https://connect.microsoft.com/SQLServer/Feedback)

docs/integration-services/connection-manager/azure-data-lake-store-connection-manager.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ The Azure Data Lake Store connection manager is a component of the [SQL Server I
4444
1. If you select the **Azure AD User Identity** authentication option, do the following things:
4545
1. Provide values for the **User Name** and **Password** fields.
4646

47-
2. To test the connection, select **Test Connection**. If you or the tenant administrator didn't previously consent to allow SSIS to access your Azure Data Lake Store data, select **Accept** when prompted. For more information about this consent experience, see [Integrating applications with Azure Active Directory](https://docs.microsoft.com/en-us/azure/active-directory/active-directory-integrating-applications#updating-an-application).
47+
2. To test the connection, select **Test Connection**. If you or the tenant administrator didn't previously consent to allow SSIS to access your Azure Data Lake Store data, select **Accept** when prompted. For more information about this consent experience, see [Integrating applications with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/active-directory-integrating-applications#updating-an-application).
4848

4949
> [!NOTE]
5050
> When you select the **Azure AD User Identity** authentication option, multi-factor authentication and Microsoft account authentication are not supported.
5151
5252
2. If you select the **Azure AD Service Identity** authentication option, do the following things:
5353
1. Create an Azure Active Directory (AAD) application and service principal to access the Azure Data Lake data.
5454

55-
2. Assign appropriate permissions to let this AAD application access your Azure Data Lake resources. For more information about this authentication option, see [Use portal to create Active Directory application and service principal that can access resources](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-create-service-principal-portal).
55+
2. Assign appropriate permissions to let this AAD application access your Azure Data Lake resources. For more information about this authentication option, see [Use portal to create Active Directory application and service principal that can access resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-create-service-principal-portal).
5656

5757
3. Provide values for the **Client Id**, **Secret Key**, and **Tenant Name** fields.
5858

docs/integration-services/connection-manager/azure-resource-manager-connection-manager.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ manager: "jhubbard"
2323
ms.workload: "Inactive"
2424
---
2525
# Azure Resource Manager Connection Manager
26-
The **Azure Resource Manager Connection Manager** enables an SSIS package to manage Azure resources using a [service principal](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-create-service-principal-portal).
26+
The **Azure Resource Manager Connection Manager** enables an SSIS package to manage Azure resources using a [service principal](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-create-service-principal-portal).
2727

2828
The **Azure Resource Manager Connection Manager** is a component of the [SQL Server Integration Services (SSIS) Feature Pack for Azure](../../integration-services/azure-feature-pack-for-integration-services-ssis.md).
2929

3030
To create and configure an **Azure Resource Manager Connection Manager**, follow the steps below:
3131

3232
1. In the **Add SSIS Connection Manager** dialog box, select **AzureResourceManager**, and click **Add**.
33-
2. In the **Azure Resource Manager Connection Manager Editor** dialog box, specify the **Application ID**, **Application Key**, and **Tenant ID** for the service principal. For details about these properties, please refer to [this](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-create-service-principal-portal) article.
33+
2. In the **Azure Resource Manager Connection Manager Editor** dialog box, specify the **Application ID**, **Application Key**, and **Tenant ID** for the service principal. For details about these properties, please refer to [this](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-create-service-principal-portal) article.
3434
3. Click **OK** to close the dialog box.
3535
4. You can see the properties of the connection manager you created in the **Properties** window.

docs/integration-services/control-flow/azure-hdinsight-create-cluster-task.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The **Azure HDInsight Create Cluster Task** is a component of the [SQL Server In
2929

3030
> [!NOTE]
3131
> - Creating a new HDInsight cluster may take 10~20 minutes.
32-
> - There is a cost associated with creating and running an Azure HDInsight cluster. See [HDInsight Pricing](http://azure.microsoft.com/en-us/pricing/details/hdinsight/) for details.
32+
> - There is a cost associated with creating and running an Azure HDInsight cluster. See [HDInsight Pricing](http://azure.microsoft.com/pricing/details/hdinsight/) for details.
3333
3434
To add an **Azure HDInsight Create Cluster Task**, drag-drop it to the SSIS Designer, and double-click or right-click and click **Edit** to see the following **Azure HDInsight Create Cluster Task Editor** dialog box.
3535

docs/integration-services/lesson-1-1-creating-a-new-integration-services-project.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The packages that you will create in this [!INCLUDE[ssISnoversion](../includes/s
2929
> [!NOTE]
3030
> This tutorial requires Microsoft SQL Server Data Tools.
3131
>
32-
> For more information on installing the SQL Server Data Tools see [SQL Server Data Tools Download](http://msdn.microsoft.com/en-us/data/hh297027).
32+
> For more information on installing the SQL Server Data Tools see [SQL Server Data Tools Download](http://msdn.microsoft.com/data/hh297027).
3333
3434
### To create a new Integration Services project
3535

docs/integration-services/lesson-1-create-a-project-and-basic-package-with-ssis.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ms.workload: "Active"
2323
---
2424
# Lesson 1: Create a Project and Basic Package with SSIS
2525

26-
> For content related to previous versions of SQL Server, see [Lesson 1: Creating the Project and Basic Package](https://msdn.microsoft.com/en-US/library/ms170419(SQL.120).aspx).
26+
> For content related to previous versions of SQL Server, see [Lesson 1: Creating the Project and Basic Package](https://msdn.microsoft.com/library/ms170419(SQL.120).aspx).
2727
2828
In this lesson, you will create a simple ETL package that extracts data from a single flat file source, transforms the data using two lookup transformation components, and writes that data to the **FactCurrency** fact table in **AdventureWorksDW2012**. As part of this lesson, you will learn how to create new packages, add and configure data source and destination connections, and work with new control flow and data flow components.
2929

@@ -33,7 +33,7 @@ In this lesson, you will create a simple ETL package that extracts data from a s
3333
## Understanding the Package Requirements
3434
This tutorial requires Microsoft SQL Server Data Tools.
3535

36-
For more information on installing the SQL Server Data Tools see [SQL Server Data Tools Download](http://msdn.microsoft.com/en-us/data/hh297027).
36+
For more information on installing the SQL Server Data Tools see [SQL Server Data Tools Download](http://msdn.microsoft.com/data/hh297027).
3737

3838
Before creating a package, you need a good understanding of the formatting used in both the source data and the destination. Once you understand both of these data formats, you will be ready to define the transformations necessary to map the source data to the destination.
3939

docs/integration-services/lesson-6-using-parameters-with-the-project-deployment-model-in-ssis.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Using the Integration Services Project Configuration Wizard, you will convert th
3131
When you run the package again, the Integration Services service uses the parameter to populate the value of the variable, and the variable in turn updates the Directory property. As a result, the package iterates through the files in the new data folder specified by the parameter value rather than the folder that was set in the package configuration file.
3232

3333
> [!IMPORTANT]
34-
> This tutorial requires the **AdventureWorksDW2012** sample database. For more information about how to install and deploy **AdventureWorksDW2012**, see [Considerations for Installing SQL Server Samples and Sample Databases](http://technet.microsoft.com/en-us/library/ms161556%28v=sql.105%29).
34+
> This tutorial requires the **AdventureWorksDW2012** sample database. For more information about how to install and deploy **AdventureWorksDW2012**, see [Considerations for Installing SQL Server Samples and Sample Databases](http://technet.microsoft.com/library/ms161556%28v=sql.105%29).
3535
3636
## Lesson Tasks
3737
This lesson contains the following tasks:

docs/integration-services/service/ssis-catalog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ To run the **SSIS Server Maintenance Job**, SSIS creates the SQL Server login **
195195

196196
- For a project, use the **Permissions** page in the [Project Properties Dialog Box](../../integration-services/service/project-properties-dialog-box.md).
197197

198-
- For an environment, use the **Permissions** page in the [NIB: Environment Properties Dialog Box](http://msdn.microsoft.com/en-us/6a91a8d4-0006-4cfd-9759-3e4295ae452b).
198+
- For an environment, use the **Permissions** page in the [NIB: Environment Properties Dialog Box](http://msdn.microsoft.com/6a91a8d4-0006-4cfd-9759-3e4295ae452b).
199199

200200
To manage permissions using Transact-SQL, call [catalog.grant_permission (SSISDB Database)](../../integration-services/system-stored-procedures/catalog-grant-permission-ssisdb-database.md), [catalog.deny_permission (SSISDB Database)](../../integration-services/system-stored-procedures/catalog-deny-permission-ssisdb-database.md), and [catalog.revoke_permission (SSISDB Database)](../../integration-services/system-stored-procedures/catalog-revoke-permission-ssisdb-database.md). To view effective permissions for the current principal for all objects, query [catalog.effective_object_permissions (SSISDB Database)](../../integration-services/system-views/catalog-effective-object-permissions-ssisdb-database.md). This topic provides descriptions of the different types of permissions. To view permissions that have been explicitly assigned to the user, query [catalog.explicit_object_permissions (SSISDB Database)](../../integration-services/system-views/catalog-explicit-object-permissions-ssisdb-database.md).
201201

docs/integration-services/sql-server-integration-services.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ms.workload: "Active"
3131
---
3232
# SQL Server Integration Services
3333

34-
> For content related to previous versions of SQL Server, see [SQL Server Integration Services](https://msdn.microsoft.com/en-US/library/ms141026(SQL.120).aspx).
34+
> For content related to previous versions of SQL Server, see [SQL Server Integration Services](https://msdn.microsoft.com/library/ms141026(SQL.120).aspx).
3535
3636
[!INCLUDE[msCoName](../includes/msconame-md.md)] [!INCLUDE[ssISnoversion](../includes/ssisnoversion-md.md)] is a platform for building enterprise-level data integration and data transformations solutions. You use [!INCLUDE[ssISnoversion](../includes/ssisnoversion-md.md)] to solve complex business problems by copying or downloading files, sending e-mail messages in response to events, updating data warehouses, cleaning and mining data, and managing [!INCLUDE[ssNoVersion](../includes/ssnoversion-md.md)] objects and data. The packages can work alone or in concert with other packages to address complex business needs. [!INCLUDE[ssISnoversion](../includes/ssisnoversion-md.md)] can extract and transform data from a wide variety of sources such as XML data files, flat files, and relational data sources, and then load the data into one or more destinations.<br /><br /> [!INCLUDE[ssISnoversion](../includes/ssisnoversion-md.md)] includes a rich set of built-in tasks and transformations; tools for constructing packages; and the [!INCLUDE[ssISnoversion](../includes/ssisnoversion-md.md)] service for running and managing packages. You can use the graphical [!INCLUDE[ssISnoversion](../includes/ssisnoversion-md.md)] tools to create solutions without writing a single line of code; or you can program the extensive [!INCLUDE[ssISnoversion](../includes/ssisnoversion-md.md)] object model to create packages programmatically and code custom tasks and other package objects.
3737

@@ -42,8 +42,8 @@ ms.workload: "Active"
4242

4343
## ![info_tip](../sql-server/media/info-tip.png) Get Help
4444

45-
- [MSDN forum for SSIS - ask questions](https://social.msdn.microsoft.com/Forums/en-us/home?forum=sqlintegrationservices)
46-
- [MSDN forum for SSDT and SSMS - ask questions](https://social.msdn.microsoft.com/Forums/en-US/home?forum=sqltool)
45+
- [MSDN forum for SSIS - ask questions](https://social.msdn.microsoft.com/Forums/home?forum=sqlintegrationservices)
46+
- [MSDN forum for SSDT and SSMS - ask questions](https://social.msdn.microsoft.com/Forums/home?forum=sqltool)
4747
- [Stack Overflow (tag *ssis*) - ask questions](http://stackoverflow.com/questions/tagged/ssis)
4848
- [Microsoft Connect - report bugs and request features](https://connect.microsoft.com/SQLServer/Feedback)
4949
- [Reddit - general discussion about SSIS](https://www.reddit.com/r/SQLServer/search?q=ssis&restrict_sr=on)

0 commit comments

Comments
 (0)