Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	ebean-api/pom.xml
#	ebean-api/src/main/java/io/ebean/config/dbplatform/db2/BaseDB2Platform.java
#	ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
#	ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
#	ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/idx_db2.migrations

ebean-test/src/test/java/main/StartYugabyte.java

@@ -0,0 +1,29 @@
+package main;
+
+import io.ebean.docker.commands.YugabyteConfig;
+import io.ebean.docker.commands.YugabyteContainer;
+
+public class StartYugabyte {
+
+  public static void main(String[] args) {
+
+    // Check add extensions ?
+    YugabyteConfig config = new YugabyteConfig("2.11.2.0-b89");
+    config.setDbName("unit");
+    config.setUser("unit");
+
+    YugabyteContainer container = new YugabyteContainer(config);
+    container.start();
+
+//    Run container ut_yugabyte with host:localhost port:6433 db:unit user:unit/test shutdown:None
+//    docker run -d --name ut_yugabyte -p 6433:5433 -p 7000:7000 -p 9000:9000 -p 9042:9042 yugabytedb/yugabyte:2.11.2.0-b89 bin/yugabyted start --daemon=false
+//    ...
+//    Commands - sqlRun: drop database if exists unit
+//    Commands - sqlRun: drop role if exists unit
+//    Commands - sqlRun: select 1 from pg_database where datname = 'unit'
+//    Commands - sqlRun: select rolname from pg_roles where rolname = 'unit'
+//    Commands - sqlRun: create role unit password 'test' login createrole
+//    Commands - sqlRun: create database unit with owner unit
+
+  }
+}

ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java

@@ -282,7 +282,7 @@ public class TestQueryFilterMany extends BaseTestCase {
 
     List<String> sql = LoggedSql.stop();
 
-    assertThat(sql).hasSize(2);
+    assertThat(sql.size()).isGreaterThan(1);
     assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where t1.first_name is not null order by t0.id; --bind()");
     platformAssertIn(sql.get(1), " from contact_note t0 where (t0.contact_id)");
     assertSql(sql.get(1)).contains(" and lower(t0.title) like");

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

@@ -23,6 +23,7 @@ ebean.ddl.run=true
 ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp}
 ebean.packages=org.tests,org.etest
 datasource.default=h2
+#datasource.default=yugabyte
 #datasource.h2.capturestacktrace=true
 
 #ebean.dumpMetricsOnShutdown=true
@@ -144,6 +145,10 @@ datasource.cockroach.password=
 datasource.cockroach.url=jdbc:postgresql://localhost:26257/unit?sslmode=disable
 datasource.cockroach.driver=org.postgresql.Driver
 
+datasource.yugabyte.username=unit
+datasource.yugabyte.password=test
+datasource.yugabyte.url=jdbc:postgresql://localhost:6433/unit?sslmode=disable
+
 datasource.oracle.username=test_ebean
 datasource.oracle.password=test
 datasource.oracle.url=jdbc:oracle:thin:@localhost:1521:XE