github/ebean
4
0 Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-11-14 14:46:25 +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-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArray.java
+5
View File
@@ -14,6 +14,7 @@ class ClickHouseDbArray {
mapping.put("varchar[]", "Array(String)");
mapping.put("integer[]", "Array(UInt32)");
mapping.put("bigint[]", "Array(UInt64)");
mapping.put("float[]", "Array(Float32)");
}
/**
@@ -21,6 +22,10 @@ class ClickHouseDbArray {
*/
static String logicalToNative(String logicalArrayType) {
int colonPos = logicalArrayType.indexOf(':');
int bracketPos = logicalArrayType.indexOf('(');
if (bracketPos > -1 && (bracketPos < colonPos || colonPos == -1)) {
colonPos = bracketPos;
}
if (colonPos > -1) {
logicalArrayType = logicalArrayType.substring(0, colonPos);
}