Fixed error when custom database type inherited from enum converts to VARCHAR

Author: vadeg

src/main/java/de/zalando/sprocwrapper/proxy/OtherStoredProcedureParameter.java

@@ -1,32 +1,44 @@
 package de.zalando.sprocwrapper.proxy;
 
 import java.lang.reflect.Method;
-
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.UUID;
 
 import org.postgresql.util.PGobject;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 import de.zalando.typemapper.postgres.PgTypeHelper;
 
 /**
- * @author  jmussler
+ * @author jmussler
  */
 class OtherStoredProcedureParameter extends StoredProcedureParameter {
     private static final Logger LOG = LoggerFactory.getLogger(OtherStoredProcedureParameter.class);
 
     public OtherStoredProcedureParameter(final Class<?> clazz, final Method m, final String typeName, final int sqlType,
-            final int javaPosition, final boolean sensitive) {
+                                         final int javaPosition, final boolean sensitive) {
         super(clazz, m, typeName, sqlType, javaPosition, sensitive);
     }
 
     @Override
     public Object mapParam(final Object value, final Connection connection) {
         if (value == null) {
+            if (clazz.isEnum()) {
+                /*
+                * In situation when there is null value passed as an argument and
+                * argument type maps to custom database type which inherited from ENUM
+                * sql type "OTHER" will fallback to sql type "VARCHAR" what will cause an exception
+                 *  "No function matches the given name and argument types. You might need to add explicit type casts."
+                  *  That happens because SP expects custom type but not VARCHAR
+                 *
+                */
+                final PGobject pgobj = new PGobject();
+                pgobj.setType(typeName);
+                return pgobj;
+            }
             return null;
         }
 

src/test/java/de/zalando/sprocwrapper/SimpleIT.java

@@ -1,50 +1,39 @@
 package de.zalando.sprocwrapper;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import java.math.BigDecimal;
-
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Timestamp;
-
 import java.text.SimpleDateFormat;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
-
 import javax.sql.DataSource;
-
 import javax.validation.ConstraintViolationException;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import org.joda.time.DateTime;
-
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
-
 import org.junit.runner.RunWith;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-
 import org.springframework.jdbc.core.JdbcTemplate;
-
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 
 import de.zalando.sprocwrapper.example.AddressPojo;
 import de.zalando.sprocwrapper.example.Example1DomainObject1;
@@ -77,7 +66,6 @@
 import de.zalando.sprocwrapper.example.TestInheritanceChild;
 import de.zalando.sprocwrapper.example.WrapperLookupSchema;
 import de.zalando.sprocwrapper.example.WrapperOptionalLookupType;
-
 import de.zalando.typemapper.parser.DateTimeUtil;
 
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -1088,4 +1076,14 @@ public void testSQLUpdate() {
         assertTrue(l1.size() == 1);
         assertTrue(l2.size() == 0);
     }
+
+    @Test
+    public void testNullComplexParam() throws Exception {
+        exampleSProcService.createOrder(null);
+    }
+
+    @Test
+    public void testNullEnumParam() {
+        exampleSProcService.useEnumParam(null);
+    }
 }