opendev/gerrit
Code Issues Proposed changes

Revert "Update mysql-connector-java to 6.0.6"

Browse Source 
This reverts commit 0d839758febd82c1814ae815820e5f187a629497.

Updating to mysql-connector-java 6.0.6 broke the sql upgrader.

Bug: Issue 7331
Change-Id: I70b956452773d94ab42614aa8aff9b79ce40aba5
This commit is contained in:
Paladox none 2017-10-04 17:57:31 +00:00
parent 8eaa652dec
commit 7563a07837
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/database-setup.txt
View File

@ -55,7 +55,7 @@ using PostgreSQL.
[[createdb_mysql]]
=== MySQL
Requirements: MySQL version 5.5 or later.
Requirements: MySQL version 5.1 or later.
This option is also more complicated than the H2 option. Just as with
PostgreSQL it's also recommended for larger installations.

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/JDBCInitializer.java
View File

@ -40,7 +40,7 @@ class JDBCInitializer implements DatabaseConfigInitializer {
} else if (url.startsWith("jdbc:mariadb:")) {
database.set("driver", "org.mariadb.jdbc.Driver");
} else if (url.startsWith("jdbc:mysql:")) {
database.set("driver", "com.mysql.cj.jdbc.Driver");
database.set("driver", "com.mysql.jdbc.Driver");
} else if (url.startsWith("jdbc:postgresql:")) {
database.set("driver", "org.postgresql.Driver");
}

6
gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/libraries.config
View File

@ -13,9 +13,9 @@
# limitations under the License.
[library "mysqlDriver"]
name = MySQL Connector/J 6.0.6
url = https://repo1.maven.org/maven2/mysql/mysql-connector-java/6.0.6/mysql-connector-java-6.0.6.jar
sha1 = 1d19b184dbc596008cc71c83596f051c3ec4097f
name = MySQL Connector/J 5.1.43
url = https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.43/mysql-connector-java-5.1.43.jar
sha1 = dee9103eec0d877f3a21c82d4d9e9f4fbd2d6e0a
remove = mysql-connector-java-.*[.]jar
[library "mariadbDriver"]

2
gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java
View File

@ -151,7 +151,7 @@ public abstract class JdbcAccountPatchReviewStore
return "org.postgresql.Driver";
}
if (url.contains(MYSQL)) {
return "com.mysql.cj.jdbc.Driver";
return "com.mysql.jdbc.Driver";
}
if (url.contains(MARIADB)) {
return "org.mariadb.jdbc.Driver";

2
gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java
View File

@ -28,7 +28,7 @@ class MySql extends BaseDataSourceType {
@Inject
MySql(@GerritServerConfig Config cfg) {
super("com.mysql.cj.jdbc.Driver");
super("com.mysql.jdbc.Driver");
this.cfg = cfg;
}

2
gerrit-war/src/main/webapp/WEB-INF/extra/jetty7/gerrit.xml
View File

@ -46,7 +46,7 @@
<Set name="password">secretkey</Set>
-->
<!-- MySQL
<Set name="driverClassName">com.mysql.cj.jdbc.Driver</Set>
<Set name="driverClassName">com.mysql.jdbc.Driver</Set>
<Set name="url">jdbc:mysql://localhost/reviewdb?user=gerrit&amp;password=secretkey</Set>
-->
<!-- MariaDB