diff --git a/pom.xml b/pom.xml
index 52231775b..969c0c287 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
io.ebean
ebean-types
- 1.1
+ 1.2
diff --git a/src/main/java/io/ebeaninternal/server/persist/Binder.java b/src/main/java/io/ebeaninternal/server/persist/Binder.java
index a45aa27f0..666b3660a 100644
--- a/src/main/java/io/ebeaninternal/server/persist/Binder.java
+++ b/src/main/java/io/ebeaninternal/server/persist/Binder.java
@@ -9,6 +9,7 @@ import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
import io.ebeaninternal.server.persist.platform.MultiValueBind;
import io.ebeaninternal.server.type.DataBind;
import io.ebeaninternal.server.type.DataReader;
+import io.ebeaninternal.server.type.PostgresHelper;
import io.ebeaninternal.server.type.RsetDataReader;
import io.ebeaninternal.server.type.ScalarType;
import io.ebeaninternal.server.type.TypeManager;
@@ -374,6 +375,11 @@ public class Binder {
b.setObject(data);
break;
+ case DbPlatformType.INET:
+ // data is always a String at this point
+ b.setObject(PostgresHelper.asInet(data.toString()));
+ break;
+
case java.sql.Types.OTHER:
b.setObject(data, dataType);
break;
diff --git a/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java b/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java
index 0079ca957..30d68b757 100644
--- a/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java
+++ b/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java
@@ -82,8 +82,8 @@ abstract class AbstractMultiValueBind extends MultiValueBind {
//case NCLOB:
case NCHAR:
case NVARCHAR:
- return "varchar";
- case ExtraDbTypes.UUID: // Db Native UUID
+ case ExtraDbTypes.UUID: // Postgres cast to uuid[]
+ case ExtraDbTypes.INET: // Postgres cast to inet[]
return "varchar";
default:
diff --git a/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java b/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java
index ac8141a5b..36d3d639e 100644
--- a/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java
+++ b/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java
@@ -14,6 +14,9 @@ public class PostgresMultiValueBind extends AbstractMultiValueBind {
if (dbType == ExtraDbTypes.UUID) {
return (not) ? " != all(?::uuid[])" : " = any(?::uuid[])";
}
+ if (dbType == ExtraDbTypes.INET) {
+ return (not) ? " != all(?::inet[])" : " = any(?::inet[])";
+ }
String arrayType = getArrayType(dbType);
if (arrayType == null) {
return super.getInExpression(not, type, size);
diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 710265bd4..866ad4942 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -39,6 +39,8 @@ import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.URI;
import java.net.URL;
@@ -977,9 +979,9 @@ public final class DefaultTypeManager implements TypeManager {
}
if (offlineMigrationGeneration || (postgres && !config.getPlatformConfig().isDatabaseInetAddressVarchar())) {
- addType(InetAddress.class, new ScalarTypeInetAddressPostgres());
+ addInetAddressType(new ScalarTypeInetAddressPostgres());
} else {
- addType(InetAddress.class, new ScalarTypeInetAddress());
+ addInetAddressType(new ScalarTypeInetAddress());
}
if (offlineMigrationGeneration || postgres) {
@@ -1077,4 +1079,10 @@ public final class DefaultTypeManager implements TypeManager {
nativeMap.put(Types.TIMESTAMP, timestampType);
}
+ private void addInetAddressType(ScalarType scalarType) {
+ addType(InetAddress.class, scalarType);
+ addType(Inet4Address.class, scalarType);
+ addType(Inet6Address.class, scalarType);
+ }
+
}
diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
index 4168e0c89..d52676da5 100644
--- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
+++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
@@ -11,8 +11,8 @@ import java.sql.Types;
*/
public abstract class ScalarTypeInet extends ScalarTypeBaseVarchar {
- ScalarTypeInet() {
- super(Inet.class, false, ExtraDbTypes.INET);
+ ScalarTypeInet(int jdbcType) {
+ super(Inet.class, false, jdbcType);
}
@Override
@@ -43,6 +43,10 @@ public abstract class ScalarTypeInet extends ScalarTypeBaseVarchar {
*/
public static class Varchar extends ScalarTypeInet {
+ Varchar() {
+ super(Types.VARCHAR);
+ }
+
@Override
public void bind(DataBind b, Inet value) throws SQLException {
if (value == null) {
@@ -58,6 +62,10 @@ public abstract class ScalarTypeInet extends ScalarTypeBaseVarchar {
*/
public static class Postgres extends ScalarTypeInet {
+ Postgres() {
+ super(ExtraDbTypes.INET);
+ }
+
@Override
public void bind(DataBind b, Inet value) throws SQLException {
if (value == null) {
diff --git a/src/test/java/org/tests/basic/type/TestInetAddressType.java b/src/test/java/org/tests/basic/type/TestInetAddressType.java
index 3aba6b688..6f821802f 100644
--- a/src/test/java/org/tests/basic/type/TestInetAddressType.java
+++ b/src/test/java/org/tests/basic/type/TestInetAddressType.java
@@ -9,6 +9,8 @@ import org.tests.model.basic.EWithInetAddr;
import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertNotNull;
@@ -32,6 +34,57 @@ public class TestInetAddressType extends TransactionalTestCase {
}
}
+ @Test
+ public void test_inet_queryIn() {
+
+ List addrs = Inet.listOf("120.12.12.56", "120.12.12.57");
+
+ DB.find(EWithInetAddr.class)
+ .where()
+ .in("inet2", addrs)
+ .findList();
+ }
+
+ @Test
+ public void test_inetAdress_queryIn() throws UnknownHostException {
+
+ List addrs = new ArrayList<>();
+ addrs.add(InetAddress.getByName("120.12.12.56"));
+ addrs.add(InetAddress.getByName("120.12.12.57"));
+
+ DB.find(EWithInetAddr.class)
+ .where()
+ .in("inetAddress", addrs)
+ .findList();
+ }
+
+ @Test
+ public void test_inet_queryEq() {
+
+ DB.find(EWithInetAddr.class)
+ .where()
+ .eq("inet2", new Inet("120.12.12.58"))
+ .findList();
+ }
+
+ @Test
+ public void test_inet4address_queryEq() throws UnknownHostException {
+
+ DB.find(EWithInetAddr.class)
+ .where()
+ .eq("inetAddress", InetAddress.getByName("120.12.12.58"))
+ .findList();
+ }
+
+ @Test
+ public void test_inet6address_queryEq() throws UnknownHostException {
+
+ DB.find(EWithInetAddr.class)
+ .where()
+ .eq("inetAddress", InetAddress.getByName("2001:db8:85a3:0:0:8a2e:370:7334"))
+ .findList();
+ }
+
private void insertUpdateDeleteFind(String ipAddress, String expected) throws UnknownHostException {
EWithInetAddr bean1 = new EWithInetAddr();