From 123b2cca0b821083cd5defb25b5d655588dc655e Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Sat, 10 Dec 2011 16:06:06 +0000
Subject: [PATCH] [#981] Cannot insertInto(table("my_table")), as plain SQL
 tables return Table<Record>, not Table<TableRecord>. Relax bound on R - Fixed
 INSERT

---
 .../org/jooq/util/spring/FactoryProxy.java    | 12 ++++----
 jOOQ/src/main/java/org/jooq/Cursor.java       | 28 +++++++++----------
 .../main/java/org/jooq/FactoryOperations.java | 10 +++----
 jOOQ/src/main/java/org/jooq/Insert.java       |  2 +-
 .../main/java/org/jooq/InsertFinalStep.java   |  2 +-
 .../jooq/InsertOnDuplicateSetMoreStep.java    |  2 +-
 .../org/jooq/InsertOnDuplicateSetStep.java    |  2 +-
 .../java/org/jooq/InsertOnDuplicateStep.java  |  2 +-
 jOOQ/src/main/java/org/jooq/InsertQuery.java  |  2 +-
 .../main/java/org/jooq/InsertResultStep.java  |  2 +-
 .../java/org/jooq/InsertReturningStep.java    |  2 +-
 .../main/java/org/jooq/InsertSetMoreStep.java |  2 +-
 .../src/main/java/org/jooq/InsertSetStep.java |  2 +-
 .../main/java/org/jooq/InsertValuesStep.java  |  2 +-
 jOOQ/src/main/java/org/jooq/Record.java       |  2 +-
 jOOQ/src/main/java/org/jooq/Result.java       |  2 +-
 jOOQ/src/main/java/org/jooq/ResultQuery.java  |  2 +-
 .../jooq/impl/AbstractDelegatingSelect.java   |  3 +-
 .../java/org/jooq/impl/AbstractRecord.java    |  3 +-
 .../org/jooq/impl/AbstractResultQuery.java    |  3 +-
 .../main/java/org/jooq/impl/CursorImpl.java   |  5 ++--
 jOOQ/src/main/java/org/jooq/impl/Factory.java | 10 +++----
 .../main/java/org/jooq/impl/InsertImpl.java   |  4 +--
 .../java/org/jooq/impl/InsertQueryImpl.java   |  4 +--
 .../org/jooq/impl/InsertSelectQueryImpl.java  |  4 +--
 .../main/java/org/jooq/impl/ResultImpl.java   |  3 +-
 26 files changed, 56 insertions(+), 61 deletions(-)

diff --git a/jOOQ-spring/src/main/java/org/jooq/util/spring/FactoryProxy.java b/jOOQ-spring/src/main/java/org/jooq/util/spring/FactoryProxy.java
index 31d0026b0b..9a2076245f 100644
--- a/jOOQ-spring/src/main/java/org/jooq/util/spring/FactoryProxy.java
+++ b/jOOQ-spring/src/main/java/org/jooq/util/spring/FactoryProxy.java
@@ -261,27 +261,27 @@ public class FactoryProxy implements FactoryOperations, MethodInterceptor {
     }
 
     @Override
-    public final <R extends TableRecord<R>> InsertQuery<R> insertQuery(Table<R> into) {
+    public final <R extends Record> InsertQuery<R> insertQuery(Table<R> into) {
         return getDelegate().insertQuery(into);
     }
 
     @Override
-    public final <R extends TableRecord<R>> InsertSetStep<R> insertInto(Table<R> into) {
+    public final <R extends Record> InsertSetStep<R> insertInto(Table<R> into) {
         return getDelegate().insertInto(into);
     }
 
     @Override
-    public final <R extends TableRecord<R>> InsertValuesStep<R> insertInto(Table<R> into, Field<?>... fields) {
+    public final <R extends Record> InsertValuesStep<R> insertInto(Table<R> into, Field<?>... fields) {
         return getDelegate().insertInto(into, fields);
     }
 
     @Override
-    public final <R extends TableRecord<R>> InsertValuesStep<R> insertInto(Table<R> into, Collection<? extends Field<?>> fields) {
+    public final <R extends Record> InsertValuesStep<R> insertInto(Table<R> into, Collection<? extends Field<?>> fields) {
         return getDelegate().insertInto(into, fields);
     }
 
     @Override
-    public final <R extends TableRecord<R>> Insert<R> insertInto(Table<R> into, Select<?> select) {
+    public final <R extends Record> Insert<R> insertInto(Table<R> into, Select<?> select) {
         return getDelegate().insertInto(into, select);
     }
 
@@ -321,7 +321,7 @@ public class FactoryProxy implements FactoryOperations, MethodInterceptor {
     }
 
     @Override
-    public <R extends TableRecord<R>> Truncate<R> truncate(Table<R> table) {
+    public final <R extends TableRecord<R>> Truncate<R> truncate(Table<R> table) {
         return getDelegate().truncate(table);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/Cursor.java b/jOOQ/src/main/java/org/jooq/Cursor.java
index ce9b30800f..bf684332a9 100644
--- a/jOOQ/src/main/java/org/jooq/Cursor.java
+++ b/jOOQ/src/main/java/org/jooq/Cursor.java
@@ -51,7 +51,7 @@ import org.jooq.exception.MappingException;
  * <p>
  * Client code must close this {@link Cursor} in order to close the underlying
  * {@link PreparedStatement} and {@link ResultSet}
- * 
+ *
  * @param <R> The cursor's record type
  * @author Lukas Eder
  */
@@ -62,7 +62,7 @@ public interface Cursor<R extends Record> extends FieldProvider, Iterable<R> {
      * <p>
      * This will conveniently close the <code>Cursor</code>, after the last
      * <code>Record</code> was fetched.
-     * 
+     *
      * @throws DataAccessException if something went wrong executing the query
      */
     boolean hasNext() throws DataAccessException;
@@ -72,7 +72,7 @@ public interface Cursor<R extends Record> extends FieldProvider, Iterable<R> {
      * <p>
      * This will conveniently close the <code>Cursor</code>, after the last
      * <code>Record</code> was fetched.
-     * 
+     *
      * @throws DataAccessException if something went wrong executing the query
      */
     Result<R> fetch() throws DataAccessException;
@@ -82,7 +82,7 @@ public interface Cursor<R extends Record> extends FieldProvider, Iterable<R> {
      * <p>
      * This will conveniently close the <code>Cursor</code>, after the last
      * <code>Record</code> was fetched.
-     * 
+     *
      * @param number The number of records to fetch. If this is <code>0</code>
      *            or negative an empty list is returned, the cursor is
      *            untouched. If this is greater than the number of remaining
@@ -96,7 +96,7 @@ public interface Cursor<R extends Record> extends FieldProvider, Iterable<R> {
      * <p>
      * This will conveniently close the <code>Cursor</code>, after the last
      * <code>Record</code> was fetched.
-     * 
+     *
      * @return The next record from the cursor, or <code>null</code> if there is
      *         no next record.
      * @throws DataAccessException if something went wrong executing the query
@@ -108,7 +108,7 @@ public interface Cursor<R extends Record> extends FieldProvider, Iterable<R> {
      * <p>
      * This will conveniently close the <code>Cursor</code>, after the last
      * <code>Record</code> was fetched.
-     * 
+     *
      * @param handler The handler callback
      * @return Convenience result, returning the parameter handler itself
      * @throws DataAccessException if something went wrong executing the query
@@ -117,7 +117,7 @@ public interface Cursor<R extends Record> extends FieldProvider, Iterable<R> {
 
     /**
      * Fetch results into a custom handler callback
-     * 
+     *
      * @param handler The handler callback
      * @return Convenience result, returning the parameter handler itself
      * @throws DataAccessException if something went wrong executing the query
@@ -129,7 +129,7 @@ public interface Cursor<R extends Record> extends FieldProvider, Iterable<R> {
      * <p>
      * This is the same as calling <code>fetchOne().into(type)</code>. See
      * {@link Record#into(Class)} for more details
-     * 
+     *
      * @param <E> The generic entity type.
      * @param type The entity type.
      * @see Record#into(Class)
@@ -145,7 +145,7 @@ public interface Cursor<R extends Record> extends FieldProvider, Iterable<R> {
      * <p>
      * This is the same as calling <code>fetch().into(type)</code>. See
      * {@link Record#into(Class)} for more details
-     * 
+     *
      * @param <E> The generic entity type.
      * @param type The entity type.
      * @see Record#into(Class)
@@ -161,7 +161,7 @@ public interface Cursor<R extends Record> extends FieldProvider, Iterable<R> {
      * <p>
      * This is the same as calling <code>fetchOne().into(table)</code>. See
      * {@link Record#into(Class)} for more details
-     * 
+     *
      * @param <Z> The generic table record type.
      * @param table The table type.
      * @see Record#into(Class)
@@ -170,14 +170,14 @@ public interface Cursor<R extends Record> extends FieldProvider, Iterable<R> {
      * @throws MappingException wrapping any reflection or data type conversion
      *             exception that might have occurred while mapping records
      */
-    <Z extends TableRecord<Z>> Z fetchOneInto(Table<Z> table) throws DataAccessException, MappingException;
+    <Z extends Record> Z fetchOneInto(Table<Z> table) throws DataAccessException, MappingException;
 
     /**
      * Map resulting records onto a custom record.
      * <p>
      * This is the same as calling <code>fetch().into(table)</code>. See
      * {@link Record#into(Class)} for more details
-     * 
+     *
      * @param <Z> The generic table record type.
      * @param table The table type.
      * @see Record#into(Class)
@@ -186,7 +186,7 @@ public interface Cursor<R extends Record> extends FieldProvider, Iterable<R> {
      * @throws MappingException wrapping any reflection or data type conversion
      *             exception that might have occurred while mapping records
      */
-    <Z extends TableRecord<Z>> List<Z> fetchInto(Table<Z> table) throws DataAccessException, MappingException;
+    <Z extends Record> List<Z> fetchInto(Table<Z> table) throws DataAccessException, MappingException;
 
     /**
      * Explicitly close the underlying {@link PreparedStatement} and
@@ -195,7 +195,7 @@ public interface Cursor<R extends Record> extends FieldProvider, Iterable<R> {
      * If you fetch all records from the underlying {@link ResultSet}, jOOQ
      * <code>Cursor</code> implementations will close themselves for you.
      * Calling <code>close()</code> again will have no effect.
-     * 
+     *
      * @throws DataAccessException if something went wrong executing the query
      */
     void close() throws DataAccessException;
diff --git a/jOOQ/src/main/java/org/jooq/FactoryOperations.java b/jOOQ/src/main/java/org/jooq/FactoryOperations.java
index 1326e6929d..85ac558cfb 100644
--- a/jOOQ/src/main/java/org/jooq/FactoryOperations.java
+++ b/jOOQ/src/main/java/org/jooq/FactoryOperations.java
@@ -308,7 +308,7 @@ public interface FactoryOperations extends Configuration {
      * @param into The table to insert data into
      * @return The new {@link InsertQuery}
      */
-    <R extends TableRecord<R>> InsertQuery<R> insertQuery(Table<R> into);
+    <R extends Record> InsertQuery<R> insertQuery(Table<R> into);
 
     /**
      * Create a new DSL insert statement. This type of insert may feel more
@@ -330,7 +330,7 @@ public interface FactoryOperations extends Configuration {
      *       .execute();
      * </pre></code>
      */
-    <R extends TableRecord<R>> InsertSetStep<R> insertInto(Table<R> into);
+    <R extends Record> InsertSetStep<R> insertInto(Table<R> into);
 
     /**
      * Create a new DSL insert statement.
@@ -347,7 +347,7 @@ public interface FactoryOperations extends Configuration {
      *       .execute();
      * </pre></code>
      */
-    <R extends TableRecord<R>> InsertValuesStep<R> insertInto(Table<R> into, Field<?>... fields);
+    <R extends Record> InsertValuesStep<R> insertInto(Table<R> into, Field<?>... fields);
 
     /**
      * Create a new DSL insert statement.
@@ -364,7 +364,7 @@ public interface FactoryOperations extends Configuration {
      *       .execute();
      * </pre></code>
      */
-    <R extends TableRecord<R>> InsertValuesStep<R> insertInto(Table<R> into, Collection<? extends Field<?>> fields);
+    <R extends Record> InsertValuesStep<R> insertInto(Table<R> into, Collection<? extends Field<?>> fields);
 
     /**
      * Create a new DSL insert statement.
@@ -379,7 +379,7 @@ public interface FactoryOperations extends Configuration {
      *       .execute();
      * </pre></code>
      */
-    <R extends TableRecord<R>> Insert<R> insertInto(Table<R> into, Select<?> select);
+    <R extends Record> Insert<R> insertInto(Table<R> into, Select<?> select);
 
     /**
      * Create a new {@link UpdateQuery}
diff --git a/jOOQ/src/main/java/org/jooq/Insert.java b/jOOQ/src/main/java/org/jooq/Insert.java
index d392707f64..bea3e8c8ca 100644
--- a/jOOQ/src/main/java/org/jooq/Insert.java
+++ b/jOOQ/src/main/java/org/jooq/Insert.java
@@ -40,6 +40,6 @@ package org.jooq;
  *
  * @author Lukas Eder
  */
-public interface Insert<R extends TableRecord<R>> extends Query {
+public interface Insert<R extends Record> extends Query {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertFinalStep.java b/jOOQ/src/main/java/org/jooq/InsertFinalStep.java
index 40e220a04c..3fcb3c2106 100644
--- a/jOOQ/src/main/java/org/jooq/InsertFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertFinalStep.java
@@ -53,6 +53,6 @@ package org.jooq;
  *
  * @author Lukas Eder
  */
-public interface InsertFinalStep<R extends TableRecord<R>> extends Insert<R> {
+public interface InsertFinalStep<R extends Record> extends Insert<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetMoreStep.java b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetMoreStep.java
index 67b99890b7..8792ec340a 100644
--- a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetMoreStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetMoreStep.java
@@ -52,6 +52,6 @@ package org.jooq;
  *
  * @author Lukas Eder
  */
-public interface InsertOnDuplicateSetMoreStep<R extends TableRecord<R>> extends InsertOnDuplicateSetStep<R>, InsertFinalStep<R> {
+public interface InsertOnDuplicateSetMoreStep<R extends Record> extends InsertOnDuplicateSetStep<R>, InsertFinalStep<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetStep.java b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetStep.java
index e71e6577cd..e71e3b9aed 100644
--- a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetStep.java
@@ -54,7 +54,7 @@ import java.util.Map;
  *
  * @author Lukas Eder
  */
-public interface InsertOnDuplicateSetStep<R extends TableRecord<R>> {
+public interface InsertOnDuplicateSetStep<R extends Record> {
 
     /**
      * Set values for <code>UPDATE</code> in the <code>INSERT</code> statement's
diff --git a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java
index c6e3d08c4f..ef69f2cc6e 100644
--- a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java
@@ -54,7 +54,7 @@ import org.jooq.impl.Factory;
  *
  * @author Lukas Eder
  */
-public interface InsertOnDuplicateStep<R extends TableRecord<R>> extends InsertFinalStep<R>, InsertReturningStep<R> {
+public interface InsertOnDuplicateStep<R extends Record> extends InsertFinalStep<R>, InsertReturningStep<R> {
 
     /**
      * Add an <code>ON DUPLICATE KEY UPDATE</code> clause to this insert query.
diff --git a/jOOQ/src/main/java/org/jooq/InsertQuery.java b/jOOQ/src/main/java/org/jooq/InsertQuery.java
index aac4c36a6f..54df9df406 100644
--- a/jOOQ/src/main/java/org/jooq/InsertQuery.java
+++ b/jOOQ/src/main/java/org/jooq/InsertQuery.java
@@ -45,7 +45,7 @@ import java.util.Map;
  * @param <R> The record type of the table being inserted into
  * @author Lukas Eder
  */
-public interface InsertQuery<R extends TableRecord<R>> extends StoreQuery<R>, Insert<R> {
+public interface InsertQuery<R extends Record> extends StoreQuery<R>, Insert<R> {
 
     /**
      * Adds a new Record to the insert statement for multi-record inserts
diff --git a/jOOQ/src/main/java/org/jooq/InsertResultStep.java b/jOOQ/src/main/java/org/jooq/InsertResultStep.java
index 42347b17df..53af24c7a1 100644
--- a/jOOQ/src/main/java/org/jooq/InsertResultStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertResultStep.java
@@ -68,7 +68,7 @@ import org.jooq.exception.DataAccessException;
  *
  * @author Lukas Eder
  */
-public interface InsertResultStep<R extends TableRecord<R>> extends Insert<R> {
+public interface InsertResultStep<R extends Record> extends Insert<R> {
 
     /**
      * The result holding returned values as specified by the
diff --git a/jOOQ/src/main/java/org/jooq/InsertReturningStep.java b/jOOQ/src/main/java/org/jooq/InsertReturningStep.java
index c2220200f3..45d53e38b2 100644
--- a/jOOQ/src/main/java/org/jooq/InsertReturningStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertReturningStep.java
@@ -69,7 +69,7 @@ import java.util.Collection;
  *
  * @author Lukas Eder
  */
-public interface InsertReturningStep<R extends TableRecord<R>> {
+public interface InsertReturningStep<R extends Record> {
 
     /**
      * Configure the <code>INSERT</code> statement to return all fields in
diff --git a/jOOQ/src/main/java/org/jooq/InsertSetMoreStep.java b/jOOQ/src/main/java/org/jooq/InsertSetMoreStep.java
index 918818c06f..5642d1d2d3 100644
--- a/jOOQ/src/main/java/org/jooq/InsertSetMoreStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertSetMoreStep.java
@@ -55,7 +55,7 @@ package org.jooq;
  *
  * @author Lukas Eder
  */
-public interface InsertSetMoreStep<R extends TableRecord<R>> extends InsertSetStep<R>, InsertOnDuplicateStep<R> {
+public interface InsertSetMoreStep<R extends Record> extends InsertSetStep<R>, InsertOnDuplicateStep<R> {
 
     /**
      * Add an additional record to the <code>INSERT</code> statement
diff --git a/jOOQ/src/main/java/org/jooq/InsertSetStep.java b/jOOQ/src/main/java/org/jooq/InsertSetStep.java
index 8d186a2549..7b84caf140 100644
--- a/jOOQ/src/main/java/org/jooq/InsertSetStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertSetStep.java
@@ -58,7 +58,7 @@ import java.util.Map;
  *
  * @author Lukas Eder
  */
-public interface InsertSetStep<R extends TableRecord<R>> {
+public interface InsertSetStep<R extends Record> {
 
     /**
      * Set a value for a field in the <code>UPDATE</code> statement
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep.java
index a56dd490b2..7acd81b7d2 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep.java
@@ -54,7 +54,7 @@ import java.util.Collection;
  *
  * @author Lukas Eder
  */
-public interface InsertValuesStep<R extends TableRecord<R>> extends InsertOnDuplicateStep<R> {
+public interface InsertValuesStep<R extends Record> extends InsertOnDuplicateStep<R> {
 
     /**
      * Add values to the insert statement
diff --git a/jOOQ/src/main/java/org/jooq/Record.java b/jOOQ/src/main/java/org/jooq/Record.java
index 475e058a97..64a0c63ccf 100644
--- a/jOOQ/src/main/java/org/jooq/Record.java
+++ b/jOOQ/src/main/java/org/jooq/Record.java
@@ -1058,7 +1058,7 @@ public interface Record extends FieldProvider, Store<Object> {
      * @param <R> The generic table record type.
      * @param table The table type.
      */
-    <R extends TableRecord<R>> R into(Table<R> table);
+    <R extends Record> R into(Table<R> table);
 
     /**
      * Load data into this record from a source. The mapping algorithm is this:
diff --git a/jOOQ/src/main/java/org/jooq/Result.java b/jOOQ/src/main/java/org/jooq/Result.java
index 7425133d3c..0e2ff01c70 100644
--- a/jOOQ/src/main/java/org/jooq/Result.java
+++ b/jOOQ/src/main/java/org/jooq/Result.java
@@ -1753,7 +1753,7 @@ public interface Result<R extends Record> extends FieldProvider, List<R>, Attach
      *             exception that might have occurred while mapping records
      * @see Record#into(Table)
      */
-    <Z extends TableRecord<Z>> Result<Z> into(Table<Z> table) throws MappingException;
+    <Z extends Record> Result<Z> into(Table<Z> table) throws MappingException;
 
     /**
      * Map results into a custom handler callback
diff --git a/jOOQ/src/main/java/org/jooq/ResultQuery.java b/jOOQ/src/main/java/org/jooq/ResultQuery.java
index 61229fd4b5..887a7a8d7e 100644
--- a/jOOQ/src/main/java/org/jooq/ResultQuery.java
+++ b/jOOQ/src/main/java/org/jooq/ResultQuery.java
@@ -475,7 +475,7 @@ public interface ResultQuery<R extends Record> extends Query {
      * @see Result#into(Table)
      * @throws DataAccessException if something went wrong executing the query
      */
-    <Z extends TableRecord<Z>> Result<Z> fetchInto(Table<Z> table) throws DataAccessException;
+    <Z extends Record> Result<Z> fetchInto(Table<Z> table) throws DataAccessException;
 
     /**
      * Fetch results into a custom handler callback
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingSelect.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingSelect.java
index 4d37c07e8e..37125f432b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingSelect.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingSelect.java
@@ -47,7 +47,6 @@ import org.jooq.RecordHandler;
 import org.jooq.Result;
 import org.jooq.Select;
 import org.jooq.Table;
-import org.jooq.TableRecord;
 import org.jooq.exception.DataAccessException;
 
 /**
@@ -222,7 +221,7 @@ abstract class AbstractDelegatingSelect<R extends Record>
     }
 
     @Override
-    public final <Z extends TableRecord<Z>> Result<Z> fetchInto(Table<Z> table) throws DataAccessException {
+    public final <Z extends Record> Result<Z> fetchInto(Table<Z> table) throws DataAccessException {
         return getDelegate().fetchInto(table);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
index 75eb55dbf2..80fe00b5e9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
@@ -62,7 +62,6 @@ import org.jooq.Field;
 import org.jooq.FieldProvider;
 import org.jooq.Record;
 import org.jooq.Table;
-import org.jooq.TableRecord;
 import org.jooq.UniqueKey;
 import org.jooq.exception.MappingException;
 import org.jooq.tools.Convert;
@@ -570,7 +569,7 @@ abstract class AbstractRecord extends AbstractStore<Object> implements Record {
     }
 
     @Override
-    public final <R extends TableRecord<R>> R into(Table<R> table) {
+    public final <R extends Record> R into(Table<R> table) {
         try {
             R result = Util.newRecord(table, getConfiguration());
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
index 8ae45f02bb..d1d8a46aee 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
@@ -63,7 +63,6 @@ import org.jooq.Result;
 import org.jooq.ResultQuery;
 import org.jooq.SQLDialect;
 import org.jooq.Table;
-import org.jooq.TableRecord;
 import org.jooq.exception.DataAccessException;
 import org.jooq.exception.InvalidResultException;
 import org.jooq.tools.Convert;
@@ -375,7 +374,7 @@ abstract class AbstractResultQuery<R extends Record> extends AbstractQuery imple
     }
 
     @Override
-    public final <Z extends TableRecord<Z>> Result<Z> fetchInto(Table<Z> table) throws DataAccessException {
+    public final <Z extends Record> Result<Z> fetchInto(Table<Z> table) throws DataAccessException {
         return fetch().into(table);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CursorImpl.java b/jOOQ/src/main/java/org/jooq/impl/CursorImpl.java
index 4024a3597d..03e624b5c9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CursorImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CursorImpl.java
@@ -49,7 +49,6 @@ import org.jooq.Record;
 import org.jooq.RecordHandler;
 import org.jooq.Result;
 import org.jooq.Table;
-import org.jooq.TableRecord;
 import org.jooq.tools.JooqLogger;
 
 /**
@@ -180,12 +179,12 @@ class CursorImpl<R extends Record> implements Cursor<R> {
     }
 
     @Override
-    public final <Z extends TableRecord<Z>> Z fetchOneInto(Table<Z> table) {
+    public final <Z extends Record> Z fetchOneInto(Table<Z> table) {
         return fetchOne().into(table);
     }
 
     @Override
-    public final <Z extends TableRecord<Z>> List<Z> fetchInto(Table<Z> table) {
+    public final <Z extends Record> List<Z> fetchInto(Table<Z> table) {
         return fetch().into(table);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Factory.java b/jOOQ/src/main/java/org/jooq/impl/Factory.java
index 58aaa3c4bb..db69fa3655 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Factory.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Factory.java
@@ -924,7 +924,7 @@ public class Factory implements FactoryOperations {
      * {@inheritDoc}
      */
     @Override
-    public final <R extends TableRecord<R>> InsertQuery<R> insertQuery(Table<R> into) {
+    public final <R extends Record> InsertQuery<R> insertQuery(Table<R> into) {
         return new InsertQueryImpl<R>(this, into);
     }
 
@@ -932,7 +932,7 @@ public class Factory implements FactoryOperations {
      * {@inheritDoc}
      */
     @Override
-    public final <R extends TableRecord<R>> InsertSetStep<R> insertInto(Table<R> into) {
+    public final <R extends Record> InsertSetStep<R> insertInto(Table<R> into) {
         return new InsertImpl<R>(this, into, Collections.<Field<?>>emptyList());
     }
 
@@ -940,7 +940,7 @@ public class Factory implements FactoryOperations {
      * {@inheritDoc}
      */
     @Override
-    public final <R extends TableRecord<R>> InsertValuesStep<R> insertInto(Table<R> into, Field<?>... fields) {
+    public final <R extends Record> InsertValuesStep<R> insertInto(Table<R> into, Field<?>... fields) {
         return new InsertImpl<R>(this, into, Arrays.asList(fields));
     }
 
@@ -948,7 +948,7 @@ public class Factory implements FactoryOperations {
      * {@inheritDoc}
      */
     @Override
-    public final <R extends TableRecord<R>> InsertValuesStep<R> insertInto(Table<R> into, Collection<? extends Field<?>> fields) {
+    public final <R extends Record> InsertValuesStep<R> insertInto(Table<R> into, Collection<? extends Field<?>> fields) {
         return new InsertImpl<R>(this, into, fields);
     }
 
@@ -956,7 +956,7 @@ public class Factory implements FactoryOperations {
      * {@inheritDoc}
      */
     @Override
-    public final <R extends TableRecord<R>> Insert<R> insertInto(Table<R> into, Select<?> select) {
+    public final <R extends Record> Insert<R> insertInto(Table<R> into, Select<?> select) {
         return new InsertSelectQueryImpl<R>(this, into, select);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java
index c5c1554415..9e4facf156 100644
--- a/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java
@@ -50,14 +50,14 @@ import org.jooq.InsertQuery;
 import org.jooq.InsertResultStep;
 import org.jooq.InsertSetMoreStep;
 import org.jooq.InsertValuesStep;
+import org.jooq.Record;
 import org.jooq.Result;
 import org.jooq.Table;
-import org.jooq.TableRecord;
 
 /**
  * @author Lukas Eder
  */
-class InsertImpl<R extends TableRecord<R>>
+class InsertImpl<R extends Record>
     extends AbstractDelegatingQueryPart<InsertQuery<R>>
     implements
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
index c7e0afc4ac..e0080df344 100644
--- a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
@@ -59,11 +59,11 @@ import org.jooq.Identity;
 import org.jooq.InsertQuery;
 import org.jooq.Merge;
 import org.jooq.QueryPart;
+import org.jooq.Record;
 import org.jooq.RenderContext;
 import org.jooq.Result;
 import org.jooq.SQLDialect;
 import org.jooq.Table;
-import org.jooq.TableRecord;
 import org.jooq.UpdatableTable;
 import org.jooq.exception.SQLDialectNotSupportedException;
 import org.jooq.util.sqlite.SQLiteFactory;
@@ -71,7 +71,7 @@ import org.jooq.util.sqlite.SQLiteFactory;
 /**
  * @author Lukas Eder
  */
-class InsertQueryImpl<R extends TableRecord<R>> extends AbstractStoreQuery<R> implements InsertQuery<R> {
+class InsertQueryImpl<R extends Record> extends AbstractStoreQuery<R> implements InsertQuery<R> {
 
     private static final long        serialVersionUID = 4466005417945353842L;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertSelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertSelectQueryImpl.java
index d8accc2190..3def0947ff 100644
--- a/jOOQ/src/main/java/org/jooq/impl/InsertSelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/InsertSelectQueryImpl.java
@@ -42,15 +42,15 @@ import org.jooq.BindContext;
 import org.jooq.Configuration;
 import org.jooq.Field;
 import org.jooq.Insert;
+import org.jooq.Record;
 import org.jooq.RenderContext;
 import org.jooq.Select;
 import org.jooq.Table;
-import org.jooq.TableRecord;
 
 /**
  * @author Lukas Eder
  */
-class InsertSelectQueryImpl<R extends TableRecord<R>> extends AbstractQuery implements Insert<R> {
+class InsertSelectQueryImpl<R extends Record> extends AbstractQuery implements Insert<R> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java
index 092f59ffd7..08a3554d7e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java
@@ -73,7 +73,6 @@ import org.jooq.RecordHandler;
 import org.jooq.Result;
 import org.jooq.Store;
 import org.jooq.Table;
-import org.jooq.TableRecord;
 import org.jooq.tools.Convert;
 import org.jooq.tools.StringUtils;
 import org.jooq.tools.json.JSONObject;
@@ -1243,7 +1242,7 @@ class ResultImpl<R extends Record> implements Result<R>, AttachableInternal {
     }
 
     @Override
-    public final <Z extends TableRecord<Z>> Result<Z> into(Table<Z> table) {
+    public final <Z extends Record> Result<Z> into(Table<Z> table) {
         Result<Z> list = new ResultImpl<Z>(getConfiguration(), table);
 
         for (R record : this) {