From cb70397099dfbb58dd9cfcd0a223e03ff09f6fc8 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Mon, 9 Dec 2013 14:11:33 +0100
Subject: [PATCH] [#845] [#846] Add support for the T-SQL and Oracle 12c CROSS
 / OUTER APPLY clauses

---
 .../org/jooq/test/_/testcases/JoinTests.java  |  93 ++++++++++++
 .../src/org/jooq/test/jOOQAbstractTest.java   |   5 +
 jOOQ/src/main/java/org/jooq/Clause.java       |   2 +
 jOOQ/src/main/java/org/jooq/JoinType.java     |  32 +++-
 .../main/java/org/jooq/SelectJoinStep.java    | 109 ++++++++++++++
 jOOQ/src/main/java/org/jooq/Table.java        | 138 ++++++++++++++++++
 .../java/org/jooq/impl/AbstractTable.java     |  70 ++++++++-
 .../main/java/org/jooq/impl/JoinTable.java    |  10 +-
 .../main/java/org/jooq/impl/SelectImpl.java   |  49 ++++++-
 .../java/org/jooq/impl/SelectQueryImpl.java   |   9 ++
 10 files changed, 499 insertions(+), 18 deletions(-)

diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
index bcc3f4776e..f3fa26a2da 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
@@ -307,6 +307,99 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
                 .fetchOne(0, int.class));
     }
 
+    @Test
+    public void testCrossApply() throws Exception {
+        switch (dialect()) {
+            /* [pro] xx
+            xxxx xxxxxxxxxx
+            xxxx xxxxxxxxxx
+            xxxx xxxxxxxxxxxxxx
+            xxxx xxxxxxxxxxxxxx
+            xxxx xxxxxxx
+                xxxxxx
+
+            xx [/pro] */
+            default:
+                log.info("SKIPPING", "CROSS APPLY tests");
+                return;
+        }
+
+        /* [pro] xx
+        xxxxxxxxxxxxx
+            xxxxxxxxx xxx
+            xxxxxxxxxxxxxxxxx
+                    xxxxxxxxxxxxxxxx
+                    xxxxxxxxxxxx
+                        xxxxxxxxxxxxxxxxxxxxxxx
+                        xxxxxxxxxxxxxx
+                        xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                    x
+                    xxxxxxxxxxx xxxxxxxxxx
+        xx
+
+        xxxxxxxxxxxxx
+            xxxxxxxxx xxx
+            xxxxxxxxxxxxxxxxx
+                    xxxxxxxxxxxxxxxx
+                    xxxxxxxxxxxx
+                        xxxxxxxxxxxxxxxxxxxxxxx
+                        xxxxxxxxxxxxxx
+                        xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                    x
+                    xxxxxxxxxxx xxxxxxxxxx
+        xx
+
+        xxxxxxxxxxxxx
+            xxxxxxxxx xxx
+            xxxxxxxxxxxxxxxxx
+                    xxxxxxxxxxxxxxxx
+                    xxxxxx
+                        xxxxxxxxxxxxxxxxxxxxxxx
+                        xxxxxxxxxxxxxx
+                        xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                        x
+                        xxxxxxxxxxxxxxxxxxxx
+                    x
+                    xxxxxxxxxxx xxxxxxxxxx
+        xx
+
+        xxxxxxxxxxxxx
+            xxxxxxxxx xxx
+            xxxxxxxxxxxxxxxxx
+                    xxxxxxxxxxxxxxxxxxxxxxxxxxx
+                            xxxxxxxxxxxxxxxxxxxxxxx
+                            xxxxxxxxxxxxxx
+                            xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                    x
+                    xxxxxxxxxxx xxxxxxxxxx
+        xx
+
+        xxxxxxxxxxxxx
+            xxxxxxxxx xxx
+            xxxxxxxxxxxxxxxxx
+                    xxxxxxxxxxxxxxxxxxxxxxxxxxx
+                            xxxxxxxxxxxxxxxxxxxxxxx
+                            xxxxxxxxxxxxxx
+                            xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                    x
+                    xxxxxxxxxxx xxxxxxxxxx
+        xx
+
+        xxxxxxxxxxxxx
+            xxxxxxxxx xxx
+            xxxxxxxxxxxxxxxxx
+                    xxxxxxxxxxxxxxxxxxxxx
+                            xxxxxxxxxxxxxxxxxxxxxxx
+                            xxxxxxxxxxxxxx
+                            xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                            x
+                            xxxxxxxxxxxxxxxxxxxxx
+                    x
+                    xxxxxxxxxxx xxxxxxxxxx
+        xx
+        xx [/pro] */
+    }
+
     @Test
     public void testNaturalJoin() throws Exception {
         boolean unqualified = false;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index 623162fa51..dca2b1f790 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -1956,6 +1956,11 @@ public abstract class jOOQAbstractTest<
         new JoinTests(this).testCrossJoin();
     }
 
