Merge pull request #86 from zalando-stups/gh-69-enum-mapping-from-explicit-schema

Fix a bug with enum type mapping from explicit schema

Author: vadeg

database/test/21_shard1/22_schema3/00_create_schema.sql

@@ -0,0 +1,16 @@
+RESET role;
+
+CREATE SCHEMA ztest_schema3
+ AUTHORIZATION zalando_api_owner;
+
+ALTER DEFAULT PRIVILEGES FOR ROLE postgres IN SCHEMA ztest_schema3 REVOKE EXECUTE ON FUNCTIONS FROM public;
+ALTER DEFAULT PRIVILEGES FOR ROLE zalando_api_owner IN SCHEMA ztest_schema3 REVOKE EXECUTE ON FUNCTIONS FROM public;
+ALTER DEFAULT PRIVILEGES IN SCHEMA ztest_schema3 REVOKE EXECUTE ON FUNCTIONS FROM public;
+
+ALTER DEFAULT PRIVILEGES FOR ROLE zalando_api_owner IN SCHEMA ztest_schema3 GRANT EXECUTE ON FUNCTIONS TO zalando_api_executor;
+
+GRANT USAGE ON SCHEMA ztest_schema3 TO zalando_api_usage;
+
+SET ROLE TO zalando_api_owner;
+
+SET search_path TO ztest_schema3, public;

database/test/21_shard1/22_schema3/03_types/10_color_enum.sql

@@ -0,0 +1,6 @@
+CREATE TYPE color AS ENUM (
+    'RED',
+    'BLUE',
+    'GREEN',
+    'ORANGE'
+    );

database/test/21_shard1/22_schema3/03_types/20_car_domain_object.sql

@@ -0,0 +1,6 @@
+CREATE TYPE CAR AS
+(
+    id    BIGINT,
+    brand TEXT,
+    color ztest_schema3.COLOR
+);

database/test/21_shard1/22_schema3/03_types/30_customer_address.sql

@@ -0,0 +1,5 @@
+CREATE TYPE CUSTOMER_ADDRESS AS
+(
+    street       VARCHAR,
+    house_number INT
+);

database/test/21_shard1/22_schema3/03_types/40_customer.sql

@@ -0,0 +1,6 @@
+CREATE TYPE CUSTOMER AS
+(
+    id      BIGINT,
+    name    TEXT,
+    address ztest_schema3.CUSTOMER_ADDRESS
+);

database/test/21_shard1/22_schema3/05_stored_procedures/10_list_cars.sql

@@ -0,0 +1,14 @@
+CREATE OR REPLACE FUNCTION get_all_cars()
+    RETURNS SETOF ztest_schema3.CAR AS
+$body$
+BEGIN
+    RETURN QUERY SELECT t.id, t.brand,
+                        t.color
+                 FROM (VALUES (1::BIGINT, 'Toyota'::TEXT, 'RED'::ztest_schema3.COLOR),
+                              (2::BIGINT, 'Mercedes'::TEXT, 'BLUE'::ztest_schema3.COLOR))
+                          AS t (id, brand, color);
+END;
+$body$
+    LANGUAGE plpgsql
+    SECURITY DEFINER
+    COST 100;

database/test/21_shard1/22_schema3/05_stored_procedures/20_list_customers.sql

@@ -0,0 +1,13 @@
+CREATE OR REPLACE FUNCTION get_all_customers()
+    RETURNS SETOF ztest_schema3.CUSTOMER AS
+$body$
+BEGIN
+    RETURN QUERY SELECT t.id, t.name,
+                        t.address
+                 FROM (VALUES (1::BIGINT, 'John'::TEXT, ROW('First street', 15)::ztest_schema3.CUSTOMER_ADDRESS))
+                          AS t (id, name, address);
+END;
+$body$
+    LANGUAGE plpgsql
+    SECURITY DEFINER
+    COST 100;

docker-compose.yml

@@ -1,8 +1,8 @@
 version: '3'
 services:
   db:
-    image: 'postgres:9.6.10'
+    image: 'postgres:13'
     environment:
       POSTGRES_PASSWORD: 'postgres'
     ports:
-      - '5432:5432'
+      - '5432:5432'

pom.xml

@@ -59,8 +59,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <spring.version>5.2.12.RELEASE</spring.version>
         <postgresql.version>42.2.14</postgresql.version>
     </properties>
@@ -198,7 +198,7 @@
             <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>6.0.5</version>
+                <version>6.1.6</version>
                 <executions>
                     <execution>
                         <goals>
@@ -434,6 +434,7 @@
                                         CREATE EXTENSION hstore;
                                         DROP SCHEMA IF EXISTS ztest_schema1 CASCADE;
                                         DROP SCHEMA IF EXISTS ztest_schema2 CASCADE;
+                                        DROP SCHEMA IF EXISTS ztest_schema3 CASCADE;
                                     </sqlCommand>
                                     <onError>continue</onError>
                                 </configuration>

src/main/java/org/zalando/typemapper/core/TypeMapper.java

@@ -71,7 +71,6 @@ public ITEM mapRow(final ResultSet set, final int count) throws SQLException {
     }
 
     private ResultTree extractResultTree(final ResultSet set) throws SQLException {
-        LOG.trace("Extracting result tree");
 
         // cast to obtain more information from the result set.
         final PgResultSet pgSet = set.unwrap(PgResultSet.class);
@@ -100,7 +99,7 @@ private ResultTree extractResultTree(final ResultSet set) throws SQLException {
                 int j = 1;
                 for (final String fieldValue : fieldValues) {
                     final DbTypeField fieldDef = function.getFieldByPos(j);
-                    DbResultNode currentNode = null;
+                    DbResultNode currentNode;
                     if (fieldDef.getType().equals("USER-DEFINED")) {
                         currentNode = new ObjectResultNode(fieldValue, fieldDef.getName(), fieldDef.getTypeName(),
                                 fieldDef.getTypeId(), pgSet.getStatement().getConnection());
@@ -141,7 +140,7 @@ private ResultTree extractResultTree(final ResultSet set) throws SQLException {
             tree.addChild(node);
         }
 
-        LOG.trace("Extracted ResultTree: {}", tree);
+        LOG.debug("Extracted ResultTree: {}", tree);
 
         return tree;
     }