summaryrefslogtreecommitdiffstats
path: root/system/database/DB_query_builder.php
diff options
context:
space:
mode:
authorChristian Mohr <christian.mohr@posteo.de>2020-01-02 11:17:38 +0100
committerGitHub <noreply@github.com>2020-01-02 11:17:38 +0100
commit9494f0d758e28facc867e9bb467aa33075cce559 (patch)
tree9d71dc1b0c584cbbe155f7e61a8878768b2be28e /system/database/DB_query_builder.php
parent0db8b60492cc98ef3c85b986fc11e9dac6d7ca6c (diff)
Added FULL [OUTER] JOIN to CI_DB_query_builder
Diffstat (limited to 'system/database/DB_query_builder.php')
-rw-r--r--system/database/DB_query_builder.php2
1 files changed, 1 insertions, 1 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