Merge a79fbe4 into 164a104

zendframework · Jan 21, 2019 · 3f6db21 · 3f6db21
2 parents 164a104 + a79fbe4
commit 3f6db21
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/docs/book/sql.md b/docs/book/sql.md
@@ -117,6 +117,7 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
 {
     const JOIN_INNER = 'inner';
     const JOIN_OUTER = 'outer';
+    const JOIN_FULL_OUTER = 'full outer';
     const JOIN_LEFT = 'left';
     const JOIN_RIGHT = 'right';
     const SQL_STAR = '*';
@@ -180,7 +181,7 @@ $select->join(
     'foo',              // table name
     'id = bar.id',      // expression to join on (will be quoted by platform object before insertion),
     ['bar', 'baz'],     // (optional) list of columns, same requirements as columns() above
-    $select::JOIN_OUTER // (optional), one of inner, outer, left, right also represented by constants in the API
+    $select::JOIN_OUTER // (optional), one of inner, outer, full outer, left, right also represented by constants in the API
 );
 
 $select

diff --git a/src/Sql/Join.php b/src/Sql/Join.php
@@ -26,6 +26,7 @@ class Join implements Iterator, Countable
 {
     const JOIN_INNER       = 'inner';
     const JOIN_OUTER       = 'outer';
+    const JOIN_FULL_OUTER  = 'full outer';
     const JOIN_LEFT        = 'left';
     const JOIN_RIGHT       = 'right';
     const JOIN_RIGHT_OUTER = 'right outer';