Skip to content

Commit cbd5bf2

Browse files
authored
Merge pull request #3606 from ebean-orm/feature/bump-postgres-16
Test only - align mysql and db2 test configuration
2 parents d9b5367 + 5dc664a commit cbd5bf2

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

ebean-test/src/test/resources/ebean.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ datasource.hsqldb.url=jdbc:hsqldb:mem:tests
131131
# Set caseSensitiveCollation to false when using
132132
# MySql with case insensitive collation
133133
#ebean.mysql.caseSensitiveCollation=false
134-
datasource.mysql.username=unit
135-
datasource.mysql.password=unit
136-
datasource.mysql.url=jdbc:mysql://127.0.0.1:4306/unit
134+
datasource.mysql.username=test_ebean
135+
datasource.mysql.password=test
136+
datasource.mysql.url=jdbc:mysql://127.0.0.1:4306/test_ebean
137137
#datasource.mysql.username=test_ebean
138138
#datasource.mysql.password=test
139139
#datasource.mysql.url=jdbc:mysql://127.0.0.1:4306/test_ebean
@@ -195,8 +195,8 @@ datasource.nuodb.password=test
195195
datasource.nuodb.url=jdbc:com.nuodb://localhost/testdb
196196
#datasource.nuodb.driver=com.nuodb.jdbc.Driver
197197

198-
datasource.db2.username=unit
199-
datasource.db2.password=test
198+
datasource.db2.username=admin
199+
datasource.db2.password=admin
200200
datasource.db2.url=jdbc:db2://127.0.0.1:50000/unit
201201
#datasource.db2.driver=com.ibm.db2.jcc.DB2Driver
202202

ebean-test/testconfig/ebean-db2.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ ebean.test.dbName=unit
33
# we need admin user to call the procedure SYSPROC.ADMIN_MOVE_TABLE
44
ebean.test.username=admin
55
ebean.test.password=admin
6-
datasource.default=db2-11
7-
ebean.db2-11.databasePlatformName=db2luw
6+
datasource.default=db2
7+
ebean.db2.databasePlatformName=db2luw
88
ebean.lengthCheck=utf8

ebean-test/testconfig/ebean-mysql.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ ebean.test.platform=mysql
33
ebean.test.dbName=test_ebean
44
# note: do not conflict with mariadb port
55
#ebean.test.mysql.port=4306
6-
datasource.default=mysql-docker
6+
datasource.default=mysql
77
ebean.lengthCheck=on

0 commit comments

Comments
 (0)