diff options
| author | Andrey Andreev <narf@devilix.net> | 2020-01-27 18:32:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-27 18:32:24 +0100 |
| commit | ecc8d4f89dd13a222fa681b19af5f1a07466f290 (patch) | |
| tree | ff968be1ebe221111fd3ca3a96d3486853a936fd | |
| parent | b977b2d860f84d6e3619174420848ca3c854c5ed (diff) | |
| parent | e19e0ee4e541f3084fb2f1ce0e8d2afc7ea4508a (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.php | 2 | ||||
| -rw-r--r-- | 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 78e8018c7..357a2e359 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -526,7 +526,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { public function join($table, $cond, $type = '', $escape = NULL) { $type = trim(strtoupper($type).' JOIN'); - preg_match('#^(NATURAL\s+)?((LEFT|RIGHT)\s+)?((INNER|OUTER)\s+)?JOIN$#', $type) OR $type = 'JOIN'; + preg_match('#^(NATURAL\s+)?((LEFT|RIGHT|FULL)\s+)?((INNER|OUTER)\s+)?JOIN$#', $type) OR $type = 'JOIN'; // Extract any aliases that might exist. We use this information // in the protect_identifiers to know whether to add a table prefix diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst index 3bc9ad8fb..a085de293 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. :: |