1 files changed, 31 insertions, 9 deletions

diff --git a/container-compiler-plugin/src/main/java/io/trygvis/persistence/TypeHandler.java b/container-compiler-plugin/src/main/java/io/trygvis/persistence/TypeHandler.java
index 3aacd7a..0454a96 100644
--- a/container-compiler-plugin/src/main/java/io/trygvis/persistence/TypeHandler.java
+++ b/container-compiler-plugin/src/main/java/io/trygvis/persistence/TypeHandler.java
@@ -1,14 +1,21 @@
 package io.trygvis.persistence;
 
 public interface TypeHandler {
-    String setter(int i, String ref);
+    String setter(int i, String expr);
+
+    String getter(String rs, int i);
 
     String sqlType(FieldMirror field);
 
     public static class IntTypeHandler implements TypeHandler {
         @Override
-        public String setter(int i, String ref) {
-            return "setInt(" + i + ", " + ref + ")";
+        public String setter(int i, String expr) {
+            return "setInt(" + i + ", " + expr + ")";
+        }
+
+        @Override
+        public String getter(String rs, int i) {
+            return rs + ".getInt(" + i + ")";
         }
 
         @Override
@@ -19,8 +26,13 @@ public interface TypeHandler {
 
     public static class LongTypeHandler implements TypeHandler {
         @Override
-        public String setter(int i, String ref) {
-            return "setLong(" + i + ", " + ref + ")";
+        public String setter(int i, String expr) {
+            return "setLong(" + i + ", " + expr + ")";
+        }
+
+        @Override
+        public String getter(String rs, int i) {
+            return rs + ".getLong(" + i + ")";
         }
 
         @Override
@@ -31,8 +43,13 @@ public interface TypeHandler {
 
     public static class StringTypeHandler implements TypeHandler {
         @Override
-        public String setter(int i, String ref) {
-            return "setString(" + i + ", " + ref + ")";
+        public String setter(int i, String expr) {
+            return "setString(" + i + ", " + expr + ")";
+        }
+
+        @Override
+        public String getter(String rs, int i) {
+            return rs + ".getString(" + i + ")";
         }
 
         @Override
@@ -43,8 +60,13 @@ public interface TypeHandler {
 
     public static class DateTypeHandler implements TypeHandler {
         @Override
-        public String setter(int i, String ref) {
-            return "setTimestamp(" + i + ", new java.sql.Timestamp(" + ref + ".getTime()))";
+        public String setter(int i, String expr) {
+            return "setTimestamp(" + i + ", new java.sql.Timestamp(" + expr + ".getTime()))";
+        }
+
+        @Override
+        public String getter(String rs, int i) {
+            return "new java.util.Date(" + rs + ".getTimestamp(" + i + ").getTime())";
         }
 
         @Override