github/ebean
4
0 Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-11-12 22:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ebean-new

Browse Source 
# Conflicts:
#	ebean-api/pom.xml
#	ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java
#	ebean-autotune/pom.xml
#	ebean-bom/pom.xml
#	ebean-core-type/pom.xml
#	ebean-core/pom.xml
#	ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
#	ebean-ddl-generator/pom.xml
#	ebean-externalmapping-api/pom.xml
#	ebean-externalmapping-xml/pom.xml
#	ebean-postgis/pom.xml
#	ebean-querybean/pom.xml
#	ebean-redis/pom.xml
#	ebean-test/pom.xml
#	ebean-test/src/test/resources/ebean.properties
#	ebean-test/testconfig/ebean-mariadb-10.3.properties
#	ebean-test/testconfig/ebean-mariadb.properties
#	ebean-test/testconfig/ebean-mysql.properties
#	ebean-test/testconfig/ebean-sqlserver17.properties
#	ebean/pom.xml
#	kotlin-querybean-generator/pom.xml
#	pom.xml
#	querybean-generator/pom.xml
This commit is contained in:
Roland Praml committed 2021-12-17 08:27:59 +01:00
2 parents e5036990f2 5fddc37037
commit 6b0d04547e
96 files changed
+3220 -190
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ebean-test/testconfig/ebean-mariadb-10.3.properties
+1 -1
View File
@@ -4,5 +4,5 @@ ebean.test.dbName=test_ebean
ebean.test.dbPassword=unit
ebean.test.mariadb.version=10.3
ebean.test.mariadb.containerName=ut_mariadb-10-3
ebean.test.sqlserver.port = 7306
ebean.test.mariadb.port=14308
datasource.default=mariadb-103
ebean-test/testconfig/ebean-mariadb.properties
+1
View File
@@ -2,4 +2,5 @@ ebean.test.platform=mariadb
ebean.test.dbName=test_ebean
ebean.test.mariadb.version=10.6
ebean.test.mariadb.containerName=ut_mariadb-10-6
ebean.test.mariadb.port=14307
datasource.default=mariadb-106
ebean-test/testconfig/ebean-mysql.properties
+1 -1
View File
@@ -2,5 +2,5 @@
ebean.test.platform=mysql
ebean.test.dbName=test_ebean
# note: do not conflict with mariadb port
ebean.test.sqlserver.port = 13306
#ebean.test.mysql.port=4306
datasource.default=mysql-docker
ebean-test/testconfig/ebean-sqlserver17.properties
+6 -3
View File
@@ -1,7 +1,10 @@
ebean.test.platform=sqlserver
ebean.test.dbName=test_ebean
ebean.test.sqlserver.version=2017-latest
ebean.test.sqlserver.containerName=ut_sqlserver2017
ebean.test.sqlserver.port=1434
ebean.test.sqlserver.containerName=local_sqlserver2017
ebean.test.sqlserver.collation=LATIN1_GENERAL_100_CS_AS_SC
ebean.test.sqlserver.port=9435
ebean.test.sqlserver.url=jdbc:sqlserver://localhost:9435;databaseName=test_ebean;sendTimeAsDateTime=false
datasource.default=sqlserver2017
ebean.sqlserver2017.databasePlatformName=sqlserver17
ebean.sqlserver2017.databasePlatformName=sqlserver17
ebean-test/testconfig/ebean-sqlserver19.properties
+13
View File
@@ -0,0 +1,13 @@
ebean.test.platform=sqlserver
ebean.test.dbName=test_ebean
ebean.test.sqlserver.version=2019-latest
ebean.test.sqlserver.containerName=local_sqlserver2019
ebean.test.sqlserver.collation=LATIN1_GENERAL_100_CS_AS_SC_UTF8
ebean.test.sqlserver.port=9434
ebean.test.sqlserver.url=jdbc:sqlserver://localhost:9434;databaseName=test_ebean;sendTimeAsDateTime=false
datasource.default=sqlserver2019
ebean.sqlserver2019.databasePlatformName=sqlserver17
## A case sensitive collation example:
#ebean.test.sqlserver.collation=LATIN1_GENERAL_100_CI_AS_SC_UTF8
#ebean.sqlserver2019.caseSensitiveCollation=false