+    @Test
+    public void testCrossApply() throws Exception {
+        new JoinTests(this).testCrossApply();
+    }
+
     @Test
     public void testNaturalJoin() throws Exception {
         new JoinTests(this).testNaturalJoin();
diff --git a/jOOQ/src/main/java/org/jooq/Clause.java b/jOOQ/src/main/java/org/jooq/Clause.java
index ddd5dc2d0e..7dbdbb25e5 100644
--- a/jOOQ/src/main/java/org/jooq/Clause.java
+++ b/jOOQ/src/main/java/org/jooq/Clause.java
@@ -108,6 +108,8 @@ public enum Clause {
     TABLE_JOIN_OUTER_FULL,
     TABLE_JOIN_NATURAL_OUTER_LEFT,
     TABLE_JOIN_NATURAL_OUTER_RIGHT,
+    TABLE_JOIN_CROSS_APPLY,
+    TABLE_JOIN_OUTER_APPLY,
     TABLE_JOIN_ON,
     TABLE_JOIN_USING,
     TABLE_JOIN_PARTITION_BY,
diff --git a/jOOQ/src/main/java/org/jooq/JoinType.java b/jOOQ/src/main/java/org/jooq/JoinType.java
index bf09073016..f29f0ba184 100644
--- a/jOOQ/src/main/java/org/jooq/JoinType.java
+++ b/jOOQ/src/main/java/org/jooq/JoinType.java
@@ -41,6 +41,10 @@
 
 package org.jooq;
 
+// ...
+// ...
+// ...
+
 
 /**
  * The type of join
@@ -50,53 +54,65 @@ package org.jooq;
 public enum JoinType {
 
     /**
-     * <code>INNER JOIN</code> two tables
+     * <code>INNER JOIN</code> two tables.
      */
     @Support
     JOIN("join"),
 
     /**
-     * <code>CROSS JOIN</code> two tables
+     * <code>CROSS JOIN</code> two tables.
      */
     @Support
     CROSS_JOIN("cross join"),
 
     /**
-     * <code>LEFT OUTER JOIN</code> two tables
+     * <code>LEFT OUTER JOIN</code> two tables.
      */
     @Support
     LEFT_OUTER_JOIN("left outer join"),
 
     /**
-     * <code>RIGHT OUTER JOIN</code> two tables
+     * <code>RIGHT OUTER JOIN</code> two tables.
      */
     @Support
     RIGHT_OUTER_JOIN("right outer join"),
 
     /**
-     * <code>FULL OUTER JOIN</code> two tables
+     * <code>FULL OUTER JOIN</code> two tables.
      */
     @Support
     FULL_OUTER_JOIN("full outer join"),
 
     /**
-     * <code>NATURAL INNER JOIN</code> two tables
+     * <code>NATURAL INNER JOIN</code> two tables.
      */
     @Support
     NATURAL_JOIN("natural join"),
 
     /**
-     * <code>NATURAL LEFT OUTER JOIN</code> two tables
+     * <code>NATURAL LEFT OUTER JOIN</code> two tables.
      */
     @Support
     NATURAL_LEFT_OUTER_JOIN("natural left outer join"),
 
     /**
-     * <code>NATURAL RIGHT OUTER JOIN</code> two tables
+     * <code>NATURAL RIGHT OUTER JOIN</code> two tables.
      */
     @Support
     NATURAL_RIGHT_OUTER_JOIN("natural right outer join"),
 
+    /**
+     * <code>CROSS APPLY</code> two tables.
+     */
+    @Support({})
+    CROSS_APPLY("cross apply"),
+
+    /**
+     * <code>OUTER APPLY</code> two tables.
+     */
+    @Support({})
+    OUTER_APPLY("outer apply"),
+
     ;
 
     private final String sql;
diff --git a/jOOQ/src/main/java/org/jooq/SelectJoinStep.java b/jOOQ/src/main/java/org/jooq/SelectJoinStep.java
index 49497d6e1b..0353137fc2 100644
--- a/jOOQ/src/main/java/org/jooq/SelectJoinStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectJoinStep.java
@@ -52,6 +52,7 @@ import static org.jooq.SQLDialect.HSQLDB;
 import static org.jooq.SQLDialect.MARIADB;
 import static org.jooq.SQLDialect.MYSQL;
 // ...
+// ...
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
 // ...
@@ -658,4 +659,112 @@ public interface SelectJoinStep<R extends Record> extends SelectWhereStep<R> {
     @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
     SelectJoinStep<R> naturalRightOuterJoin(String sql, QueryPart... parts);
 
+    // -------------------------------------------------------------------------
+    // XXX: APPLY clauses on tables
+    // -------------------------------------------------------------------------
+
+    /* [pro] xx
+
+    xxx
+     x xxxxxxxxxxx xxxxxxxxxxxx x xxxxx xx xxxx xxxxxx
+     x
+     x xxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
+     xx
+    xxxxxxxxxx xxxxxxxxxx xxxxxxxxxx xxxxxx xx
+    xxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxx
+
+    xxx
+     x xxxxxxxxxxx xxxxxxxxxxxx x xxxxx xx xxxx xxxxxx
+     x xxx
+     x xxxxxxxxxxxx xxxx xxxxxxxxx xxxxx xxx xxxx xxxx xxxxxxxx xxx xxxx
+     x xxxxxxxxx xxxxxx xxxxxxxxxx xxx xxx xxxx xxxxxx xxx xxxxxxxxxxx xx
+     x xxxxxxxxx xxx xxxxxxxxxx xx xxxx xx xxxxxxxx xxx xxxx xxxxxxxxx xxxxxx
+     x xxxxxx xxxxxxxx xxxx xxxxxxxxxxxx xxxx xxx xxxxxxxx
+     x
+     x xxxx xxxxxxxxxxxxxxxxx
+     x xxxx xxxxxxxxxxxxxxxxxxxxxxxx
+     xx
+    xxxxxxxxxx xxxxxxxxxx xxxxxxxxxx xxxxxx xx
+    xxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxxx
+
+    xxx
+     x xxxxxxxxxxx xxxxxxxxxxxx x xxxxx xx xxxx xxxxxx
+     x xxx
+     x xxxxxxxxxxxx xxxx xxxxxxxxx xxxxx xxx xxxx xxxx xxxxxxxx xxx xxxx
+     x xxxxxxxxx xxxxxx xxxxxxxxxx xxx xxx xxxx xxxxxx xxx xxxxxxxxxxx xx
+     x xxxxxxxxx xxx xxxxxxxxxx xx xxxx xx xxxxxxxx xxx xxxx xxxxxxxxx xxxxxx
+     x xxxxxx xxxxxxxx xxxx xxxxxxxxxxxx xxxx xxx xxxxxxxx
+     x
+     x xxxx xxxxxxxxxxxxxxxxx xxxxxxxxxx
+     x xxxx xxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxx
+     xx
+    xxxxxxxxxx xxxxxxxxxx xxxxxxxxxx xxxxxx xx
+    xxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx xxxxxxxxx xxxxxxxxxx
+
+    xxx
+     x xxxxxxxxxxx xxxxxxxxxxxx x xxxxx xx xxxx xxxxxx
+     x xxx
+     x xxxxxxxxxxxx xxxx xxxxxxxxx xxxxx xxx xxxx xxxx xxxxxxxx xxx xxxx
+     x xxxxxxxxx xxxxxx xxxxxxxxxx xxx xxx xxxx xxxxxx xxx xxxxxxxxxxx xx
+     x xxxxxxxxx xxx xxxxxxxxxx xx xxxx xx xxxxxxxx xxx xxxx xxxxxxxxx xxxxxx
+     x xxxxxx xxxxxxxx xxxx xxxxxxxxxxxx xxxx xxx xxxxxxxx
+     x
+     x xxxx xxxxxxxxxxxxxxxxx xxxxxxxxxxxxx
+     x xxxx xxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxx
+     xx
+    xxxxxxxxxx xxxxxxxxxx xxxxxxxxxx xxxxxx xx
+    xxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx xxxxxxxxxxxx xxxxxxx
+
+    xxx
+     x xxxxxxxxxxx xxxxxxxxxxxx x xxxxx xx xxxx xxxxxx
+     x
+     x xxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
+     xx
+    xxxxxxxxxx xxxxxxxxxx xxxxxxxxxx xxxxxx xx
+    xxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxx
+
+    xxx
+     x xxxxxxxxxxx xxxxxxxxxxxx x xxxxx xx xxxx xxxxxx
+     x xxx
+     x xxxxxxxxxxxx xxxx xxxxxxxxx xxxxx xxx xxxx xxxx xxxxxxxx xxx xxxx
+     x xxxxxxxxx xxxxxx xxxxxxxxxx xxx xxx xxxx xxxxxx xxx xxxxxxxxxxx xx
+     x xxxxxxxxx xxx xxxxxxxxxx xx xxxx xx xxxxxxxx xxx xxxx xxxxxxxxx xxxxxx
+     x xxxxxx xxxxxxxx xxxx xxxxxxxxxxxx xxxx xxx xxxxxxxx
+     x
+     x xxxx xxxxxxxxxxxxxxxxx
+     x xxxx xxxxxxxxxxxxxxxxxxxxxxxx
+     xx
+    xxxxxxxxxx xxxxxxxxxx xxxxxxxxxx xxxxxx xx
+    xxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxxx
+
+    xxx
+     x xxxxxxxxxxx xxxxxxxxxxxx x xxxxx xx xxxx xxxxxx
+     x xxx
+     x xxxxxxxxxxxx xxxx xxxxxxxxx xxxxx xxx xxxx xxxx xxxxxxxx xxx xxxx
+     x xxxxxxxxx xxxxxx xxxxxxxxxx xxx xxx xxxx xxxxxx xxx xxxxxxxxxxx xx
+     x xxxxxxxxx xxx xxxxxxxxxx xx xxxx xx xxxxxxxx xxx xxxx xxxxxxxxx xxxxxx
+     x xxxxxx xxxxxxxx xxxx xxxxxxxxxxxx xxxx xxx xxxxxxxx
+     x
+     x xxxx xxxxxxxxxxxxxxxxx xxxxxxxxxx
+     x xxxx xxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxx
+     xx
+    xxxxxxxxxx xxxxxxxxxx xxxxxxxxxx xxxxxx xx
+    xxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx xxxxxxxxx xxxxxxxxxx
+
+    xxx
+     x xxxxxxxxxxx xxxxxxxxxxxx x xxxxx xx xxxx xxxxxx
+     x xxx
+     x xxxxxxxxxxxx xxxx xxxxxxxxx xxxxx xxx xxxx xxxx xxxxxxxx xxx xxxx
+     x xxxxxxxxx xxxxxx xxxxxxxxxx xxx xxx xxxx xxxxxx xxx xxxxxxxxxxx xx
+     x xxxxxxxxx xxx xxxxxxxxxx xx xxxx xx xxxxxxxx xxx xxxx xxxxxxxxx xxxxxx
+     x xxxxxx xxxxxxxx xxxx xxxxxxxxxxxx xxxx xxx xxxxxxxx
+     x
+     x xxxx xxxxxxxxxxxxxxxxx xxxxxxxxxxxxx
+     x xxxx xxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxx
+     xx
+    xxxxxxxxxx xxxxxxxxxx xxxxxxxxxx xxxxxx xx
+    xxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx xxxxxxxxxxxx xxxxxxx
+
+    xx [/pro] */
+
 }
diff --git a/jOOQ/src/main/java/org/jooq/Table.java b/jOOQ/src/main/java/org/jooq/Table.java
index 6cb43dcab5..66cdd7a96c 100644
--- a/jOOQ/src/main/java/org/jooq/Table.java
+++ b/jOOQ/src/main/java/org/jooq/Table.java
@@ -909,6 +909,144 @@ public interface Table<R extends Record> extends TableLike<R> {
     )
     Table<Record> naturalRightOuterJoin(String sql, QueryPart... parts);
 
+    // -------------------------------------------------------------------------
+    // XXX: APPLY clauses on tables
+    // -------------------------------------------------------------------------
+
+    /* [pro] xx
+
+    xxx
+     x xxxxxxxxxxx xxxxxxxxxxxx x xxxxx xx xxxx xxxxxx
+     xx
+    xxxxxxxxxx xxxxxxxxxx xxxxxxxxxx xxxxxx xx
+    xxxxxxxxxxxx
+        xxxx x xxxxxx xxxxxxx
+        xxxx x xxxxxxxx
+        xx x xxxxxxxxxxxxx
+    x
+    xxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxx
+
+    xxx
+     x xxxxxxxxxxx xxxxxxxxxxxx x xxxxx xx xxxx xxxxxx
+     x xxx
+     x xxxxxxxxxxxx xxxx xxxxxxxxx xxxxx xxx xxxx xxxx xxxxxxxx xxx xxxx
+     x xxxxxxxxx xxxxxx xxxxxxxxxx xxx xxx xxxx xxxxxx xxx xxxxxxxxxxx xx
+     x xxxxxxxxx xxx xxxxxxxxxx xx xxxx xx xxxxxxxx xxx xxxx xxxxxxxxx xxxxxx
+     x xxxxxx xxxxxxxx xxxx xxxxxxxxxxxx xxxx xxx xxxxxxxx
+     x
+     x xxxx xxxxxxxxxxxxxxxxx
+     xx
+    xxxxxxxxxx xxxxxxxxxx xxxxxxxxxx xxxxxx xx
+    xxxxxxxxxxxx
+        xxxx x xxxxxx xxxxxxx
+        xxxx x xxxxxxxx
+        xx x xxxxxxxxxxxxx
+    x
+    xxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxxx
+
+    xxx
+     x xxxxxxxxxxx xxxxxxxxxxxx x xxxxx xx xxxx xxxxxx
+     x xxx
+     x xxxxxxxxxxxx xxxx xxxxxxxxx xxxxx xxx xxxx xxxx xxxxxxxx xxx xxxx
+     x xxxxxxxxx xxxxxx xxxxxxxxxx xxx xxx xxxx xxxxxx xxx xxxxxxxxxxx xx
+     x xxxxxxxxx xxx xxxxxxxxxx xx xxxx xx xxxxxxxx xxx xxxx xxxxxxxxx xxxxxx
+     x xxxxxx xxxxxxxx xxxx xxxxxxxxxxxx xxxx xxx xxxxxxxx
+     x
+     x xxxx xxxxxxxxxxxxxxxxx xxxxxxxxxx
+     xx
+    xxxxxxxxxx xxxxxxxxxx xxxxxxxxxx xxxxxx xx
+    xxxxxxxxxxxx
+        xxxx x xxxxxx xxxxxxx
+        xxxx x xxxxxxxx
+        xx x xxxxxxxxxxxxx
+    x
+    xxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx xxxxxxxxx xxxxxxxxxx
+
+    xxx
+     x xxxxxxxxxxx xxxxxxxxxxxx x xxxxx xx xxxx xxxxxx
+     x xxx
+     x xxxxxxxxxxxx xxxx xxxxxxxxx xxxxx xxx xxxx xxxx xxxxxxxx xxx xxxx
+     x xxxxxxxxx xxxxxx xxxxxxxxxx xxx xxx xxxx xxxxxx xxx xxxxxxxxxxx xx
+     x xxxxxxxxx xxx xxxxxxxxxx xx xxxx xx xxxxxxxx xxx xxxx xxxxxxxxx xxxxxx
+     x xxxxxx xxxxxxxx xxxx xxxxxxxxxxxx xxxx xxx xxxxxxxx
+     x
+     x xxxx xxxxxxxxxxxxxxxxx xxxxxxxxxxxxx
+     xx
+    xxxxxxxxxx xxxxxxxxxx xxxxxxxxxx xxxxxx xx
+    xxxxxxxxxxxx
+        xxxx x xxxxxx xxxxxxx
+        xxxx x xxxxxxxx
+        xx x xxxxxxxxxxxxx
+    x
+    xxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx xxxxxxxxxxxx xxxxxxx
+
+    xxx
+     x xxxxxxxxxxx xxxxxxxxxxxx x xxxxx xx xxxx xxxxxx
+     xx
+    xxxxxxxxxx xxxxxxxxxx xxxxxxxxxx xxxxxx xx
+    xxxxxxxxxxxx
+        xxxx x xxxxxx xxxxxxx
+        xxxx x xxxxxxxx
+        xx x xxxxxxxxxxxxx
+    x
+    xxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxx
+
+    xxx
+     x xxxxxxxxxxx xxxxxxxxxxxx x xxxxx xx xxxx xxxxxx
+     x xxx
+     x xxxxxxxxxxxx xxxx xxxxxxxxx xxxxx xxx xxxx xxxx xxxxxxxx xxx xxxx
+     x xxxxxxxxx xxxxxx xxxxxxxxxx xxx xxx xxxx xxxxxx xxx xxxxxxxxxxx xx
+     x xxxxxxxxx xxx xxxxxxxxxx xx xxxx xx xxxxxxxx xxx xxxx xxxxxxxxx xxxxxx
+     x xxxxxx xxxxxxxx xxxx xxxxxxxxxxxx xxxx xxx xxxxxxxx
+     x
+     x xxxx xxxxxxxxxxxxxxxxx
+     xx
+    xxxxxxxxxx xxxxxxxxxx xxxxxxxxxx xxxxxx xx
+    xxxxxxxxxxxx
+        xxxx x xxxxxx xxxxxxx
+        xxxx x xxxxxxxx
+        xx x xxxxxxxxxxxxx
+    x
+    xxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxxx
+
+    xxx
+     x xxxxxxxxxxx xxxxxxxxxxxx x xxxxx xx xxxx xxxxxx
+     x xxx
+     x xxxxxxxxxxxx xxxx xxxxxxxxx xxxxx xxx xxxx xxxx xxxxxxxx xxx xxxx
+     x xxxxxxxxx xxxxxx xxxxxxxxxx xxx xxx xxxx xxxxxx xxx xxxxxxxxxxx xx
+     x xxxxxxxxx xxx xxxxxxxxxx xx xxxx xx xxxxxxxx xxx xxxx xxxxxxxxx xxxxxx
+     x xxxxxx xxxxxxxx xxxx xxxxxxxxxxxx xxxx xxx xxxxxxxx
+     x
+     x xxxx xxxxxxxxxxxxxxxxx xxxxxxxxxx
+     xx
+    xxxxxxxxxx xxxxxxxxxx xxxxxxxxxx xxxxxx xx
+    xxxxxxxxxxxx
+        xxxx x xxxxxx xxxxxxx
+        xxxx x xxxxxxxx
+        xx x xxxxxxxxxxxxx
+    x
+    xxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx xxxxxxxxx xxxxxxxxxx
+
+    xxx
+     x xxxxxxxxxxx xxxxxxxxxxxx x xxxxx xx xxxx xxxxxx
+     x xxx
+     x xxxxxxxxxxxx xxxx xxxxxxxxx xxxxx xxx xxxx xxxx xxxxxxxx xxx xxxx
+     x xxxxxxxxx xxxxxx xxxxxxxxxx xxx xxx xxxx xxxxxx xxx xxxxxxxxxxx xx
+     x xxxxxxxxx xxx xxxxxxxxxx xx xxxx xx xxxxxxxx xxx xxxx xxxxxxxxx xxxxxx
+     x xxxxxx xxxxxxxx xxxx xxxxxxxxxxxx xxxx xxx xxxxxxxx
+     x
+     x xxxx xxxxxxxxxxxxxxxxx xxxxxxxxxxxxx
+     xx
+    xxxxxxxxxx xxxxxxxxxx xxxxxxxxxx xxxxxx xx
+    xxxxxxxxxxxx
+        xxxx x xxxxxx xxxxxxx
+        xxxx x xxxxxxxx
+        xx x xxxxxxxxxxxxx
+    x
+    xxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx xxxxxxxxxxxx xxxxxxx
+
+    xx [/pro] */
+
     // -------------------------------------------------------------------------
     // XXX: Exotic and vendor-specific clauses on tables
     // -------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java b/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java
index b88288a370..b7ab5f9d66 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java
@@ -41,6 +41,16 @@
 package org.jooq.impl;
 
 import static org.jooq.Clause.TABLE;
+import static org.jooq.JoinType.CROSS_APPLY;
+import static org.jooq.JoinType.CROSS_JOIN;
+import static org.jooq.JoinType.FULL_OUTER_JOIN;
+import static org.jooq.JoinType.JOIN;
+import static org.jooq.JoinType.LEFT_OUTER_JOIN;
+import static org.jooq.JoinType.NATURAL_JOIN;
+import static org.jooq.JoinType.NATURAL_LEFT_OUTER_JOIN;
+import static org.jooq.JoinType.NATURAL_RIGHT_OUTER_JOIN;
+import static org.jooq.JoinType.OUTER_APPLY;
+import static org.jooq.JoinType.RIGHT_OUTER_JOIN;
 import static org.jooq.impl.DSL.table;
 import static org.jooq.impl.DSL.val;
 
@@ -402,7 +412,7 @@ abstract class AbstractTable<R extends Record> extends AbstractQueryPart impleme
 
     @Override
     public final TableOnStep join(TableLike<?> table) {
-        return join(table, JoinType.JOIN);
+        return join(table, JOIN);
     }
 
     @Override
@@ -422,7 +432,7 @@ abstract class AbstractTable<R extends Record> extends AbstractQueryPart impleme
 
     @Override
     public final TablePartitionByStep leftOuterJoin(TableLike<?> table) {
-        return join(table, JoinType.LEFT_OUTER_JOIN);
+        return join(table, LEFT_OUTER_JOIN);
     }
 
     @Override
@@ -442,7 +452,7 @@ abstract class AbstractTable<R extends Record> extends AbstractQueryPart impleme
 
     @Override
     public final TablePartitionByStep rightOuterJoin(TableLike<?> table) {
-        return join(table, JoinType.RIGHT_OUTER_JOIN);
+        return join(table, RIGHT_OUTER_JOIN);
     }
 
     @Override
@@ -462,7 +472,7 @@ abstract class AbstractTable<R extends Record> extends AbstractQueryPart impleme
 
     @Override
     public final TableOnStep fullOuterJoin(TableLike<?> table) {
-        return join(table, JoinType.FULL_OUTER_JOIN);
+        return join(table, FULL_OUTER_JOIN);
     }
 
     @Override
@@ -482,7 +492,7 @@ abstract class AbstractTable<R extends Record> extends AbstractQueryPart impleme
 
     @Override
     public final Table<Record> crossJoin(TableLike<?> table) {
-        return join(table, JoinType.CROSS_JOIN);
+        return join(table, CROSS_JOIN);
     }
 
     @Override
@@ -502,7 +512,7 @@ abstract class AbstractTable<R extends Record> extends AbstractQueryPart impleme
 
     @Override
     public final Table<Record> naturalJoin(TableLike<?> table) {
-        return join(table, JoinType.NATURAL_JOIN);
+        return join(table, NATURAL_JOIN);
     }
 
     @Override
@@ -522,7 +532,7 @@ abstract class AbstractTable<R extends Record> extends AbstractQueryPart impleme
 
     @Override
     public final Table<Record> naturalLeftOuterJoin(TableLike<?> table) {
-        return join(table, JoinType.NATURAL_LEFT_OUTER_JOIN);
+        return join(table, NATURAL_LEFT_OUTER_JOIN);
     }
 
     @Override
@@ -542,7 +552,7 @@ abstract class AbstractTable<R extends Record> extends AbstractQueryPart impleme
 
     @Override
     public final Table<Record> naturalRightOuterJoin(TableLike<?> table) {
-        return join(table, JoinType.NATURAL_RIGHT_OUTER_JOIN);
+        return join(table, NATURAL_RIGHT_OUTER_JOIN);
     }
 
     @Override
@@ -560,6 +570,50 @@ abstract class AbstractTable<R extends Record> extends AbstractQueryPart impleme
         return naturalRightOuterJoin(table(sql, parts));
     }
 
+    /* [pro] xx
+
+    xxxxxxxxx
+    xxxxxx xxxxx xxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxx x
+        xxxxxx xxxxxxxxxxx xxxxxxxxxxxxx
+    x
+
+    xxxxxxxxx
+    xxxxxx xxxxx xxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx x
+        xxxxxx xxxxxxxxxxxxxxxxxxxxxxx
+    x
+
+    xxxxxxxxx
+    xxxxxx xxxxx xxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx xxxxxxxxx xxxxxxxxx x
+        xxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx
+    x
+
+    xxxxxxxxx
+    xxxxxx xxxxx xxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx xxxxxxxxxxxx xxxxxx x
+        xxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxxxx
+    x
+
+    xxxxxxxxx
+    xxxxxx xxxxx xxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxx x
+        xxxxxx xxxxxxxxxxx xxxxxxxxxxxxx
+    x
+
+    xxxxxxxxx
+    xxxxxx xxxxx xxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx x
+        xxxxxx xxxxxxxxxxxxxxxxxxxxxxx
+    x
+
+    xxxxxxxxx
+    xxxxxx xxxxx xxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx xxxxxxxxx xxxxxxxxx x
+        xxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx
+    x
+
+    xxxxxxxxx
+    xxxxxx xxxxx xxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx xxxxxxxxxxxx xxxxxx x
+        xxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxxxx
+    x
+
+    xx [/pro] */
+
     // ------------------------------------------------------------------------
     // XXX: Object API
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/impl/JoinTable.java b/jOOQ/src/main/java/org/jooq/impl/JoinTable.java
index 173d0ce383..da6720dcc4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JoinTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JoinTable.java
@@ -44,22 +44,26 @@ import static java.util.Arrays.asList;
 import static org.jooq.Clause.TABLE;
 import static org.jooq.Clause.TABLE_JOIN;
 import static org.jooq.Clause.TABLE_JOIN_CROSS;
+import static org.jooq.Clause.TABLE_JOIN_CROSS_APPLY;
 import static org.jooq.Clause.TABLE_JOIN_INNER;
 import static org.jooq.Clause.TABLE_JOIN_NATURAL;
 import static org.jooq.Clause.TABLE_JOIN_NATURAL_OUTER_LEFT;
 import static org.jooq.Clause.TABLE_JOIN_NATURAL_OUTER_RIGHT;
 import static org.jooq.Clause.TABLE_JOIN_ON;
+import static org.jooq.Clause.TABLE_JOIN_OUTER_APPLY;
 import static org.jooq.Clause.TABLE_JOIN_OUTER_FULL;
 import static org.jooq.Clause.TABLE_JOIN_OUTER_LEFT;
 import static org.jooq.Clause.TABLE_JOIN_OUTER_RIGHT;
 import static org.jooq.Clause.TABLE_JOIN_PARTITION_BY;
 import static org.jooq.Clause.TABLE_JOIN_USING;
+import static org.jooq.JoinType.CROSS_APPLY;
 import static org.jooq.JoinType.CROSS_JOIN;
 import static org.jooq.JoinType.JOIN;
 import static org.jooq.JoinType.LEFT_OUTER_JOIN;
 import static org.jooq.JoinType.NATURAL_JOIN;
 import static org.jooq.JoinType.NATURAL_LEFT_OUTER_JOIN;
 import static org.jooq.JoinType.NATURAL_RIGHT_OUTER_JOIN;
+import static org.jooq.JoinType.OUTER_APPLY;
 import static org.jooq.JoinType.RIGHT_OUTER_JOIN;
 // ...
 // ...
@@ -198,7 +202,9 @@ class JoinTable extends AbstractTable<Record> implements TableOptionalOnStep, Ta
         if (!asList(CROSS_JOIN,
                     NATURAL_JOIN,
                     NATURAL_LEFT_OUTER_JOIN,
-                    NATURAL_RIGHT_OUTER_JOIN).contains(translatedType)) {
+                    NATURAL_RIGHT_OUTER_JOIN,
+                    CROSS_APPLY,
+                    OUTER_APPLY).contains(translatedType)) {
             toSQLJoinCondition(context);
         }
 
