Skip to content

Commit 5d98f3e

Browse files
CarlRabelerCarlRabeler
committed
conflicts
2 parents 2b275e5 + ebad853 commit 5d98f3e

33 files changed

Lines changed: 523 additions & 440 deletions

‎.openpublishing.redirection.json‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,6 +1000,91 @@
10001000
"redirect_url": "/sql/advanced-analytics/r/working-with-r-data-types",
10011001
"redirect_document_id": false
10021002
},
1003+
{
1004+
"source_path": "docs/t-sql/lesson-1-1-creating-a-database.md",
1005+
"redirect_url": "/sql/t-sql/lesson-1-creating-database-objects",
1006+
"redirect_document_id": false
1007+
},
1008+
{
1009+
"source_path": "docs/t-sql/lesson-1-2-creating-a-table.md",
1010+
"redirect_url": "/sql/t-sql/lesson-1-creating-database-objects",
1011+
"redirect_document_id": false
1012+
},
1013+
{
1014+
"source_path": "docs/t-sql/lesson-1-3-inserting-and-updating-data-in-a-table.md",
1015+
"redirect_url": "/sql/t-sql/lesson-1-creating-database-objects",
1016+
"redirect_document_id": false
1017+
},
1018+
{
1019+
"source_path": "docs/t-sql/lesson-1-4-reading-the-data-in-a-table.md",
1020+
"redirect_url": "/sql/t-sql/lesson-1-creating-database-objects",
1021+
"redirect_document_id": false
1022+
},
1023+
{
1024+
"source_path": "docs/t-sql/lesson-1-5-summary-creating-database-objects.md",
1025+
"redirect_url": "/sql/t-sql/lesson-1-creating-database-objects",
1026+
"redirect_document_id": false
1027+
},
1028+
{
1029+
"source_path": "docs/t-sql/lesson-2-1-creating-a-login.md",
1030+
"redirect_url": "/sql/t-sql/lesson-2-configuring-permissions-on-database-objects",
1031+
"redirect_document_id": false
1032+
},
1033+
{
1034+
"source_path": "docs/t-sql/lesson-2-2-granting-access-to-a-database.md",
1035+
"redirect_url": "/sql/t-sql/lesson-2-configuring-permissions-on-database-objects",
1036+
"redirect_document_id": false
1037+
},
1038+
{
1039+
"source_path": "docs/t-sql/lesson-2-3-creating-views-and-stored-procedures.md",
1040+
"redirect_url": "/sql/t-sql/lesson-1-creating-database-objects",
1041+
"redirect_document_id": false
1042+
},
1043+
{
1044+
"source_path": "docs/t-sql/lesson-2-4-granting-access-to-a-database-object.md",
1045+
"redirect_url": "/sql/t-sql/lesson-2-configuring-permissions-on-database-objects",
1046+
"redirect_document_id": false
1047+
},
1048+
{
1049+
"source_path": "docs/t-sql/lesson-2-5-summary-configuring-permissions-on-database-objects.md",
1050+
"redirect_url": "/sql/t-sql/lesson-2-configuring-permissions-on-database-objects",
1051+
"redirect_document_id": false
1052+
},
1053+
{
1054+
"source_path": "docs/t-sql/lesson-3-1-deleting-database-objects.md",
1055+
"redirect_url": "/sql/t-sql/lesson-3-deleting-database-objects",
1056+
"redirect_document_id": false
1057+
},
1058+
{
1059+
"source_path": "docs/tools/dta/lesson-1-1-launching-database-engine-tuning-advisor.md",
1060+
"redirect_url": "/sql/tools/dta/lesson-1-basic-navigation-in-database-engine-tuning-advisor",
1061+
"redirect_document_id": false
1062+
},
1063+
{
1064+
"source_path": "docs/tools/dta/lesson-1-2-setting-tool-options-and-layout.md",
1065+
"redirect_url": "/sql/tools/dta/lesson-1-basic-navigation-in-database-engine-tuning-advisor",
1066+
"redirect_document_id": false
1067+
},
1068+
{
1069+
"source_path": "docs/tools/dta/lesson-1-1-tuning-a-workload.md",
1070+
"redirect_url": "/sql/tools/dta/lesson-2-using-database-engine-tuning-advisor",
1071+
"redirect_document_id": false
1072+
},
1073+
{
1074+
"source_path": "docs/tools/dta/lesson-1-2-viewing-tuning-recommendations.md",
1075+
"redirect_url": "/sql/tools/dta/lesson-2-using-database-engine-tuning-advisor",
1076+
"redirect_document_id": false
1077+
},
1078+
{
1079+
"source_path": "docs/tools/dta/lesson-1-3-viewing-tuning-reports.md",
1080+
"redirect_url": "/sql/tools/dta/lesson-2-using-database-engine-tuning-advisor",
1081+
"redirect_document_id": false
1082+
},
1083+
{
1084+
"source_path": "docs/tools/dta/ lesson-3-1-starting-the-dta-command-prompt-utility-and-tuning-a-workload.md",
1085+
"redirect_url": "/sql/tools/dta/lesson-3-using-the-dta-command-prompt-utility",
1086+
"redirect_document_id": false
1087+
},
10031088
{
10041089
"source_path": "docs/connect/php/download-microsoft-php-driver-for-sql-server.md",
10051090
"redirect_url": "/sql/connect/php/microsoft-php-driver-for-sql-server",

‎docs/includes/tsql-appliesto-ss2014-asdb-asdw-xxx-md.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<Token>**THIS TOPIC APPLIES TO:**![yes](media/yes.png)SQL Server (starting with 2014)![yes](media/yes.png)Azure SQL Database![yes](media/yes.png)Azure SQL Data Warehouse ![no](media/no.png)Parallel Data Warehouse </Token>

‎docs/relational-databases/security/encryption/always-encrypted-database-engine.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,30 @@ The server computes the result set, and for any encrypted columns included in th
5858

5959
For details of how to develop applications using Always Encrypted with particular client drivers, see [Always Encrypted (client development)](../../../relational-databases/security/encryption/always-encrypted-client-development.md).
6060

61+
## Remarks
62+
63+
Decryption occurs via the client. This means that some actions that occur only server-side will not work when using Always Encrypted.
64+
65+
Here's an example of an update that attempts to move data from an encrypted column to an unencrypted column without returning a result set to the client:
66+
67+
```sql
68+
update dbo.Patients set testssn = SSN
69+
```
70+
71+
If SSN is a column encrypted using Always Encryption, the above update statement will fail with an error similar to:
72+
73+
```
74+
Msg 206, Level 16, State 2, Line 89
75+
Operand type clash: char(11) encrypted with (encryption_type = 'DETERMINISTIC', encryption_algorithm_name = 'AEAD_AES_256_CBC_HMAC_SHA_256', column_encryption_key_name = 'CEK_1', column_encryption_key_database_name = 'ssn') collation_name = 'Latin1_General_BIN2' is incompatible with char
76+
```
77+
78+
To successfully update the column, do the following:
79+
80+
1. SELECT the data out of the SSN column, and store it as a result set in the application. This will allow for the application (client) to decrypt the column.
81+
2. INSERT/UPDATE the data from the result set in the application and send to SQL Server. Paramterization will pass the data into SQL Server via parameters so the values can be encrypted.
82+
83+
>[!IMPORTANT]
84+
> In this example, the data will be unencrypted when sent back to the server because the destination column is a regular varchar that does not accept encrypted data.
6185
6286
## Selecting Deterministic or Randomized Encryption
6387
The Database Engine never operates on plaintext data stored in encrypted columns, but it still supports some queries on encrypted data, depending on the encryption type for the column. Always Encrypted supports two types of encryption: randomized encryption and deterministic encryption.

‎docs/relational-databases/system-catalog-views/sys-time-zone-info-transact-sql.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "sys.time_zone_info (Transact-SQL) | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "03/27/2018"
4+
ms.date: "08/06/2018"
55
ms.prod: sql
66
ms.prod_service: "database-engine, sql-database, sql-data-warehouse, pdw"
77
ms.component: "system-catalog-views"
@@ -29,7 +29,7 @@ manager: craigg
2929
monikerRange: "=azure-sqldw-latest||>=sql-server-2016||=sqlallproducts-allversions||>=sql-server-linux-2017"
3030
---
3131
# sys.time_zone_info (Transact-SQL)
32-
[!INCLUDE[tsql-appliesto-ss2014-asdb-xxxx-xxx-md](../../includes/tsql-appliesto-ss2014-asdb-xxxx-xxx-md.md)]
32+
[!INCLUDE[tsql-appliesto-ss2014-asdb-asdw-xxx-md](../../includes/tsql-appliesto-ss2014-asdb-asdw-xxx-md.md)]
3333

3434
Returns information about supported time zones. All time zones installed on the computer are stored in the following registry hive:
3535
`KEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones`.

‎docs/t-sql/statements/alter-database-transact-sql-set-options.md‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ SET
112112
}
113113
}
114114
115-
<change_tracking_option_list> ::=
115+
<change_tracking_option_list> ::=
116116
{
117117
AUTO_CLEANUP = { ON | OFF }
118118
| CHANGE_RETENTION = retention_period { DAYS | HOURS | MINUTES }
@@ -1306,7 +1306,7 @@ SET
13061306
}
13071307
13081308
<automatic_tuning_option> ::=
1309-
{ AUTOMATIC_TUNING = { AUTO | INHERIT | CUSTOM }
1309+
{ AUTOMATIC_TUNING = { AUTO | INHERIT | CUSTOM }
13101310
| AUTOMATIC_TUNING ( CREATE_INDEX = { DEFAULT | ON | OFF } )
13111311
| AUTOMATIC_TUNING ( DROP_INDEX = { DEFAULT | ON | OFF } )
13121312
| AUTOMATIC_TUNING ( FORCE_LAST_GOOD_PLAN = { DEFAULT | ON | OFF } )
@@ -1322,7 +1322,7 @@ SET
13221322
}
13231323
}
13241324
1325-
<change_tracking_option_list> ::=
1325+
<change_tracking_option_list> ::=
13261326
{
13271327
AUTO_CLEANUP = { ON | OFF }
13281328
| CHANGE_RETENTION = retention_period { DAYS | HOURS | MINUTES }
@@ -1483,54 +1483,54 @@ For more information that describes when to use synchronous or asynchronous stat
14831483
<a name="auto_tuning"></a> **\<automatic_tuning_option> ::=**
14841484
**Applies to**: [!INCLUDE[sssqlv14-md](../../includes/sssqlv14-md.md)].
14851485

1486-
Controls automatic options for [automatic tuning](../../relational-databases/automatic-tuning/automatic-tuning.md).
1486+
Controls automatic options for [automatic tuning](../../relational-databases/automatic-tuning/automatic-tuning.md).
14871487

1488-
AUTOMATIC_TUNING = { AUTO | INHERIT | CUSTOM }
1489-
AUTO
1490-
Setting the automatic tuning value to AUTO will apply Azure configuration defaults for automatic tuning.
1488+
AUTOMATIC_TUNING = { AUTO | INHERIT | CUSTOM }
1489+
AUTO
1490+
Setting the automatic tuning value to AUTO will apply Azure configuration defaults for automatic tuning.
1491+
1492+
INHERIT
1493+
Using the value INHERIT will inherit the default configuration from the parent server. This is especially useful if you would like to customize automatic tuning configuration on a parent server, and have all the databases on such server INHERIT these custom settings. Please note that in order for the inheritance to work, the three individual tuning options FORCE_LAST_GOOD_PLAN, CREATE_INDEX and DROP_INDEX need to be set to DEFAULT on databases.
14911494

1492-
INHERIT
1493-
Using the value INHERIT will inherit the default configuration from the parent server. This is especially useful if you would like to customize automatic tuning configuration on a parent server, and have all the databases on such server INHERIT these custom settings. Please note that in order for the inheritance to work, the three individual tuning options FORCE_LAST_GOOD_PLAN, CREATE_INDEX and DROP_INDEX need to be set to DEFAULT on databases.
1494-
1495-
CUSTOM
1496-
Using the value CUSTOM, you will need to manually custom configure each of the automatic tuning options available on databases.
1495+
CUSTOM
1496+
Using the value CUSTOM, you will need to manually custom configure each of the automatic tuning options available on databases.
1497+
1498+
Enables or disables automatic index management `CREATE_INDEX` option of [automatic tuning](../../relational-databases/automatic-tuning/automatic-tuning.md).
14971499

1498-
Enables or disables automatic index management `CREATE_INDEX` option of [automatic tuning](../../relational-databases/automatic-tuning/automatic-tuning.md).
1499-
15001500
CREATE_INDEX = { DEFAULT | ON | OFF }
1501-
DEFALT
1502-
Inherits default settings from the server. In this case, options of enabling or disabling individual Automatic tuning features are defined at the server level.
1503-
1504-
ON
1501+
DEFALT
1502+
Inherits default settings from the server. In this case, options of enabling or disabling individual Automatic tuning features are defined at the server level.
1503+
1504+
ON
15051505
When enabled, missing indexes are automatically generated on a database. Following the index creation, gains to the performance of the workload are verified. When such created index no longer provides benefits to the workload performance, it is automatically reverted. Indexes automatically created are flagged as a system generated indexed.
1506-
1507-
OFF
1508-
Does not automatically generate missing indexes on the database.
1509-
1510-
Enables or disables automatic index management `DROP_INDEX` option of [automatic tuning](../../relational-databases/automatic-tuning/automatic-tuning.md).
1511-
1506+
1507+
OFF
1508+
Does not automatically generate missing indexes on the database.
1509+
1510+
Enables or disables automatic index management `DROP_INDEX` option of [automatic tuning](../../relational-databases/automatic-tuning/automatic-tuning.md).
1511+
15121512
DROP_INDEX = { DEFAULT | ON | OFF }
1513-
DEFALT
1514-
Inherits default settings from the server. In this case, options of enabling or disabling individual Automatic tuning features are defined at the server level.
1513+
DEFALT
1514+
Inherits default settings from the server. In this case, options of enabling or disabling individual Automatic tuning features are defined at the server level.
15151515

1516-
ON
1517-
Automatically drops duplicate or no longer useful indexes to the performance workload.
1516+
ON
1517+
Automatically drops duplicate or no longer useful indexes to the performance workload.
1518+
1519+
OFF
1520+
Does not automatically drop missing inexes on the database.
1521+
1522+
Enables or disables automatic plan correction `FORCE_LAST_GOOD_PLAN` option of [automatic tuning](../../relational-databases/automatic-tuning/automatic-tuning.md).
15181523

1519-
OFF
1520-
Does not automatically drop missing inexes on the database.
1521-
1522-
Enables or disables automatic plan correction `FORCE_LAST_GOOD_PLAN` option of [automatic tuning](../../relational-databases/automatic-tuning/automatic-tuning.md).
1523-
15241524
FORCE_LAST_GOOD_PLAN = { DEFAULT | ON | OFF }
1525-
DEFAULT
1526-
Inherits default settings from the server. In this case, options of enabling or disabling individual Automatic tuning features are defined at the server level.
1525+
DEFAULT
1526+
Inherits default settings from the server. In this case, options of enabling or disabling individual Automatic tuning features are defined at the server level.
15271527

15281528
ON
15291529
The [!INCLUDE[ssde_md](../../includes/ssde_md.md)] automatically forces the last known good plan on the [!INCLUDE[tsql_md](../../includes/tsql_md.md)] queries where new SQL plan causes performance regressions. The [!INCLUDE[ssde_md](../../includes/ssde_md.md)] continously monitors query performance of the [!INCLUDE[tsql_md](../../includes/tsql_md.md)] query with the forced plan. If there are performance gains, the [!INCLUDE[ssde_md](../../includes/ssde_md.md)] will keep using last known good plan. If performance gains are not detected, the [!INCLUDE[ssde_md](../../includes/ssde_md.md)] will produce a new SQL plan. The statement will fail if Query Store is not enabled or if it is not in *Read-Write* mode.
15301530

15311531
OFF
1532-
The [!INCLUDE[ssde_md](../../includes/ssde_md.md)] reports potential query performance regressions caused by SQL plan changes in [sys.dm_db_tuning_recommendations](../../relational-databases/system-dynamic-management-views/sys-dm-db-tuning-recommendations-transact-sql.md) view. However, these recommendations are not automatically applied. User can monitor active recomendations and fix identified problems by applying [!INCLUDE[tsql_md](../../includes/tsql_md.md)] scripts that are shown in the view. This is the default value.
1533-
1532+
The [!INCLUDE[ssde_md](../../includes/ssde_md.md)] reports potential query performance regressions caused by SQL plan changes in [sys.dm_db_tuning_recommendations](../../relational-databases/system-dynamic-management-views/sys-dm-db-tuning-recommendations-transact-sql.md) view. However, these recommendations are not automatically applied. User can monitor active recomendations and fix identified problems by applying [!INCLUDE[tsql_md](../../includes/tsql_md.md)] scripts that are shown in the view. This is the default value.
1533+
15341534
**\<change_tracking_option> ::=**
15351535

15361536
Controls change tracking options. You can enable change tracking, set options, change options, and disable change tracking. For examples, see the Examples section later in this article.
@@ -2092,7 +2092,7 @@ SET
20922092
}
20932093
}
20942094
2095-
<change_tracking_option_list> ::=
2095+
<change_tracking_option_list> ::=
20962096
{
20972097
AUTO_CLEANUP = { ON | OFF }
20982098
| CHANGE_RETENTION = retention_period { DAYS | HOURS | MINUTES }

0 commit comments

Comments
 (0)