mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-15 09:55:49 +01:00
Bump mariadb-java-client to 3.0.4 (#3059)
This commit is contained in:
@@ -38,8 +38,18 @@ object DatabaseConfig {
|
||||
|
||||
private lazy val dbUrl = getValue("db.url", config.getString) //config.getString("db.url")
|
||||
|
||||
def url(directory: Option[String]): String =
|
||||
dbUrl.replace("${DatabaseHome}", directory.getOrElse(DatabaseHome))
|
||||
def url(directory: Option[String]): String = {
|
||||
val sb = new StringBuilder()
|
||||
sb.append(dbUrl)
|
||||
if (dbUrl.startsWith("jdbc:mysql:") && dbUrl.indexOf("permitMysqlScheme") == -1) {
|
||||
if (dbUrl.indexOf("?") == -1) {
|
||||
sb.append("?permitMysqlScheme")
|
||||
} else {
|
||||
sb.append("&permitMysqlScheme")
|
||||
}
|
||||
}
|
||||
sb.toString().replace("${DatabaseHome}", directory.getOrElse(DatabaseHome))
|
||||
}
|
||||
|
||||
lazy val url: String = url(None)
|
||||
lazy val user: String = getValue("db.user", config.getString)
|
||||
|
||||
@@ -31,6 +31,7 @@ class GitBucketCoreModuleSpec extends AnyFunSuite {
|
||||
val container = new MySQLContainer() {
|
||||
override val container = new org.testcontainers.containers.MySQLContainer(s"mysql:$tag") {
|
||||
override def getDriverClassName = "org.mariadb.jdbc.Driver"
|
||||
override def getJdbcUrl: String = super.getJdbcUrl + "?permitMysqlScheme"
|
||||
}
|
||||
// TODO https://jira.mariadb.org/browse/CONJ-663
|
||||
container.withCommand("mysqld --default-authentication-plugin=mysql_native_password")
|
||||
@@ -38,7 +39,11 @@ class GitBucketCoreModuleSpec extends AnyFunSuite {
|
||||
container.start()
|
||||
try {
|
||||
new Solidbase().migrate(
|
||||
DriverManager.getConnection(s"${container.jdbcUrl}?useSSL=false", container.username, container.password),
|
||||
DriverManager.getConnection(
|
||||
container.jdbcUrl,
|
||||
container.username,
|
||||
container.password
|
||||
),
|
||||
Thread.currentThread().getContextClassLoader(),
|
||||
new MySQLDatabase(),
|
||||
new Module(GitBucketCoreModule.getModuleId, GitBucketCoreModule.getVersions)
|
||||
|
||||
Reference in New Issue
Block a user