@@ -219,6 +225,8 @@ class JoinTable extends AbstractTable<Record> implements TableOptionalOnStep, Ta
             case FULL_OUTER_JOIN:          return TABLE_JOIN_OUTER_FULL;
             case NATURAL_LEFT_OUTER_JOIN:  return TABLE_JOIN_NATURAL_OUTER_LEFT;
             case NATURAL_RIGHT_OUTER_JOIN: return TABLE_JOIN_NATURAL_OUTER_RIGHT;
+            case CROSS_APPLY:              return TABLE_JOIN_CROSS_APPLY;
+            case OUTER_APPLY:              return TABLE_JOIN_OUTER_APPLY;
             default: throw new IllegalArgumentException("Bad join type: " + translatedType);
         }
     }
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
index ede7bc1b79..f33f18556a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
@@ -1975,7 +1975,9 @@ class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
             case CROSS_JOIN:
             case NATURAL_JOIN:
             case NATURAL_LEFT_OUTER_JOIN:
-            case NATURAL_RIGHT_OUTER_JOIN: {
+            case NATURAL_RIGHT_OUTER_JOIN:
+            case CROSS_APPLY:
+            case OUTER_APPLY: {
                 getQuery().addJoin(table, type);
                 joinTable = null;
                 joinPartitionBy = null;
@@ -2016,6 +2018,20 @@ class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
         return join(table, JoinType.NATURAL_RIGHT_OUTER_JOIN);
     }
 
+    /* [pro] xx
+
+    xxxxxxxxx
+    xxxxxx xxxxx xxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxx x
+        xxxxxx xxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx
+    x
+
+    xxxxxxxxx
+    xxxxxx xxxxx xxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxx x
+        xxxxxx xxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx
+    x
+
+    xx [/pro] */
+
     @Override
     public final SelectImpl join(String sql) {
         return join(table(sql));
@@ -2137,6 +2153,37 @@ class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
     }
 
     /* [pro] xx
+
+    xxxxxxxxx
+    xxxxxx xxxxx xxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx x
+        xxxxxx xxxxxxxxxxxxxxxxxxxxxxx
+    x
+
+    xxxxxxxxx
+    xxxxxx xxxxx xxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx xxxxxxxxx xxxxxxxxx x
+        xxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx
+    x
+
+    xxxxxxxxx
+    xxxxxx xxxxx xxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx xxxxxxxxxxxx xxxxxx x
+        xxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxxxx
+    x
+
+    xxxxxxxxx
+    xxxxxx xxxxx xxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx x
+        xxxxxx xxxxxxxxxxxxxxxxxxxxxxx
+    x
+
+    xxxxxxxxx
+    xxxxxx xxxxx xxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx xxxxxxxxx xxxxxxxxx x
+        xxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx
+    x
+
+    xxxxxxxxx
+    xxxxxx xxxxx xxxxxxxxxx xxxxxxxxxxxxxxxxx xxxx xxxxxxxxxxxx xxxxxx x
+        xxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxxxx
+    x
+
     xxxxxxxxx
     xxxxxx xxxxx xxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxx x
         xxxxxxxxxxxxxxx x xxxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index f5ad79ba86..fda345b747 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -1318,6 +1318,15 @@ class SelectQueryImpl<R extends Record> extends AbstractSelect<R> implements Sel
             case NATURAL_RIGHT_OUTER_JOIN:
                 joined = getFrom().get(index).naturalRightOuterJoin(table);
                 break;
+
+            /* [pro] xx
+            xxxx xxxxxxxxxxxx
+                xxxxxx x xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                xxxxxx
+            xxxx xxxxxxxxxxxx
+                xxxxxx x xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                xxxxxx
+            xx [/pro] */
         }
 
         getFrom().set(index, joined);