diff --git a/jOOQ/src/main/java/org/jooq/AggregateFilterStep.java b/jOOQ/src/main/java/org/jooq/AggregateFilterStep.java
index ad333d882f..3884aa525c 100644
--- a/jOOQ/src/main/java/org/jooq/AggregateFilterStep.java
+++ b/jOOQ/src/main/java/org/jooq/AggregateFilterStep.java
@@ -125,6 +125,7 @@ public interface AggregateFilterStep<T> extends WindowBeforeOverStep<T> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -140,6 +141,7 @@ public interface AggregateFilterStep<T> extends WindowBeforeOverStep<T> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
diff --git a/jOOQ/src/main/java/org/jooq/Condition.java b/jOOQ/src/main/java/org/jooq/Condition.java
index 7b14d286d9..e1e689fbb4 100644
--- a/jOOQ/src/main/java/org/jooq/Condition.java
+++ b/jOOQ/src/main/java/org/jooq/Condition.java
@@ -137,6 +137,7 @@ public interface Condition extends QueryPart {
      * @param bindings The bindings
      * @return The combined condition
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -158,6 +159,7 @@ public interface Condition extends QueryPart {
      *            {numbered placeholder} locations
      * @return The combined condition
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
@@ -308,6 +310,7 @@ public interface Condition extends QueryPart {
      * @param bindings The bindings
      * @return The combined condition
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -329,6 +332,7 @@ public interface Condition extends QueryPart {
      *            {numbered placeholder} locations
      * @return The combined condition
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
diff --git a/jOOQ/src/main/java/org/jooq/CreateIndexWhereStep.java b/jOOQ/src/main/java/org/jooq/CreateIndexWhereStep.java
index cd32bc53f6..64c7d27b9d 100644
--- a/jOOQ/src/main/java/org/jooq/CreateIndexWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateIndexWhereStep.java
@@ -131,6 +131,8 @@ public interface CreateIndexWhereStep extends CreateIndexFinalStep {
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java
index 3e32e36e13..b3ddb687f4 100644
--- a/jOOQ/src/main/java/org/jooq/DSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/DSLContext.java
@@ -632,6 +632,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @param bindings The bindings
      * @return A query wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -663,6 +664,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      *            {numbered placeholder} locations
      * @return A query wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -747,6 +749,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @return The results from the executed query. This will never be <code>null</code>.
      * @throws DataAccessException if something went wrong executing the query
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -780,6 +783,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      *         <code>null</code>.
      * @throws DataAccessException if something went wrong executing the query
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -880,6 +884,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @return The cursor. This will never be <code>null</code>.
      * @throws DataAccessException if something went wrong executing the query
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -918,6 +923,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @return The cursor. This will never be <code>null</code>.
      * @throws DataAccessException if something went wrong executing the query
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -1014,6 +1020,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @return The completion stage. The completed result will never be
      *         <code>null</code>.
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -1050,6 +1057,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @return The completion stage. The completed result will never be
      *         <code>null</code>.
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -1135,6 +1143,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @return The completion stage. The completed result will never be
      *         <code>null</code>.
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -1168,6 +1177,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @return The completion stage. The completed result will never be
      *         <code>null</code>.
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -1274,6 +1284,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      *         {@link ResultSet}
      * @throws DataAccessException if something went wrong executing the query
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -1314,6 +1325,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      *         {@link ResultSet}
      * @throws DataAccessException if something went wrong executing the query
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -1388,6 +1400,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @return The results. This will never be <code>null</code>.
      * @throws DataAccessException if something went wrong executing the query
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -1421,6 +1434,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @return The results. This will never be <code>null</code>.
      * @throws DataAccessException if something went wrong executing the query
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -1506,6 +1520,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @throws DataAccessException if something went wrong executing the query
      * @throws TooManyRowsException if the query returned more than one record
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -1539,6 +1554,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @throws DataAccessException if something went wrong executing the query
      * @throws TooManyRowsException if the query returned more than one record
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -1625,6 +1641,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @throws DataAccessException if something went wrong executing the query
      * @throws TooManyRowsException if the query returned more than one record
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -1658,6 +1675,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @throws DataAccessException if something went wrong executing the query
      * @throws TooManyRowsException if the query returned more than one record
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -1750,6 +1768,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @throws InvalidResultException if the query returned a record with more
      *             than one value
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -1785,6 +1804,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @throws InvalidResultException if the query returned a record with more
      *             than one value
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -1877,6 +1897,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @throws InvalidResultException if the query returned a record with more
      *             than one value
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -1912,6 +1933,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @throws InvalidResultException if the query returned a record with more
      *             than one value
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -1995,6 +2017,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @return The values. This will never be <code>null</code>.
      * @throws DataAccessException if something went wrong executing the query
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -2027,6 +2050,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @return The values. This will never be <code>null</code>.
      * @throws DataAccessException if something went wrong executing the query
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -2082,6 +2106,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @return The results from the executed query
      * @throws DataAccessException if something went wrong executing the query
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -2114,6 +2139,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @return The results from the executed query
      * @throws DataAccessException if something went wrong executing the query
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -2254,6 +2280,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * @param bindings The bindings
      * @return A query wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -2285,6 +2312,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      *            {numbered placeholder} locations
      * @return A query wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
diff --git a/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java b/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
index 639f766cf8..eddeabb146 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
@@ -128,6 +128,7 @@ public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -144,6 +145,7 @@ public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
@@ -262,6 +264,7 @@ public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -278,6 +281,7 @@ public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
diff --git a/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java b/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
index 94615ae159..8089742529 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
@@ -132,6 +132,7 @@ public interface DeleteWhereStep<R extends Record> extends DeleteFinalStep<R>, D
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -147,6 +148,7 @@ public interface DeleteWhereStep<R extends Record> extends DeleteFinalStep<R>, D
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
diff --git a/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java b/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java
index 425e8f976c..8682992c19 100644
--- a/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java
@@ -120,6 +120,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -136,6 +137,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
@@ -255,6 +257,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -271,6 +274,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
diff --git a/jOOQ/src/main/java/org/jooq/DivideByOnStep.java b/jOOQ/src/main/java/org/jooq/DivideByOnStep.java
index 01abe3c826..b9b9f1c7b8 100644
--- a/jOOQ/src/main/java/org/jooq/DivideByOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/DivideByOnStep.java
@@ -115,6 +115,7 @@ public interface DivideByOnStep {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -130,6 +131,7 @@ public interface DivideByOnStep {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
diff --git a/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java b/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java
index c10780777a..adf474bd0d 100644
--- a/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java
@@ -142,6 +142,7 @@ public interface MergeOnConditionStep<R extends Record> extends MergeMatchedStep
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support({ CUBRID, FIREBIRD_3_0, HSQLDB })
@@ -158,6 +159,7 @@ public interface MergeOnConditionStep<R extends Record> extends MergeMatchedStep
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support({ CUBRID, FIREBIRD_3_0, HSQLDB })
@@ -278,6 +280,7 @@ public interface MergeOnConditionStep<R extends Record> extends MergeMatchedStep
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support({ CUBRID, FIREBIRD_3_0, HSQLDB })
@@ -294,6 +297,7 @@ public interface MergeOnConditionStep<R extends Record> extends MergeMatchedStep
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support({ CUBRID, FIREBIRD_3_0, HSQLDB })
diff --git a/jOOQ/src/main/java/org/jooq/MergeOnStep.java b/jOOQ/src/main/java/org/jooq/MergeOnStep.java
index 412f48bd98..043d2bcf12 100644
--- a/jOOQ/src/main/java/org/jooq/MergeOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeOnStep.java
@@ -137,6 +137,7 @@ public interface MergeOnStep<R extends Record> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support({ CUBRID, FIREBIRD_3_0, HSQLDB })
@@ -152,6 +153,7 @@ public interface MergeOnStep<R extends Record> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support({ CUBRID, FIREBIRD_3_0, HSQLDB })
diff --git a/jOOQ/src/main/java/org/jooq/SelectConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectConditionStep.java
index 97882b78d6..082d2c8c04 100644
--- a/jOOQ/src/main/java/org/jooq/SelectConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectConditionStep.java
@@ -158,6 +158,7 @@ public interface SelectConditionStep<R extends Record> extends SelectConnectBySt
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -174,6 +175,7 @@ public interface SelectConditionStep<R extends Record> extends SelectConnectBySt
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
@@ -294,6 +296,7 @@ public interface SelectConditionStep<R extends Record> extends SelectConnectBySt
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -310,6 +313,7 @@ public interface SelectConditionStep<R extends Record> extends SelectConnectBySt
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
diff --git a/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java
index eb07c59655..e2895dcfb7 100644
--- a/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java
@@ -160,6 +160,7 @@ public interface SelectConnectByConditionStep<R extends Record> extends SelectSt
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support({ CUBRID })
@@ -176,6 +177,7 @@ public interface SelectConnectByConditionStep<R extends Record> extends SelectSt
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support({ CUBRID })
diff --git a/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java b/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java
index ec321dab29..5026644989 100644
--- a/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java
@@ -155,6 +155,7 @@ public interface SelectConnectByStep<R extends Record> extends SelectGroupByStep
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support({ CUBRID })
@@ -170,6 +171,7 @@ public interface SelectConnectByStep<R extends Record> extends SelectGroupByStep
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support({ CUBRID })
@@ -247,6 +249,7 @@ public interface SelectConnectByStep<R extends Record> extends SelectGroupByStep
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support({ CUBRID })
@@ -263,6 +266,7 @@ public interface SelectConnectByStep<R extends Record> extends SelectGroupByStep
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support({ CUBRID })
diff --git a/jOOQ/src/main/java/org/jooq/SelectFromStep.java b/jOOQ/src/main/java/org/jooq/SelectFromStep.java
index 2ca55d5984..ed967177aa 100644
--- a/jOOQ/src/main/java/org/jooq/SelectFromStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectFromStep.java
@@ -145,6 +145,7 @@ public interface SelectFromStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -160,6 +161,7 @@ public interface SelectFromStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
diff --git a/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java
index c34bbed114..439b3d0984 100644
--- a/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java
@@ -158,6 +158,7 @@ public interface SelectHavingConditionStep<R extends Record> extends SelectWindo
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -174,6 +175,7 @@ public interface SelectHavingConditionStep<R extends Record> extends SelectWindo
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
@@ -294,6 +296,7 @@ public interface SelectHavingConditionStep<R extends Record> extends SelectWindo
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -310,6 +313,7 @@ public interface SelectHavingConditionStep<R extends Record> extends SelectWindo
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
diff --git a/jOOQ/src/main/java/org/jooq/SelectHavingStep.java b/jOOQ/src/main/java/org/jooq/SelectHavingStep.java
index d48bbc413c..994cb3d2cc 100644
--- a/jOOQ/src/main/java/org/jooq/SelectHavingStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectHavingStep.java
@@ -161,6 +161,7 @@ public interface SelectHavingStep<R extends Record> extends SelectWindowStep<R>
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -176,6 +177,7 @@ public interface SelectHavingStep<R extends Record> extends SelectWindowStep<R>
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
diff --git a/jOOQ/src/main/java/org/jooq/SelectJoinStep.java b/jOOQ/src/main/java/org/jooq/SelectJoinStep.java
index 993efa322b..e676666365 100644
--- a/jOOQ/src/main/java/org/jooq/SelectJoinStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectJoinStep.java
@@ -185,6 +185,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see Table#join(String, Object...)
      * @see #innerJoin(String, Object...)
      * @see SQL
@@ -206,6 +207,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see Table#join(String, QueryPart...)
      * @see #innerJoin(String, QueryPart...)
      * @see SQL
@@ -283,6 +285,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see Table#innerJoin(String, Object...)
      * @see SQL
      */
@@ -301,6 +304,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see Table#innerJoin(String, QueryPart...)
      * @see SQL
      */
@@ -404,6 +408,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see Table#crossJoin(String, Object...)
      * @see SQL
      */
@@ -429,6 +434,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see Table#crossJoin(String, QueryPart...)
      * @see SQL
      */
@@ -522,6 +528,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see Table#leftOuterJoin(String, Object...)
      * @see #leftOuterJoin(String, Object...)
      * @see SQL
@@ -543,6 +550,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see Table#leftOuterJoin(String, QueryPart...)
      * @see #leftOuterJoin(String, QueryPart...)
      * @see SQL
@@ -622,6 +630,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see Table#leftOuterJoin(String, Object...)
      * @see SQL
      */
@@ -640,6 +649,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see Table#leftOuterJoin(String, QueryPart...)
      * @see SQL
      */
@@ -734,6 +744,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see Table#rightOuterJoin(String, Object...)
      * @see #rightOuterJoin(String, Object...)
      * @see SQL
@@ -757,6 +768,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see Table#rightOuterJoin(String, QueryPart...)
      * @see #rightOuterJoin(String, QueryPart...)
      * @see SQL
@@ -846,6 +858,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see Table#rightOuterJoin(String, Object...)
      * @see SQL
      */
@@ -866,6 +879,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see Table#rightOuterJoin(String, QueryPart...)
      * @see SQL
      */
@@ -951,6 +965,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see Table#fullOuterJoin(String, Object...)
      * @see SQL
      */
@@ -971,6 +986,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see Table#fullOuterJoin(String, QueryPart...)
      * @see SQL
      */
@@ -1060,6 +1076,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see Table#naturalJoin(String, Object...)
      * @see SQL
      */
@@ -1081,6 +1098,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see Table#naturalJoin(String, QueryPart...)
      * @see SQL
      */
@@ -1171,6 +1189,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see Table#naturalLeftOuterJoin(String, Object...)
      * @see SQL
      */
@@ -1192,6 +1211,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see Table#naturalLeftOuterJoin(String, QueryPart...)
      * @see SQL
      */
@@ -1282,6 +1302,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see Table#naturalRightOuterJoin(String, Object...)
      * @see SQL
      */
@@ -1303,6 +1324,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see Table#naturalRightOuterJoin(String, QueryPart...)
      * @see SQL
      */
@@ -1427,6 +1449,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see Table#crossApply(String, Object...)
      * @see SQL
      */
@@ -1443,6 +1466,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see Table#crossApply(String, QueryPart...)
      * @see SQL
      */
@@ -1508,6 +1532,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see Table#outerApply(String, Object...)
      * @see SQL
      */
@@ -1524,6 +1549,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see Table#outerApply(String, QueryPart...)
      * @see SQL
      */
@@ -1587,6 +1613,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see Table#straightJoin(String, Object...)
      */
     @Support({ MYSQL })
@@ -1602,6 +1629,7 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see Table#straightJoin(String, QueryPart...)
      */
     @Support({ MYSQL })
diff --git a/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java
index c741819a03..675142aaa6 100644
--- a/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java
@@ -158,6 +158,7 @@ public interface SelectOnConditionStep<R extends Record> extends SelectJoinStep<
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -174,6 +175,7 @@ public interface SelectOnConditionStep<R extends Record> extends SelectJoinStep<
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
@@ -294,6 +296,7 @@ public interface SelectOnConditionStep<R extends Record> extends SelectJoinStep<
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -310,6 +313,7 @@ public interface SelectOnConditionStep<R extends Record> extends SelectJoinStep<
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
diff --git a/jOOQ/src/main/java/org/jooq/SelectOnStep.java b/jOOQ/src/main/java/org/jooq/SelectOnStep.java
index 01ebe6644a..50cc9c8154 100644
--- a/jOOQ/src/main/java/org/jooq/SelectOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectOnStep.java
@@ -155,6 +155,7 @@ public interface SelectOnStep<R extends Record> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -170,6 +171,7 @@ public interface SelectOnStep<R extends Record> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
diff --git a/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java b/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java
index ead894ad8e..d4fa738c66 100644
--- a/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java
@@ -161,6 +161,7 @@ public interface SelectStartWithStep<R extends Record> extends SelectGroupByStep
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support({ CUBRID })
@@ -177,6 +178,7 @@ public interface SelectStartWithStep<R extends Record> extends SelectGroupByStep
      * escape literals when concatenated into SQL clauses! *
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support({ CUBRID })
diff --git a/jOOQ/src/main/java/org/jooq/SelectWhereStep.java b/jOOQ/src/main/java/org/jooq/SelectWhereStep.java
index 311c33ffdc..9ac60be353 100644
--- a/jOOQ/src/main/java/org/jooq/SelectWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectWhereStep.java
@@ -161,6 +161,7 @@ public interface SelectWhereStep<R extends Record> extends SelectConnectByStep<R
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -176,6 +177,7 @@ public interface SelectWhereStep<R extends Record> extends SelectConnectByStep<R
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
diff --git a/jOOQ/src/main/java/org/jooq/Table.java b/jOOQ/src/main/java/org/jooq/Table.java
index f70a994aa9..dabe655714 100644
--- a/jOOQ/src/main/java/org/jooq/Table.java
+++ b/jOOQ/src/main/java/org/jooq/Table.java
@@ -487,6 +487,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see #innerJoin(String, Object...)
      * @see SQL
      */
@@ -505,6 +506,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see #innerJoin(String, QueryPart...)
      * @see SQL
      */
@@ -569,6 +571,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -584,6 +587,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
@@ -655,6 +659,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see #leftOuterJoin(String, Object...)
      * @see SQL
      */
@@ -673,6 +678,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see #leftOuterJoin(String, QueryPart...)
      * @see SQL
      */
@@ -736,6 +742,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -751,6 +758,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
@@ -831,6 +839,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see #rightOuterJoin(String, Object...)
      * @see SQL
      */
@@ -851,6 +860,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see #rightOuterJoin(String, QueryPart...)
      * @see SQL
      */
@@ -924,6 +934,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
@@ -941,6 +952,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
@@ -1010,6 +1022,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support({ FIREBIRD, HSQLDB, POSTGRES })
@@ -1027,6 +1040,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support({ FIREBIRD, HSQLDB, POSTGRES })
@@ -1116,6 +1130,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
@@ -1138,6 +1153,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
@@ -1216,6 +1232,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -1245,6 +1262,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
@@ -1308,6 +1326,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -1326,6 +1345,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
@@ -1401,6 +1421,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
@@ -1419,6 +1440,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
@@ -1485,6 +1507,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support({ POSTGRES_9_3 })
@@ -1500,6 +1523,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support({ POSTGRES_9_3 })
@@ -1559,6 +1583,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support({ POSTGRES_9_3 })
@@ -1574,6 +1599,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support({ POSTGRES_9_3 })
@@ -1633,6 +1659,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support({ MYSQL })
@@ -1648,6 +1675,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support({ MYSQL })
diff --git a/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java b/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java
index 6a1a012449..03ca3a2603 100644
--- a/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java
@@ -124,6 +124,7 @@ public interface TableOnConditionStep<R extends Record> extends Table<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -140,6 +141,7 @@ public interface TableOnConditionStep<R extends Record> extends Table<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
@@ -260,6 +262,7 @@ public interface TableOnConditionStep<R extends Record> extends Table<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -276,6 +279,7 @@ public interface TableOnConditionStep<R extends Record> extends Table<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
diff --git a/jOOQ/src/main/java/org/jooq/TableOnStep.java b/jOOQ/src/main/java/org/jooq/TableOnStep.java
index 71bb9c4725..ebe1655cba 100644
--- a/jOOQ/src/main/java/org/jooq/TableOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/TableOnStep.java
@@ -121,6 +121,7 @@ public interface TableOnStep<R extends Record> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -136,6 +137,7 @@ public interface TableOnStep<R extends Record> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
diff --git a/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java b/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
index 2653438796..58b3139042 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
@@ -131,6 +131,7 @@ public interface UpdateConditionStep<R extends Record> extends UpdateFinalStep<R
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -147,6 +148,7 @@ public interface UpdateConditionStep<R extends Record> extends UpdateFinalStep<R
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
@@ -267,6 +269,7 @@ public interface UpdateConditionStep<R extends Record> extends UpdateFinalStep<R
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -283,6 +286,7 @@ public interface UpdateConditionStep<R extends Record> extends UpdateFinalStep<R
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
diff --git a/jOOQ/src/main/java/org/jooq/UpdateFromStep.java b/jOOQ/src/main/java/org/jooq/UpdateFromStep.java
index a6f5fc83ca..2452af75bf 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateFromStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateFromStep.java
@@ -124,6 +124,7 @@ public interface UpdateFromStep<R extends Record> extends UpdateWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support({ POSTGRES })
@@ -139,6 +140,7 @@ public interface UpdateFromStep<R extends Record> extends UpdateWhereStep<R> {
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#table(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support({ POSTGRES })
diff --git a/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java b/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
index 930d1d39f5..1c1cca4711 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
@@ -134,6 +134,7 @@ public interface UpdateWhereStep<R extends Record> extends UpdateFinalStep<R>, U
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, Object...)
+     * @see DSL#sql(String, Object...)
      * @see SQL
      */
     @Support
@@ -149,6 +150,7 @@ public interface UpdateWhereStep<R extends Record> extends UpdateFinalStep<R>, U
      * escape literals when concatenated into SQL clauses!
      *
      * @see DSL#condition(String, QueryPart...)
+     * @see DSL#sql(String, QueryPart...)
      * @see SQL
      */
     @Support
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index eb8ecee90c..156ad6d153 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -7501,6 +7501,17 @@ public class DSL {
      * contain user-defined plain SQL, because sometimes it is easier to express
      * things directly in SQL.
      * <p>
+     * This overload takes a set of {@link QueryPart} arguments which are
+     * replaced into the SQL string template at the appropriate index. Example:
+     * <p>
+     * <code><pre>
+     * // Argument QueryParts are replaced into the SQL string at the appropriate index
+     * sql("select {0}, {1} from {2}", TABLE.COL1, TABLE.COL2, TABLE);
+     *
+     * // Bind variables are supported as well, for backwards compatibility
+     * sql("select col1, col2 from table where col1 = ?", val(1));
+     * </pre></code>
+     * <p>
      * <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
      * guarantee syntax integrity. You may also create the possibility of
      * malicious SQL injection. Be sure to properly use bind variables and/or
@@ -7512,6 +7523,7 @@ public class DSL {
      *            {numbered placeholder} locations
      * @return A query part wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -7527,6 +7539,13 @@ public class DSL {
      * things directly in SQL. There must be as many binding variables contained
      * in the SQL, as passed in the bindings parameter
      * <p>
+     * This overload takes a set of bind value arguments which are replaced our
+     * bound into the SQL string template at the appropriate index. Example:
+     * <p>
+     * <code><pre>
+     * sql("select col1, col2 from table where col1 = ?", 1);
+     * </pre></code>
+     * <p>
      * <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
      * guarantee syntax integrity. You may also create the possibility of
      * malicious SQL injection. Be sure to properly use bind variables and/or
@@ -7535,6 +7554,7 @@ public class DSL {
      * @param sql The SQL
      * @return A query part wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -7585,6 +7605,7 @@ public class DSL {
      * @return A query part wrapping the plain SQL
      * @deprecated - 3.6.0 - [#3854] - Use {@link #sql(String, QueryPart...)} instead
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Deprecated
     @Support
@@ -7610,6 +7631,7 @@ public class DSL {
      * @return A query part wrapping the plain SQL
      * @deprecated - 3.6.0 - [#3854] - Use {@link #sql(String, Object...)} instead
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Deprecated
     @Support
@@ -7688,6 +7710,7 @@ public class DSL {
      * @param bindings The bindings
      * @return A query wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -7721,6 +7744,7 @@ public class DSL {
      *            {numbered placeholder} locations
      * @return A query wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -7867,6 +7891,7 @@ public class DSL {
      * @param bindings The bindings
      * @return A query wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -7900,6 +7925,7 @@ public class DSL {
      *            {numbered placeholder} locations
      * @return A query wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -7987,6 +8013,7 @@ public class DSL {
      * @param sql The SQL
      * @return A table wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -8019,6 +8046,7 @@ public class DSL {
      *            {numbered placeholder} locations
      * @return A table wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -8163,6 +8191,7 @@ public class DSL {
      * @param bindings The bindings for the field
      * @return A field wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -8254,6 +8283,7 @@ public class DSL {
      * @param bindings The bindings for the field
      * @return A field wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -8345,6 +8375,7 @@ public class DSL {
      * @param bindings The bindings for the field
      * @return A field wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -8381,6 +8412,7 @@ public class DSL {
      *            {numbered placeholder} locations
      * @return A field wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -8417,6 +8449,7 @@ public class DSL {
      *            {numbered placeholder} locations
      * @return A field wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -8454,6 +8487,7 @@ public class DSL {
      *            {numbered placeholder} locations
      * @return A field wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL
@@ -8598,6 +8632,7 @@ public class DSL {
      * @param bindings The bindings
      * @return A condition wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, Object...)
      */
     @Support
     @PlainSQL
@@ -8629,6 +8664,7 @@ public class DSL {
      *            {numbered placeholder} locations
      * @return A condition wrapping the plain SQL
      * @see SQL
+     * @see DSL#sql(String, QueryPart...)
      */
     @Support
     @PlainSQL