From c4de896905b995eb9a82dab7de15451d8624bc49 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 27 Jan 2020 19:32:24 +0200 Subject: [ci skip] Merge pull request #5881 from InSitu-Software/query_builder_full_join Added FULL OUTER JOIN to QueryBuilder --- system/database/DB_query_builder.php | 2 +- user_guide_src/source/database/query_builder.rst | 2 +- 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. :: -- cgit v1.2.3-24-g4f1b