Ignore missing columns in mapper (JAVA-824).

olim7t · olim7t · commit 77d5e9b89c77 · 2015-06-26T18:19:17.000+02:00
diff --git a/changelog/README.md b/changelog/README.md
@@ -18,6 +18,7 @@
 - [improvement] Allow @Enumerated in Accessor method parameters (JAVA-589)
 - [improvement] Allow access to table metadata from Mapper (JAVA-554)
 - [improvement] Provide a way to map computed fields (JAVA-661)
+- [improvement] Ignore missing columns in mapper (JAVA-824)
 
 
 ### 2.1.6
diff --git a/driver-mapping/src/main/java/com/datastax/driver/mapping/Result.java b/driver-mapping/src/main/java/com/datastax/driver/mapping/Result.java
@@ -44,9 +44,10 @@ public class Result<T> implements Iterable<T> {
     private T map(Row row) {
         T entity = mapper.newEntity();
         for (ColumnMapper<T> cm : mapper.allColumns()) {
-            if (!useAlias && cm.kind == ColumnMapper.Kind.COMPUTED)
+            String name = cm.getAlias() != null && this.useAlias ? cm.getAlias() : cm.getColumnName();
+            if (!row.getColumnDefinitions().contains(name))
                 continue;
-            ByteBuffer bytes = row.getBytesUnsafe(cm.getAlias() != null && this.useAlias ? cm.getAlias() : cm.getColumnName());
+            ByteBuffer bytes = row.getBytesUnsafe(name);
             if (bytes != null)
                 cm.setValue(entity, cm.getDataType().deserialize(bytes, protocolVersion));
         }
diff --git a/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperTest.java b/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperTest.java
@@ -22,6 +22,8 @@
 import com.google.common.base.Objects;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.testng.annotations.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.*;
 
 import com.datastax.driver.mapping.MapperTest.User.Gender;
@@ -377,4 +379,40 @@ public void testDynamicEntity() throws Exception {
         userAccessor.updateNameAndGender("Paule", null, u1.getUserId());
         assertEquals(userMapper.get(u1.getUserId()).getGender(), null);
     }
+
+    @Test(groups="short")
+    public void should_map_objects_from_partial_queries() throws Exception {
+        MappingManager manager = new MappingManager(session);
+
+        Mapper<Post> m = manager.mapper(Post.class);
+
+        // Insert a few posts
+        User u1 = new User("Paul", "paul@gmail.com", User.Gender.MALE);
+        Post p1 = new Post(u1, "Something about mapping");
+        Post p2 = new Post(u1, "Something else");
+        Post p3 = new Post(u1, "Something more");
+
+        p1.setDevice(InetAddress.getLocalHost());
+        p2.setTags(new HashSet<String>(Arrays.asList("important", "keeper")));
+
+        m.save(p1);
+        m.save(p2);
+        m.save(p3);
+
+        // Retrieve posts with a projection query that only retrieves some of the fields
+        ResultSet rs = session.execute("select user_id, post_id, title from posts where user_id = ?", u1.getUserId());
+
+        Result<Post> result = m.map(rs);
+        for (Post post : result) {
+            assertThat(post.getUserId()).isEqualTo(u1.getUserId());
+            assertThat(post.getPostId()).isNotNull();
+            assertThat(post.getTitle()).isNotNull();
+
+            assertThat(post.getDevice()).isNull();
+            assertThat(post.getTags()).isNull();
+        }
+
+        // cleanup
+        session.execute("delete from posts where user_id = ?", u1.getUserId());
+    }
 }
