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

Yugabyte - Fix some tests for running against Yugabyte

Browse Source
This commit is contained in:
Rob Bygrave committed 2022-02-01 09:49:23 +13:00
1 parent 1359d534d5
commit b4ddbe38ee
4 files changed
+9 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ebean-test/src/test/java/io/ebean/BaseTestCase.java
+4
View File
@@ -199,6 +199,10 @@ public abstract class BaseTestCase {
return Platform.POSTGRES == platform().base();
}
public boolean isYugabyte() {
return Platform.YUGABYTE == platform().base();
}
public boolean isMySql() {
return Platform.MYSQL == platform();
}
ebean-test/src/test/java/org/tests/basic/type/TestInetAddressType.java
+1 -1
View File
@@ -27,7 +27,7 @@ public class TestInetAddressType extends TransactionalTestCase {
@Test
public void testIp6() throws UnknownHostException {
if (isPostgres()) {
if (isPostgres() || isYugabyte()) {
insertUpdateDeleteFind("2001:db8:85a3:0:0:8a2e:370:7334", "2001:db8:85a3::8a2e:370:7334", "2001:4f8:3:ba::/64", "2001:4f8:3:ba::/64");
} else {
insertUpdateDeleteFind("2001:db8:85a3:0:0:8a2e:370:7334", "2001:db8:85a3:0:0:8a2e:370:7334", "192.168.100.128/25", "192.168.100.128/25");
ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
Vendored
+2 -2
View File
@@ -369,7 +369,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
if (isH2()) {
assertSql(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku,'-',t0.code) in (?,?) order by t0.sku desc; --bind(def,Array[2]={2-1000,3-1000})");
} else if (isPostgres() || isOracle() || isDb2()) {
} else if (isPostgres() || isOracle() || isDb2() || isYugabyte()) {
assertSql(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and (t0.sku||'-'||t0.code)");
} else if (isHana()) {
assertSql(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku, '-'||t0.code)");
@@ -412,7 +412,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
if (isH2()) {
assertSql(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku,':',t0.code,'-foo') in (?,?) order by t0.sku desc; --bind(def,Array[2]={2:1000-foo,3:1000-foo})");
} else if (isPostgres() || isOracle() || isDb2()){
} else if (isPostgres() || isOracle() || isDb2() || isYugabyte()){
assertSql(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and (t0.sku||':'||t0.code||'-foo')");
} else if (isHana()){
assertSql(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku, ':'||t0.code||'-foo')");
ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
+2 -2
View File
@@ -52,8 +52,8 @@ class TestElementCollectionBasicSet extends BaseTestCase {
Set<String> phoneNumbers1 = found.get(1).getPhoneNumbers();
phoneNumbers0.size();
assertThat(phoneNumbers0).containsExactly("021 1234", "021 4321");
assertThat(phoneNumbers1).containsExactly("09 1234", "09 4321", "09 9876");
assertThat(phoneNumbers0).containsExactlyInAnyOrder("021 1234", "021 4321");
assertThat(phoneNumbers1).containsExactlyInAnyOrder("09 1234", "09 4321", "09 9876");
sql = LoggedSql.collect();
assertThat(sql).hasSize(2);