Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-05 04:56:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2228 from gitbucket/dbtest-on-docker

Browse Source 
Support MySQL8 and enhance database test to use docker
This commit is contained in:
Naoki Takezoe
2018-12-22 09:11:15 +09:00
committed by GitHub
parent 261e72cae4 a6d682fdee
commit 2cf2adafd3
3 changed files with 42 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.sbt
View File

@@ -66,8 +66,9 @@ libraryDependencies ++= Seq(
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",
"org.scalatra" %% "scalatra-scalatest" % ScalatraVersion % "test", "org.scalatra" %% "scalatra-scalatest" % ScalatraVersion % "test",
"org.mockito" % "mockito-core" % "2.23.4" % "test", "org.mockito" % "mockito-core" % "2.23.4" % "test",
"com.wix" % "wix-embedded-mysql" % "4.2.0" % "test", "com.dimafeng" %% "testcontainers-scala" % "0.22.0" % "test",
"ru.yandex.qatools.embed" % "postgresql-embedded" % "2.10" % "test", "org.testcontainers" % "mysql" % "1.10.3" % "test",
"org.testcontainers" % "postgresql" % "1.10.3" % "test",
"net.i2p.crypto" % "eddsa" % "0.3.0", "net.i2p.crypto" % "eddsa" % "0.3.0",
"is.tagomor.woothee" % "woothee-java" % "1.8.0", "is.tagomor.woothee" % "woothee-java" % "1.8.0",
"org.ec4j.core" % "ec4j-core" % "0.0.3" "org.ec4j.core" % "ec4j-core" % "0.0.3"

2
src/main/resources/update/gitbucket-core_4.0.xml
View File

@@ -206,7 +206,7 @@
<column name="PULL_REQUEST" type="boolean" nullable="false"/> <column name="PULL_REQUEST" type="boolean" nullable="false"/>
</createTable> </createTable>
<addPrimaryKey constraintName="IDX_ISSUE_PK" tableName="ISSUE" columnNames="ISSUE_ID, USER_NAME, REPOSITORY_NAME"/> <addPrimaryKey constraintName="IDX_ISSUE_PK" tableName="ISSUE" columnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID"/>
<addForeignKeyConstraint constraintName="IDX_ISSUE_FK0" baseTableName="ISSUE" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/> <addForeignKeyConstraint constraintName="IDX_ISSUE_FK0" baseTableName="ISSUE" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
<addForeignKeyConstraint constraintName="IDX_ISSUE_FK2" baseTableName="ISSUE" baseColumnNames="MILESTONE_ID" referencedTableName="MILESTONE" referencedColumnNames="MILESTONE_ID"/> <addForeignKeyConstraint constraintName="IDX_ISSUE_FK2" baseTableName="ISSUE" baseColumnNames="MILESTONE_ID" referencedTableName="MILESTONE" referencedColumnNames="MILESTONE_ID"/>
<addForeignKeyConstraint constraintName="IDX_ISSUE_FK1" baseTableName="ISSUE" baseColumnNames="OPENED_USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/> <addForeignKeyConstraint constraintName="IDX_ISSUE_FK1" baseTableName="ISSUE" baseColumnNames="OPENED_USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>

86
src/test/scala/gitbucket/core/GitBucketCoreModuleSpec.scala
View File

@@ -2,18 +2,12 @@ package gitbucket.core
import java.sql.DriverManager import java.sql.DriverManager
import com.dimafeng.testcontainers.{MySQLContainer, PostgreSQLContainer}
import io.github.gitbucket.solidbase.Solidbase import io.github.gitbucket.solidbase.Solidbase
import io.github.gitbucket.solidbase.model.Module import io.github.gitbucket.solidbase.model.Module
import liquibase.database.core.{H2Database, MySQLDatabase, PostgresDatabase} import liquibase.database.core.{H2Database, MySQLDatabase, PostgresDatabase}
import org.junit.runner.Description
import org.scalatest.{FunSuite, Tag} import org.scalatest.{FunSuite, Tag}
import com.wix.mysql.EmbeddedMysql._
import com.wix.mysql.config.Charset
import com.wix.mysql.config.MysqldConfig._
import com.wix.mysql.distribution.Version._
import ru.yandex.qatools.embed.postgresql.PostgresStarter
import ru.yandex.qatools.embed.postgresql.config.AbstractPostgresConfig.{Credentials, Net, Storage, Timeout}
import ru.yandex.qatools.embed.postgresql.config.PostgresConfig
import ru.yandex.qatools.embed.postgresql.distribution.Version.Main.PRODUCTION
object ExternalDBTest extends Tag("ExternalDBTest") object ExternalDBTest extends Tag("ExternalDBTest")
@@ -28,52 +22,46 @@ class GitBucketCoreModuleSpec extends FunSuite {
) )
} }
test("Migration MySQL", ExternalDBTest) { implicit private val suiteDescription = Description.createSuiteDescription(getClass)
val config = aMysqldConfig(v5_7_latest)
.withPort(3306)
.withUser("sa", "sa")
.withCharset(Charset.UTF8)
.withServerVariable("bind-address", "127.0.0.1")
.build()
val mysqld = anEmbeddedMysql(config) Seq("8.0", "5.7").foreach { tag =>
.addSchema("gitbucket") test(s"Migration MySQL $tag", ExternalDBTest) {
.start() val container = new MySQLContainer() {
override val container = new org.testcontainers.containers.MySQLContainer(s"mysql:$tag") {
try { override def getDriverClassName = "org.mariadb.jdbc.Driver"
new Solidbase().migrate( }
DriverManager.getConnection("jdbc:mysql://localhost:3306/gitbucket?useSSL=false", "sa", "sa"), // TODO https://github.com/testcontainers/testcontainers-java/issues/736
Thread.currentThread().getContextClassLoader(), container.withCommand("mysqld --default-authentication-plugin=mysql_native_password")
new MySQLDatabase(), }
new Module(GitBucketCoreModule.getModuleId, GitBucketCoreModule.getVersions) container.starting()
) try {
} finally { new Solidbase().migrate(
mysqld.stop() DriverManager.getConnection(s"${container.jdbcUrl}?useSSL=false", container.username, container.password),
Thread.currentThread().getContextClassLoader(),
new MySQLDatabase(),
new Module(GitBucketCoreModule.getModuleId, GitBucketCoreModule.getVersions)
)
} finally {
container.finished()
}
} }
} }
test("Migration PostgreSQL", ExternalDBTest) { Seq("11", "10").foreach { tag =>
val runtime = PostgresStarter.getDefaultInstance() test(s"Migration PostgreSQL $tag", ExternalDBTest) {
val config = new PostgresConfig( val container = PostgreSQLContainer(s"postgres:$tag")
PRODUCTION,
new Net("localhost", 5432),
new Storage("gitbucket"),
new Timeout(),
new Credentials("sa", "sa")
)
val exec = runtime.prepare(config) container.starting()
val process = exec.start() try {
new Solidbase().migrate(
try { DriverManager.getConnection(container.jdbcUrl, container.username, container.password),
new Solidbase().migrate( Thread.currentThread().getContextClassLoader(),
DriverManager.getConnection("jdbc:postgresql://localhost:5432/gitbucket", "sa", "sa"), new PostgresDatabase(),
Thread.currentThread().getContextClassLoader(), new Module(GitBucketCoreModule.getModuleId, GitBucketCoreModule.getVersions)
new PostgresDatabase(), )
new Module(GitBucketCoreModule.getModuleId, GitBucketCoreModule.getVersions) } finally {
) container.finished()
} finally { }
process.stop()
} }
} }