From bea0a4917b9c2bcf5020a504bc67ac8a23e64e1a Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Tue, 28 Aug 2012 19:58:46 +0200
Subject: [PATCH] [#1751] Result.intoResultSet() generates wrong
 ResultSetMetaData if runtime schema mapping is applied

---
 .../main/java/org/jooq/impl/ResultSetImpl.java   | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/ResultSetImpl.java b/jOOQ/src/main/java/org/jooq/impl/ResultSetImpl.java
index 1dde0de1b7..a33d18c355 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ResultSetImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ResultSetImpl.java
@@ -61,6 +61,8 @@ import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Map;
 
+import org.jooq.AttachableInternal;
+import org.jooq.Configuration;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Result;
@@ -1233,7 +1235,19 @@ class ResultSetImpl extends JDBC41ResultSet implements ResultSet, Serializable {
                     Schema schema = table.getSchema();
 
                     if (schema != null) {
-                        return schema.getName();
+                        Configuration configuration = ((AttachableInternal) result).getConfiguration();
+                        Schema mapped = null;
+
+                        if (configuration != null) {
+                            mapped = Util.getMappedSchema(configuration, schema);
+                        }
+
+                        if (mapped != null) {
+                            return mapped.getName();
+                        }
+                        else {
+                            return schema.getName();
+                        }
                     }
                 }
             }