s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump mysql-connector-java from 5.1.46 to 8.0.20 (#2726)

Browse Source 
* Bump mysql-connector-java from 5.1.46 to 8.0.20

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 5.1.46 to 8.0.20.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/5.1.46...8.0.20)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Remove unneeded references to com.mysql.jdbc.ResultSetMetaData

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Tom Morris <tfmorris@gmail.com>
This commit is contained in:
dependabot-preview[bot] 2020-06-16 15:05:20 +02:00 committed by GitHub
parent 5ecb260fe4
commit 66c409aec6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/database/pom.xml
View File

@ -138,7 +138,7 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.46</version> <version>8.0.20</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jasypt</groupId> <groupId>org.jasypt</groupId>

9
extensions/database/src/com/google/refine/extension/database/mysql/MySQLDatabaseService.java
View File

@ -86,9 +86,6 @@ public class MySQLDatabaseService extends DatabaseService {
Statement statement = connection.createStatement(); Statement statement = connection.createStatement();
ResultSet queryResult = statement.executeQuery(query); ResultSet queryResult = statement.executeQuery(query);
java.sql.ResultSetMetaData metadata = queryResult.getMetaData(); java.sql.ResultSetMetaData metadata = queryResult.getMetaData();
if(metadata instanceof com.mysql.jdbc.ResultSetMetaData) {
metadata = (com.mysql.jdbc.ResultSetMetaData)metadata;
}
int columnCount = metadata.getColumnCount(); int columnCount = metadata.getColumnCount();
ArrayList<DatabaseColumn> columns = new ArrayList<DatabaseColumn>(columnCount); ArrayList<DatabaseColumn> columns = new ArrayList<DatabaseColumn>(columnCount);
for (int i = 1; i <= columnCount; i++) { for (int i = 1; i <= columnCount; i++) {
@ -163,9 +160,6 @@ public class MySQLDatabaseService extends DatabaseService {
Statement statement = connection.createStatement(); Statement statement = connection.createStatement();
ResultSet queryResult = statement.executeQuery(query); ResultSet queryResult = statement.executeQuery(query);
java.sql.ResultSetMetaData metadata = queryResult.getMetaData(); java.sql.ResultSetMetaData metadata = queryResult.getMetaData();
if(metadata instanceof com.mysql.jdbc.ResultSetMetaData) {
metadata = (com.mysql.jdbc.ResultSetMetaData)metadata;
}
int columnCount = metadata.getColumnCount(); int columnCount = metadata.getColumnCount();
ArrayList<DatabaseColumn> columns = new ArrayList<DatabaseColumn>(columnCount); ArrayList<DatabaseColumn> columns = new ArrayList<DatabaseColumn>(columnCount);
for (int i = 1; i <= columnCount; i++) { for (int i = 1; i <= columnCount; i++) {
@ -189,9 +183,6 @@ public class MySQLDatabaseService extends DatabaseService {
statement.setFetchSize(10); statement.setFetchSize(10);
ResultSet queryResult = statement.executeQuery(query); ResultSet queryResult = statement.executeQuery(query);
java.sql.ResultSetMetaData metadata = queryResult.getMetaData(); java.sql.ResultSetMetaData metadata = queryResult.getMetaData();
if(metadata instanceof com.mysql.jdbc.ResultSetMetaData) {
metadata = (com.mysql.jdbc.ResultSetMetaData)metadata;
}
int columnCount = metadata.getColumnCount(); int columnCount = metadata.getColumnCount();
int index = 0; int index = 0;
List<DatabaseRow> rows = new ArrayList<DatabaseRow>(); List<DatabaseRow> rows = new ArrayList<DatabaseRow>();