Skip to content

Commit 4ce904e

Browse files
Apply suggestions from code review
Co-authored-by: William Assaf MSFT <74387232+WilliamDAssafMSFT@users.noreply.github.com> Co-authored-by: Van To <40007119+VanMSFT@users.noreply.github.com>
1 parent bf7c244 commit 4ce904e

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ The following table lists all the currently available connection string properti
6565
| enablePrepareOnFirst...<br/>PreparedStatementCall<br/><br/>boolean<br/>["true" &#124; "false"]<br/><br/>false | Set to "true" to enable prepared statement handle creation by calling `sp_prepexec` with the first execution of a prepared statement. <br/><br/>Set to "false" to change the first execution of a prepared statement to call `sp_executesql` and not prepare a statement. If a second execution happens, it calls `sp_prepexec` to set up a prepared statement handle. |
6666
| enclaveAttestationUrl<br/><br/>String<br/><br/>null | (Version 8.2+) This optional property indicates the attestation service endpoint URL to use for Always Encrypted with secure enclaves.<br/><br/>For more information about Always Encrypted with secure enclaves, see [Always Encrypted with secure enclaves](using-always-encrypted-with-secure-enclaves-with-the-jdbc-driver.md). |
6767
| enclaveAttestationProtocol<br/><br/>String<br/><br/>null | (Version 8.2+) This optional property indicates the attestation protocol to use for Always Encrypted with secure enclaves. Currently, the only supported values for this field are **HGS**, **AAS**, and **NONE** (**NONE** is only supported in version 11.2+). <br/><br/>For more information about Always Encrypted with secure enclaves, see [Always Encrypted with secure enclaves](using-always-encrypted-with-secure-enclaves-with-the-jdbc-driver.md). |
68-
| encrypt<br/><br/>String<br/><br/>null | Set to "true" to specify that SQL Server uses TLS encryption for all the data sent between the client and the server if the server has a certificate installed. The default value is "true" in version 10.2 and later and "false" in 9.4 and earlier.<br/><br/> In version 6.0 and up, there's a new connection setting 'authentication' that uses TLS encryption by default. <br/><br/>For more information about this property, see the 'authentication' property.<br/><br/> In version 11.2.0 and up, **encrypt** was changed from **boolean** to **string**, allowing for TDS 8.0 support when the property is set to **strict**. <br/><br/> The default change in version 10.2 is a breaking change. If you're upgrading from 9.4 or earlier and your server doesn't have a valid TLS certificate, set **trustServerCertificate** to **true** or provide a valid certificate. |
68+
| encrypt<br/><br/>String<br/><br/>null | Set to "true" to specify that the SQL Database Engine uses TLS encryption for all the data sent between the client and the server if the server has a certificate installed. The default value is "true" in version 10.2 and later and "false" in 9.4 and earlier.<br/><br/> In version 6.0 and up, there's a new connection setting 'authentication' that uses TLS encryption by default. <br/><br/>For more information about this property, see the 'authentication' property.<br/><br/> In version 11.2.0 and up, **encrypt** was changed from **boolean** to **string**, allowing for TDS 8.0 support when the property is set to **strict**. <br/><br/> The default change in version 10.2 is a breaking change. If you're upgrading from 9.4 or earlier and your server doesn't have a valid TLS certificate, set **trustServerCertificate** to **true** or provide a valid certificate. |
6969
| failoverPartner<br/><br/>String<br/><br/>null | The name of the failover server used in a database mirroring configuration. This property is used for an initial connection failure to the principal server. After you make the initial connection, this property is ignored. Must be used with the databaseName property.<br/><br/> **Note:** The driver doesn't support the server instance port number for the failover partner instance as part of the failoverPartner property in the connection string. However, the driver does support specifying the serverName, instanceName, and portNumber properties of the principal server instance, and failoverPartner property of the failover partner instance, in the same connection string.<br/><br/> If you specify a Virtual Network Name in the **Server** connection property, you can't use database mirroring. For more information about disaster recovery, see [JDBC driver support for High Availability, disaster recovery](jdbc-driver-support-for-high-availability-disaster-recovery.md) |
7070
| `fips`<br/><br/>boolean<br/>["true" &#124; "false"]<br/><br/>"false" | For FIPS enabled Java Virtual Machine (JVM) this property should be **true**. |
7171
| fipsProvider<br/><br/>String<br/><br/>null | FIPS provider configured in JVM. For example, BCFIPS or SunPKCS11-NSS. Removed in version 6.4.0. For more information, see [GitHub issue 460](https://github.com/Microsoft/mssql-jdbc/pull/460). |

docs/machine-learning/install/sql-ml-component-install-without-internet-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This article describes how to install SQL Server Machine Learning Services on Wi
2020
By default, installers connect to Microsoft download sites to get required and updated components for machine learning on SQL Server. If firewall constraints prevent the installer from reaching these sites, you can use an internet-connected device to download files, transfer files to an offline server, and then run setup.
2121

2222
> [!IMPORTANT]
23-
> Beginning with SQL Server 2022, R, Python, and Java runtimes are **no longer installed with SQL Setup** and **don't use CAB files**. Instead, you install your desired custom runtime(s) and packages separately. The offline installation process for SQL Server 2022 is similar to the online process — download and copy the runtime installers to the offline server. For CAB-based offline installation, see the SQL Server 2016, 2017, or 2019 sections in this article.
23+
> Beginning with SQL Server 2022, R, Python, and Java runtimes are **no longer installed with SQL Setup** and **don't use CAB files**. Instead, you install your desired custom runtime(s) and packages separately. The offline installation process for SQL Server 2022 and later versions is similar to the online process — download and copy the runtime installers to the offline server. For CAB-based offline installation, see the SQL Server 2016, 2017, or 2019 sections in this article.
2424
2525
> [!NOTE]
2626
> Feature capabilities and installation options vary between versions of SQL Server. Use the version selector dropdown list to choose the appropriate version of SQL Server.

0 commit comments

Comments
 (0)