Merge pull request #6712 from MicrosoftDocs/master

8/1 PM Publish

Author: huypub

docs/connect/php/connection-pooling-microsoft-drivers-for-php-for-sql-server.md

@@ -1,7 +1,7 @@
 ---
 title: "Connection Pooling (Microsoft Drivers for PHP for SQL Server) | Microsoft Docs"
 ms.custom: ""
-ms.date: "07/10/2017"
+ms.date: "08/01/2018"
 ms.prod: sql
 ms.prod_service: connectivity
 ms.reviewer: ""
@@ -24,7 +24,7 @@ The following are important points to note about connection pooling in the [!INC
 
 -   The [!INCLUDE[ssDriverPHP](../../includes/ssdriverphp_md.md)] uses ODBC connection pooling.  
 
--   By default, connection pooling is enabled in Windows. In Linux and Mac OS X, connections are pooled only if connection pooling is enabled for ODBC. When connection pooling is enabled and you connect to a server, the driver attempts to use a pooled connection before it creates a new one. If an equivalent connection is not found in the pool, a new connection is created and added to the pool. The driver determines whether connections are equivalent based on a comparison of connection strings.  
+-   By default, connection pooling is enabled in Windows. In Linux and macOS, connections are pooled only if connection pooling is enabled for ODBC (see [Enabling/Disabling connection pooling](#enablingdisabling-connection-pooling)). When connection pooling is enabled and you connect to a server, the driver attempts to use a pooled connection before it creates a new one. If an equivalent connection is not found in the pool, a new connection is created and added to the pool. The driver determines whether connections are equivalent based on a comparison of connection strings.  
 
 -   When a connection from the pool is used, the connection state is reset.  
 
@@ -39,25 +39,89 @@ You can force the driver to create a new connection (instead of looking for an e
 If the *ConnectionPooling* attribute is omitted from the connection string or if it is set to **true** (or 1), the driver only creates a new connection if an equivalent connection does not exist in the connection pool.  
 
 For information about other connection attributes, see [Connection Options](../../connect/php/connection-options.md).  
-### Linux and Mac OS X
-*ConnectionPooling* attribute cannot be used to enable/disable connection pooling. 
+### Linux and macOS
+The *ConnectionPooling* attribute cannot be used to enable/disable connection pooling. 
 
-Connection pooling can be enabled/disabled by editing odbcinst.ini configuration file. The driver should be reloaded for the changes to take effect.
+Connection pooling can be enabled/disabled by editing the odbcinst.ini configuration file. The driver should be reloaded for the changes to take effect.
 
-Setting `Pooling` to `Yes` and a positive `CPTimeout`value in odbcinst.ini enables connection pooling. 
+Setting `Pooling` to `Yes` and a positive `CPTimeout` value in the odbcinst.ini file enables connection pooling. 
 ```
 [ODBC]
 Pooling=Yes
 
 [ODBC Driver 13 for SQL Server]
 CPTimeout=<int value>
 ```
-Setting `Pooling` to `No` in odbcinst.ini forces the driver to create a new connection.
+  
+Minimally, the odbcinst.ini file should look something like this example:
+
+```
+[ODBC]
+Pooling=Yes
+
+[ODBC Driver 13 for SQL Server]
+Description=Microsoft ODBC Driver 13 for SQL Server
+Driver=/opt/microsoft/msodbcsql/lib64/libmsodbcsql-13.1.so.3.0
+UsageCount=1
+CPTimeout=120
+```
+
+Setting `Pooling` to `No` in the odbcinst.ini file forces the driver to create a new connection.
 ```
 [ODBC]
 Pooling=No
 ```
-  
+
+## Remarks
+- In Linux or macOS, all connections will be pooled if pooling is enabled in the odbcinst.ini file. This means the ConnectionPooling connection option has no effect. To disable pooling, set Pooling=No in the odbcinst.ini file and reload the drivers.
+  - unixODBC <= 2.3.4 (Linux and macOS) might not return proper diagnostic information, such as error messages, warnings and informative messages
+  - for this reason, SQLSRV and PDO_SQLSRV drivers might not be able to properly fetch long data (such as xml, binary) as strings. Long data can be fetched as streams as a workaround. See the example below for SQLSRV.
+
+```
+<?php
+$connectionInfo = array("Database"=>"test", "UID"=>"username", "PWD"=>"password");
+
+$conn1 = sqlsrv_connect("servername", $connectionInfo);
+
+$longSample = str_repeat("a", 8500);
+$xml1 = 
+'<ParentXMLTag>
+  <ChildTag01>'.$longSample.'</ChildTag01>
+</ParentXMLTag>';
+
+// Create table and insert xml string into it
+sqlsrv_query($conn1, "CREATE TABLE xml_table (field xml)");
+sqlsrv_query($conn1, "INSERT into xml_table values ('$xml1')");
+
+// retrieve the inserted xml
+$column1 = getColumn($conn1);
+
+// return the connection to the pool
+sqlsrv_close($conn1);
+
+// This connection is from the pool
+$conn2 = sqlsrv_connect("servername", $connectionInfo);
+$column2 = getColumn($conn2);
+
+sqlsrv_query($conn2, "DROP TABLE xml_table");
+sqlsrv_close($conn2);
+
+function getColumn($conn)
+{
+    $tsql = "SELECT * from xml_table";
+    $stmt = sqlsrv_query($conn, $tsql);
+    sqlsrv_fetch($stmt);
+    // This might fail in Linux and macOS
+    // $column = sqlsrv_get_field($stmt, 0, SQLSRV_PHPTYPE_STRING(SQLSRV_ENC_CHAR));
+    // The workaround is to fetch it as a stream
+    $column = sqlsrv_get_field($stmt, 0, SQLSRV_PHPTYPE_STREAM(SQLSRV_ENC_CHAR));
+    sqlsrv_free_stmt($stmt);
+    return ($column);
+}
+?>
+```
+
+
 ## See Also  
 [How to: Connect Using Windows Authentication](../../connect/php/how-to-connect-using-windows-authentication.md)
 

docs/connect/php/pdo-query.md

@@ -1,7 +1,7 @@
 ---
 title: "PDO::query | Microsoft Docs"
 ms.custom: ""
-ms.date: "01/19/2017"
+ms.date: "08/01/2018"
 ms.prod: sql
 ms.prod_service: connectivity
 ms.reviewer: ""
@@ -113,8 +113,56 @@ while ( $stmt->fetch() ){
   
 $stmt = null;  
 ?>  
-```  
-  
+```
+
+## Example
+This code sample shows how to create a table of [sql_variant](https://docs.microsoft.com/sql/t-sql/data-types/sql-variant-transact-sql) types and fetch the inserted data.
+
+```
+<?php
+$server = 'serverName';
+$dbName = 'databaseName';
+$uid = 'yourUserName';
+$pwd = 'yourPassword';
+
+$conn = new PDO("sqlsrv:server=$server; database = $dbName", $uid, $pwd);
+$conn->setAttribute( PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION );  
+
+try {
+    $tableName = 'testTable';
+    $query = "CREATE TABLE $tableName ([c1_int] sql_variant, [c2_varchar] sql_variant)";
+
+    $stmt = $conn->query($query);
+    unset($stmt);
+
+    $query = "INSERT INTO [$tableName] (c1_int, c2_varchar) VALUES (1, 'test_data')";
+    $stmt = $conn->query($query);
+    unset($stmt);
+
+    $query = "SELECT * FROM $tableName";
+    $stmt = $conn->query($query);
+
+    $result = $stmt->fetch(PDO::FETCH_ASSOC);
+    print_r($result);
+    
+    unset($stmt);
+    unset($conn);
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+?>
+```
+
+The expected output would be:
+
+```
+Array
+(
+    [c1_int] => 1
+    [c2_varchar] => test_data
+)
+```
+
 ## See Also  
 [PDO Class](../../connect/php/pdo-class.md)
 

docs/connect/php/sqlsrv-query.md

@@ -1,7 +1,7 @@
 ---
 title: "sqlsrv_query | Microsoft Docs"
 ms.custom: ""
-ms.date: "05/22/2018"
+ms.date: "08/01/2018"
 ms.prod: sql
 ms.prod_service: connectivity
 ms.reviewer: ""
@@ -186,6 +186,63 @@ sqlsrv_close($conn);
 ?>
 ```
 
+## Example
+This code sample shows how to create a table of [sql_variant](https://docs.microsoft.com/sql/t-sql/data-types/sql-variant-transact-sql) types and fetch the inserted data.
+
+```
+<?php
+$server = 'serverName';
+$dbName = 'databaseName';
+$uid = 'yourUserName';
+$pwd = 'yourPassword';
+
+$options = array("Database"=>$dbName, "UID"=>$uid, "PWD"=>$pwd);
+$conn = sqlsrv_connect($server, $options);
+if($conn === false) {
+    die(print_r(sqlsrv_errors(), true));
+}
+
+$tableName = 'testTable';
+$query = "CREATE TABLE $tableName ([c1_int] sql_variant, [c2_varchar] sql_variant)";
+
+$stmt = sqlsrv_query($conn, $query);
+if($stmt === false) {
+    die(print_r(sqlsrv_errors(), true));
+}
+sqlsrv_free_stmt($stmt);
+
+$query = "INSERT INTO [$tableName] (c1_int, c2_varchar) VALUES (1, 'test_data')";
+$stmt = sqlsrv_query($conn, $query);
+if($stmt === false) {
+    die(print_r(sqlsrv_errors(), true));
+}
+sqlsrv_free_stmt($stmt);
+
+$query = "SELECT * FROM $tableName";
+$stmt = sqlsrv_query($conn, $query);
+
+if(sqlsrv_fetch($stmt) === false) {
+    die(print_r(sqlsrv_errors(), true));
+}
+
+$col1 = sqlsrv_get_field($stmt, 0);
+echo "First field:  $col1 \n";
+
+$col2 = sqlsrv_get_field($stmt, 1);
+echo "Second field:  $col2 \n";
+
+sqlsrv_free_stmt($stmt);
+sqlsrv_close($conn);
+
+?>
+```
+
+The expected output would be:
+
+```
+First field:  1
+Second field:  test_data
+```
 
 ## See Also  
 [SQLSRV Driver API Reference](../../connect/php/sqlsrv-driver-api-reference.md)  

docs/includes/ss-linux-cluster-pacemaker-configure-rhel.md

@@ -36,6 +36,7 @@
    sudo pcs cluster auth <node1> <node2> <node3> -u hacluster -p <password for hacluster>
    sudo pcs cluster setup --name <clusterName> <node1> <node2> <node3> 
    sudo pcs cluster start --all
+   sudo pcs cluster enable --all
    ```
 
    >[!NOTE]

docs/linux/sql-server-linux-availability-group-cluster-sles.md

@@ -210,7 +210,7 @@ crm configure property cluster-recheck-interval=2min
 
 For more information on Pacemaker cluster properties, see [Configuring Cluster Resources](https://www.suse.com/documentation/sle_ha/book_sleha/data/sec_ha_config_crm_resources.html).
 
-# Configure fencing (STONITH)
+## Configure fencing (STONITH)
 Pacemaker cluster vendors require STONITH to be enabled and a fencing device configured for a supported cluster setup. When the cluster resource manager cannot determine the state of a node or of a resource on a node, fencing is used to bring the cluster to a known state again.
 
 Resource level fencing ensures mainly that there is no data corruption during an outage by configuring a resource. You can use resource level fencing, for instance, with DRBD (Distributed Replicated Block Device) to mark the disk on a node as outdated when the communication link goes down.
@@ -233,6 +233,16 @@ sudo crm configure property stonith-enabled=true
 
 Refer to [SLES Administration Guid](https://www.suse.com/documentation/sle-ha-12/singlehtml/book_sleha/book_sleha.html#cha.ha.manual_config)
 
+## Enable Pacemaker
+
+Enable Pacemaker so that it automatically starts.
+
+Run the following command on every node in the cluster.
+
+```bash
+systemctl enable pacemaker
+```
+
 ### Create availability group resource
 
 The following command creates and configures the availability group resource for three replicas of availability group [ag1]. The monitor operations and timeouts have to be specified explicitly in SLES based on the fact that timeouts are highly workload-dependent and need to be carefully adjusted for each deployment.

docs/relational-databases/backup-restore/piecemeal-restores-sql-server.md

@@ -22,7 +22,7 @@ manager: craigg
 ---
 # Piecemeal Restores (SQL Server)
 [!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
-  This topic is relevant only for databases in the Enterprise edition of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] that contain multiple files or filegroups; and, under the simple model, only for read-only filegroups.  
+  This topic is relevant for databases in the Enterprise edition of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] (online restore) or Standard edition (offline restore) that contain multiple files or filegroups; and, under the simple model, only for read-only filegroups.  
 
  For information about piecemeal restore and memory-optimized tables, see [Piecemeal Restore of Databases With Memory-Optimized Tables](../../relational-databases/in-memory-oltp/piecemeal-restore-of-databases-with-memory-optimized-tables.md).  
 

docs/relational-databases/indexes/columnstore-indexes-overview.md

@@ -141,7 +141,7 @@ When you create a table with the `CREATE TABLE` statement, you can create the ta
 |Create a table as a columnstore.|[CREATE TABLE (Transact-SQL)](../../t-sql/statements/create-table-transact-sql.md)|Beginning with [!INCLUDE[ssSQL15](../../includes/sssql15-md.md)], you can create the table as a clustered columnstore index. You don't have to first create a rowstore table and then convert it to columnstore.|  
 |Create a memory table with a columnstore index.|[CREATE TABLE (Transact-SQL)](../../t-sql/statements/create-table-transact-sql.md)|Beginning with [!INCLUDE[ssSQL15](../../includes/sssql15-md.md)], you can create a memory-optimized table with a columnstore index. The columnstore index can also be added after the table is created by using the `ALTER TABLE ADD INDEX` syntax.|  
 |Convert a rowstore table to a columnstore.|[CREATE COLUMNSTORE INDEX (Transact-SQL)](../../t-sql/statements/create-columnstore-index-transact-sql.md)|Convert an existing heap or binary tree to a columnstore. Examples show how to handle existing indexes and also the name of the index when performing this conversion.|  
-|Convert a columnstore table to a rowstore.|[CREATE COLUMNSTORE INDEX (Transact-SQL)](../../t-sql/statements/create-columnstore-index-transact-sql.md)|Usually this conversion isn't necessary, but there can be times when you need to convert. Examples show how to convert a columnstore to a heap or clustered index.|  
+|Convert a columnstore table to a rowstore.|[CREATE CLUSTERED INDEX (Transact-SQL)OR DROP INDEX](../../relational-databases/indexes/create-clustered-indexes.md)|Usually this conversion isn't necessary, but there can be times when you need to convert. Examples show how to convert a columnstore to a heap or clustered index.|  
 |Create a columnstore index on a rowstore table.|[CREATE COLUMNSTORE INDEX (Transact-SQL)](../../t-sql/statements/create-columnstore-index-transact-sql.md)|A rowstore table can have one columnstore index. Beginning with [!INCLUDE[ssSQL15](../../includes/sssql15-md.md)], the columnstore index can have a filtered condition. Examples show the basic syntax.|  
 |Create performant indexes for operational analytics.|[Get started with columnstore for real-time operational analytics](../../relational-databases/indexes/get-started-with-columnstore-for-real-time-operational-analytics.md)|Describes how to create complementary columnstore and btree indexes, so that OLTP queries use btree indexes and analytics queries use columnstore indexes.|  
 |Create performant columnstore indexes for data warehousing.|[Columnstore indexes for data warehousing](~/relational-databases/indexes/columnstore-indexes-data-warehouse.md)|Describes how to use btree indexes on columnstore tables to create performant data warehousing queries.|  

docs/relational-databases/toc.yml

@@ -6,6 +6,7 @@
   href: sql-server-guides.md
   items:
   - name: Always On Availability Groups Troubleshooting and Monitoring Guide
+    href: ../database-engine/availability-groups/windows/always-on-availability-groups-troubleshooting-and-monitoring-guide.md
   - name: Index Architecture and Design
     href: sql-server-index-design-guide.md
   - name: Memory Management Architecture