From 399e5769e35fed179972fa1bbc54c785440533b5 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Thu, 1 Mar 2012 16:56:10 +0000
Subject: [PATCH] [#1200] Internal API leak exposed through covariance in
 AbstractType.getFields()

---
 .../src/main/java/org/jooq/impl/AbstractSubSelect.java | 10 +++++++---
 jOOQ/src/main/java/org/jooq/impl/FieldList.java        |  3 ++-
 jOOQ/src/main/java/org/jooq/impl/TableAlias.java       |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractSubSelect.java b/jOOQ/src/main/java/org/jooq/impl/AbstractSubSelect.java
index 26013d5b7a..b489b631ae 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractSubSelect.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractSubSelect.java
@@ -444,7 +444,7 @@ implements
         }
 
         context.declareFields(true);
-        context.sql(getSelect());
+        context.sql(getSelect1());
         context.declareFields(false);
 
         // FROM and JOIN clauses
@@ -603,12 +603,16 @@ implements
         this.forUpdateWait = 0;
     }
 
+    @Override
+    public final List<Field<?>> getSelect() {
+        return getSelect1();
+    }
+
     final FieldList getSelect0() {
         return select;
     }
 
-    @Override
-    public final FieldList getSelect() {
+    final FieldList getSelect1() {
         if (getSelect0().isEmpty()) {
             FieldList result = new SelectFieldList();
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldList.java b/jOOQ/src/main/java/org/jooq/impl/FieldList.java
index 08108a3de7..cf4a5b709a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldList.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldList.java
@@ -39,6 +39,7 @@ package org.jooq.impl;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.jooq.Field;
@@ -96,7 +97,7 @@ class FieldList extends NamedQueryPartList<Field<?>> implements FieldProvider {
     }
 
     @Override
-    public final FieldList getFields() {
+    public final List<Field<?>> getFields() {
         return this;
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/TableAlias.java b/jOOQ/src/main/java/org/jooq/impl/TableAlias.java
index e4b3422fda..d6e64b012e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TableAlias.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TableAlias.java
@@ -97,7 +97,7 @@ class TableAlias<R extends Record> extends AbstractTable<R> {
     }
 
     @Override
-    public FieldList getFieldList() {
+    protected FieldList getFieldList() {
         if (aliasedFields == null) {
             aliasedFields = new FieldList();