summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2020-01-27 18:32:24 +0100
committerAndrey Andreev <narf@devilix.net>2020-01-27 18:35:14 +0100
commitc4de896905b995eb9a82dab7de15451d8624bc49 (patch)
treec9c87a9a615d776abfbcbb811ac90c63a6195dd9
parent4d02ba7028608dfad42db7c56a047196c0ff2b17 (diff)
[ci skip] Merge pull request #5881 from InSitu-Software/query_builder_full_join
Added FULL OUTER JOIN to QueryBuilder
-rw-r--r--system/database/DB_query_builder.php2
-rw-r--r--user_guide_src/source/database/query_builder.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index b1b76e46b..6f64c62ae 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -529,7 +529,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
{
$type = strtoupper(trim($type));
- if ( ! in_array($type, array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER'), TRUE))
+ if ( ! in_array($type, array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER', 'FULL OUTER', 'FULL'), TRUE))
{
$type = '';
}
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 3c72218cd..83721c8b5 100644
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -199,7 +199,7 @@ query.
If you need a specific type of JOIN you can specify it via the third
parameter of the function. Options are: left, right, outer, inner, left
-outer, and right outer.
+outer, right outer and full outer.
::