Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

Commit 2f9cafc

Browse files
huypubhuypub
authored
Merge pull request #6774 from MicrosoftDocs/master
8/8 PM Publish
2 parents 95093f8 + 8c23ff1 commit 2f9cafc

58 files changed

Lines changed: 2126 additions & 1900 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/connect/jdbc/azure-key-vault-sample-version-6.0.0.md‎

Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import com.microsoft.sqlserver.jdbc.SQLServerKeyVaultAuthenticationCallback;
4949

5050
public class AKV_600 {
5151

52-
private static String connectionUrl = "jdbc:sqlserver://localhost;integratedSecurity=true;database=test;columnEncryptionSetting=enabled";
52+
static String connectionUrl = "jdbc:sqlserver://localhost;integratedSecurity=true;database=test;columnEncryptionSetting=enabled";
5353
static String applicationClientID = "Your Client ID";
5454
static String applicationKey = "Your Application Key";
5555
static String keyID = "Your Key ID";
@@ -130,13 +130,6 @@ public class AKV_600 {
130130
testChar(statement);
131131
}
132132

133-
/**
134-
* Sets up keystore
135-
*
136-
* @param CUSTOM_AKV_PROVIDER_NAME
137-
* @param akvProvider
138-
* @throws SQLServerException
139-
*/
140133
private static void setupKeyStoreProviders(String CUSTOM_AKV_PROVIDER_NAME,
141134
SQLServerColumnEncryptionKeyStoreProvider akvProvider)
142135
throws SQLServerException {
@@ -145,21 +138,11 @@ public class AKV_600 {
145138
SQLServerConnection.registerColumnEncryptionKeyStoreProviders(map1);
146139
}
147140

148-
/**
149-
* Cleans and drops tables
150-
*
151-
* @throws SQLException
152-
*/
153141
private static void dropTable(Statement statement) throws SQLException {
154142
statement.executeUpdate("if object_id('" + akvTable
155143
+ "','U') is not null" + " drop table " + akvTable);
156144
}
157145

158-
/**
159-
* Drops CMKs and CEKs
160-
*
161-
* @throws SQLException
162-
*/
163146
private static void dropKeys(Statement statement) throws SQLException {
164147
statement.executeUpdate(
165148
"if exists (SELECT name from sys.column_encryption_keys where name='"
@@ -171,12 +154,6 @@ public class AKV_600 {
171154
+ cmkName + " end");
172155
}
173156

174-
/**
175-
* Creates CMK using the keystore
176-
*
177-
* @param CUSTOM_AKV_PROVIDER_NAME
178-
* @throws SQLException
179-
*/
180157
private static void createCMK(String CUSTOM_AKV_PROVIDER_NAME,
181158
Statement statement) throws SQLException {
182159
String _createColumnMasterKeyTemplate = String.format(
@@ -185,13 +162,6 @@ public class AKV_600 {
185162
statement.execute(_createColumnMasterKeyTemplate);
186163
}
187164

188-
/**
189-
* Creates CEK
190-
*
191-
* @param storeProvider
192-
* @throws SQLServerException
193-
* @throws SQLException
194-
*/
195165
private static void createCEK(
196166
SQLServerColumnEncryptionKeyStoreProvider storeProvider,
197167
Statement statement) throws SQLServerException, SQLException {
@@ -206,14 +176,6 @@ public class AKV_600 {
206176
statement.execute(cekSql);
207177
}
208178

209-
/**
210-
*
211-
* @param b
212-
* byte value
213-
* @param length
214-
* length of the array
215-
* @return
216-
*/
217179
final static char[] hexChars = {'0', '1', '2', '3', '4', '5', '6', '7', '8',
218180
'9', 'A', 'B', 'C', 'D', 'E', 'F'};
219181

@@ -227,11 +189,6 @@ public class AKV_600 {
227189
return sb.toString();
228190
}
229191

230-
/**
231-
* Populates the table
232-
*
233-
* @throws SQLException
234-
*/
235192
private static void populateCharNormalCase(Connection connection)
236193
throws SQLException {
237194
String sql = "insert into " + akvTable + " values(?,?,?)";
@@ -243,11 +200,6 @@ public class AKV_600 {
243200
}
244201
}
245202

246-
/**
247-
* Rerieves the table
248-
*
249-
* @throws SQLException
250-
*/
251203
private static void testChar(Statement statement) throws SQLException {
252204
try (ResultSet rs = statement
253205
.executeQuery("select * from " + akvTable);) {
@@ -258,13 +210,6 @@ public class AKV_600 {
258210
}
259211
}
260212

261-
/**
262-
* Tests the values
263-
*
264-
* @param rs
265-
* @param numberOfColumns
266-
* @throws SQLException
267-
*/
268213
private static void testGetString(ResultSet rs, int numberOfColumns)
269214
throws SQLException {
270215
for (int i = 1; i <= numberOfColumns; i = i + 3) {

‎docs/connect/jdbc/azure-key-vault-sample-version-6.2.2.md‎

Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import com.microsoft.sqlserver.jdbc.SQLServerException;
4040

4141
public class AKV_6_2_2 {
4242

43-
private static String connectionUrl = "jdbc:sqlserver://localhost;integratedSecurity=true;database=test;columnEncryptionSetting=enabled";
43+
static String connectionUrl = "jdbc:sqlserver://localhost;integratedSecurity=true;database=test;columnEncryptionSetting=enabled";
4444
static String applicationClientID = "Your Client ID";
4545
static String applicationKey = "Your Application Key";
4646
static String keyID = "Your Key ID";
@@ -92,13 +92,6 @@ public class AKV_6_2_2 {
9292
testChar(statement);
9393
}
9494

95-
/**
96-
* Sets up keystore
97-
*
98-
* @param CUSTOM_AKV_PROVIDER_NAME
99-
* @param akvProvider
100-
* @throws SQLServerException
101-
*/
10295
private static void setupKeyStoreProviders(String CUSTOM_AKV_PROVIDER_NAME,
10396
SQLServerColumnEncryptionKeyStoreProvider akvProvider)
10497
throws SQLServerException {
@@ -107,21 +100,11 @@ public class AKV_6_2_2 {
107100
SQLServerConnection.registerColumnEncryptionKeyStoreProviders(map1);
108101
}
109102

110-
/**
111-
* Cleans and drops tables
112-
*
113-
* @throws SQLException
114-
*/
115103
private static void dropTable(Statement statement) throws SQLException {
116104
statement.executeUpdate("if object_id('" + akvTable
117105
+ "','U') is not null" + " drop table " + akvTable);
118106
}
119107

120-
/**
121-
* Drops CMKs and CEKs
122-
*
123-
* @throws SQLException
124-
*/
125108
private static void dropKeys(Statement statement) throws SQLException {
126109
statement.executeUpdate(
127110
"if exists (SELECT name from sys.column_encryption_keys where name='"
@@ -133,12 +116,6 @@ public class AKV_6_2_2 {
133116
+ cmkName + " end");
134117
}
135118

136-
/**
137-
* Creates CMK using the keystore
138-
*
139-
* @param CUSTOM_AKV_PROVIDER_NAME
140-
* @throws SQLException
141-
*/
142119
private static void createCMK(String CUSTOM_AKV_PROVIDER_NAME,
143120
Statement statement) throws SQLException {
144121
String _createColumnMasterKeyTemplate = String.format(
@@ -147,13 +124,6 @@ public class AKV_6_2_2 {
147124
statement.execute(_createColumnMasterKeyTemplate);
148125
}
149126

150-
/**
151-
* Creates CEK
152-
*
153-
* @param storeProvider
154-
* @throws SQLServerException
155-
* @throws SQLException
156-
*/
157127
private static void createCEK(
158128
SQLServerColumnEncryptionKeyStoreProvider storeProvider,
159129
Statement statement) throws SQLServerException, SQLException {
@@ -168,14 +138,6 @@ public class AKV_6_2_2 {
168138
statement.execute(cekSql);
169139
}
170140

171-
/**
172-
*
173-
* @param b
174-
* byte value
175-
* @param length
176-
* length of the array
177-
* @return
178-
*/
179141
final static char[] hexChars = {'0', '1', '2', '3', '4', '5', '6', '7', '8',
180142
'9', 'A', 'B', 'C', 'D', 'E', 'F'};
181143

@@ -189,11 +151,6 @@ public class AKV_6_2_2 {
189151
return sb.toString();
190152
}
191153

192-
/**
193-
* Populates the table
194-
*
195-
* @throws SQLException
196-
*/
197154
private static void populateCharNormalCase(Connection connection)
198155
throws SQLException {
199156
String sql = "insert into " + akvTable + " values(?,?,?)";
@@ -205,11 +162,6 @@ public class AKV_6_2_2 {
205162
}
206163
}
207164

208-
/**
209-
* Rerieves the table
210-
*
211-
* @throws SQLException
212-
*/
213165
private static void testChar(Statement statement) throws SQLException {
214166
try (ResultSet rs = statement
215167
.executeQuery("select * from " + akvTable);) {
@@ -220,13 +172,6 @@ public class AKV_6_2_2 {
220172
}
221173
}
222174

223-
/**
224-
* Tests the values
225-
*
226-
* @param rs
227-
* @param numberOfColumns
228-
* @throws SQLException
229-
*/
230175
private static void testGetString(ResultSet rs, int numberOfColumns)
231176
throws SQLException {
232177
for (int i = 1; i <= numberOfColumns; i = i + 3) {

‎docs/connect/jdbc/azure-key-vault-sample-version-7-0-0.md‎

Lines changed: 7 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ import com.microsoft.sqlserver.jdbc.SQLServerKeyVaultAuthenticationCallback;
4747

4848
public class AKV_7_0_0 {
4949

50-
private static String connectionUrl = "jdbc:sqlserver://localhost;integratedSecurity=true;database=test;columnEncryptionSetting=enabled";
51-
static String applicationClientID = "ba2814e5-8dc6-4b68-bb68-2f8d6c37a0a5";
52-
static String applicationKey = "/V1e1IvJ8o2+CYSMvOC13kpOhdb6qkd1T6F9UTqNods=";
53-
static String keyID = "https://cheenaakv.vault.azure.net/keys/AKVTest/884a78a7fb7749fcb973be64e2efe5f0";
54-
static String cmkName = "AKV_CMK_JDBC";
55-
static String cekName = "AKV_CEK_JDBC";
56-
static String akvTable = "akvTable";
50+
static String connectionUrl = "jdbc:sqlserver://localhost;integratedSecurity=true;database=test;columnEncryptionSetting=enabled";
51+
static String applicationClientID = "Your Client ID";
52+
static String applicationKey = "Your Application Key";
53+
static String keyID = "Your Key ID";
54+
static String cmkName = "AKV_CMK_JDBC";
55+
static String cekName = "AKV_CEK_JDBC";
56+
static String akvTable = "akvTable";
5757

5858
static String createTableSQL = "create table " + akvTable + " ("
5959
+ "PlainNvarcharMax nvarchar(max) null,"
@@ -97,8 +97,6 @@ public class AKV_7_0_0 {
9797
}
9898
}
9999

100-
101-
102100
private static SQLServerKeyVaultAuthenticationCallback tryAuthenticationCallback()
103101
throws URISyntaxException, SQLServerException {
104102
SQLServerKeyVaultAuthenticationCallback authenticationCallback = new SQLServerKeyVaultAuthenticationCallback() {
@@ -152,13 +150,6 @@ public class AKV_7_0_0 {
152150
testChar(statement);
153151
}
154152

155-
/**
156-
* Sets up keystore
157-
*
158-
* @param CUSTOM_AKV_PROVIDER_NAME
159-
* @param akvProvider
160-
* @throws SQLServerException
161-
*/
162153
private static void setupKeyStoreProviders(String CUSTOM_AKV_PROVIDER_NAME,
163154
SQLServerColumnEncryptionKeyStoreProvider akvProvider)
164155
throws SQLServerException {
@@ -167,21 +158,11 @@ public class AKV_7_0_0 {
167158
SQLServerConnection.registerColumnEncryptionKeyStoreProviders(map1);
168159
}
169160

170-
/**
171-
* Cleans and drops tables
172-
*
173-
* @throws SQLException
174-
*/
175161
private static void dropTable(Statement statement) throws SQLException {
176162
statement.executeUpdate("if object_id('" + akvTable
177163
+ "','U') is not null" + " drop table " + akvTable);
178164
}
179165

180-
/**
181-
* Drops CMKs and CEKs
182-
*
183-
* @throws SQLException
184-
*/
185166
private static void dropKeys(Statement statement) throws SQLException {
186167
statement.executeUpdate(
187168
"if exists (SELECT name from sys.column_encryption_keys where name='"
@@ -193,12 +174,6 @@ public class AKV_7_0_0 {
193174
+ cmkName + " end");
194175
}
195176

196-
/**
197-
* Creates CMK using the keystore
198-
*
199-
* @param CUSTOM_AKV_PROVIDER_NAME
200-
* @throws SQLException
201-
*/
202177
private static void createCMK(String CUSTOM_AKV_PROVIDER_NAME,
203178
Statement statement) throws SQLException {
204179
String _createColumnMasterKeyTemplate = String.format(
@@ -207,13 +182,6 @@ public class AKV_7_0_0 {
207182
statement.execute(_createColumnMasterKeyTemplate);
208183
}
209184

210-
/**
211-
* Creates CEK
212-
*
213-
* @param storeProvider
214-
* @throws SQLServerException
215-
* @throws SQLException
216-
*/
217185
private static void createCEK(
218186
SQLServerColumnEncryptionKeyStoreProvider storeProvider,
219187
Statement statement) throws SQLServerException, SQLException {
@@ -228,14 +196,6 @@ public class AKV_7_0_0 {
228196
statement.execute(cekSql);
229197
}
230198

231-
/**
232-
*
233-
* @param b
234-
* byte value
235-
* @param length
236-
* length of the array
237-
* @return
238-
*/
239199
final static char[] hexChars = {'0', '1', '2', '3', '4', '5', '6', '7', '8',
240200
'9', 'A', 'B', 'C', 'D', 'E', 'F'};
241201

@@ -249,11 +209,6 @@ public class AKV_7_0_0 {
249209
return sb.toString();
250210
}
251211

252-
/**
253-
* Populates the table
254-
*
255-
* @throws SQLException
256-
*/
257212
private static void populateCharNormalCase(Connection connection)
258213
throws SQLException {
259214
String sql = "insert into " + akvTable + " values(?,?,?)";

‎docs/connect/jdbc/code-samples/basic-data-types-sample.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This [!INCLUDE[jdbcNoVersion](../../../includes/jdbcnoversion_md.md)] sample app
2323

2424
The code file for this sample is named BasicDataTypes.java, and it can be found in the following location:
2525

26-
```
26+
```bash
2727
\<installation directory>\sqljdbc_<version>\<language>\samples\datatypes
2828
```
2929

‎docs/connect/jdbc/frequently-asked-questions-faq-for-jdbc-driver.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ The Microsoft JDBC Driver 6.2 supports the JDBC 4.0, 4.1, and 4.2 specifications
5353

5454
| JAR | JDBC Specification | JDK Version |
5555
| ------------------------- | ---------------------- | ----------- |
56-
| mssql-jdbc-6.2.1.jre8.jar | JDBC 4.2, 4.1, and 4.0 | JDK 8.0 |
57-
| mssql-jdbc-6.2.1.jre7.jar | JDBC 4.1 and 4.0 | JDK 7.0 |
56+
| mssql-jdbc-6.2.2.jre8.jar | JDBC 4.2, 4.1, and 4.0 | JDK 8.0 |
57+
| mssql-jdbc-6.2.2.jre7.jar | JDBC 4.1 and 4.0 | JDK 7.0 |
5858

5959
The Microsoft JDBC Drivers 6.0 and 4.2 for SQL Server supports JDBC 4.0, 4.1, and 4.2 specifications and include two JAR class libraries in the installation package as follows:
6060

‎docs/connect/jdbc/microsoft-jdbc-driver-for-sql-server-support-matrix.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ manager: craigg
5252

5353
|Driver Version|SQL Server 2008|SQL Server 2008R2|SQL Server 2012|Azure SQL Database|PDW 2008R2 AU3<sup>4</sup>|SQL Server 2014|SQL Server 2016|SQL Server 2017|Azure SQL Managed Instance (Extended Private Preview)|
5454
|-|-|-|-|-|-|-|-|-|-|
55+
|7.0|N|Y|Y|Y|Y|Y|Y|Y|Y|
5556
|6.4|N|Y|Y|Y|Y|Y|Y|Y|Y|
5657
|6.2|Y|Y|Y|Y|Y|Y|Y|Y|N|
5758
|6.1|Y|Y|Y|Y|Y|Y|Y|N|N|

0 commit comments

Comments
 (0)