Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LDEV-5136 update mysql to 9.1.0 (6.1) #2431

Open
wants to merge 1 commit into
base: 6.1
Choose a base branch
from
Open

LDEV-5136 update mysql to 9.1.0 (6.1) #2431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ Require-Bundle: org.apache.commons.commons-codec;bundle-version=1.15.0,
com.github.f4b6a3.ulid;bundle-version=5.2.3,
org.lucee.janino;bundle-version=3.1.9,
org.lucee.janinocc;bundle-version=3.1.9
Require-Extension: 7E673D15-D87C-41A6-8B5F1956528C605F;name=MySQL;label=MySQL;version=9.0.0,
Require-Extension: 7E673D15-D87C-41A6-8B5F1956528C605F;name=MySQL;label=MySQL;version=9.1.0,
99A4EF8D-F2FD-40C8-8FB8C2E67A4EEEB6;name=MSSQL;label=MS SQL Server;version=12.6.3.jre11,
671B01B8-B3B3-42B9-AC055A356BED5281;name=PostgreSQL;label=PostgreSQL;version=42.7.3,
2BCD080F-4E1E-48F5-BEFE794232A21AF6;name=JDTsSQL;label=jTDS (MSSQL);version=1.3.1,
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/lucee/runtime/db/DBUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public static DataSourceDefintion getDataSourceDefintionForType(Config config, S
}
if ("mysql".equals(type)) {
if (MYSQL == null) {
JDBCDriver jdbc = getJDBCDriver(config, "mysql", "com.mysql.cj.jdbc.Driver", "com.mysql.cj", "8.0.15", "jdbc:mysql://{host}:{port}/{database}");
JDBCDriver jdbc = getJDBCDriver(config, "mysql", "com.mysql.cj.jdbc.Driver", "com.mysql.cj", "9.1.0", "jdbc:mysql://{host}:{port}/{database}");
MYSQL = new DataSourceDefintion(jdbc.cd, jdbc.connStr, 3306);
}
return MYSQL;
Expand Down
2 changes: 1 addition & 1 deletion test/_setupTestServices.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ component {
return {
class: 'com.mysql.cj.jdbc.Driver'
, bundleName: 'com.mysql.cj'
, bundleVersion: server.getDefaultBundleVersion( 'com.mysql.cj', '8.3.0' )
, bundleVersion: server.getDefaultBundleVersion( 'com.mysql.cj', '9.1.0' )
, connectionString: 'jdbc:mysql://#mySQL.server#:#mySQL.port#/#mySQL.database#?useUnicode=true&characterEncoding=UTF-8&useLegacyDatetimeCode=true&useSSL=false' & arguments.connectionString
, username: mySQL.username
, password: mySQL.password
Expand Down
Loading