Added support for OUTER as an optional keyword in joins.

phpmyadmin · Sep 30, 2015 · 5e3db35 · 5e3db35
1 parent 6b860d2
commit 5e3db35
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 10 deletions.
diff --git a/src/Components/JoinKeyword.php b/src/Components/JoinKeyword.php
@@ -35,7 +35,9 @@ class JoinKeyword extends Component
         'INNER JOIN'                    => 'INNER',
         'JOIN'                          => 'JOIN',
         'LEFT JOIN'                     => 'LEFT',
+        'LEFT OUTER JOIN'               => 'LEFT',
         'RIGHT JOIN'                    => 'RIGHT',
+        'RIGHT OUTER JOIN'              => 'RIGHT',
     );
 
     /**

diff --git a/src/Contexts/ContextMySql50000.php b/src/Contexts/ContextMySql50000.php
@@ -155,8 +155,8 @@ class ContextMySql50000 extends Context
         'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7,
         'DATA DIRECTORY' => 7,
         'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7,
-        'SUBPARTITION BY' => 7,
-        'GENERATED ALWAYS' => 7,
+        'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
+        'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
         'START TRANSACTION' => 7,
         'SELECT TRANSACTION' => 7,
         'DEFAULT CHARACTER SET' => 7,

diff --git a/src/Contexts/ContextMySql50100.php b/src/Contexts/ContextMySql50100.php
@@ -168,8 +168,8 @@ class ContextMySql50100 extends Context
         'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7,
         'DATA DIRECTORY' => 7,
         'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7,
-        'SUBPARTITION BY' => 7,
-        'GENERATED ALWAYS' => 7,
+        'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
+        'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
         'START TRANSACTION' => 7,
         'SELECT TRANSACTION' => 7,
         'DEFAULT CHARACTER SET' => 7,

diff --git a/src/Contexts/ContextMySql50500.php b/src/Contexts/ContextMySql50500.php
@@ -173,8 +173,8 @@ class ContextMySql50500 extends Context
         'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7,
         'DATA DIRECTORY' => 7,
         'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7,
-        'SUBPARTITION BY' => 7,
-        'GENERATED ALWAYS' => 7,
+        'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
+        'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
         'START TRANSACTION' => 7,
         'SELECT TRANSACTION' => 7,
         'DEFAULT CHARACTER SET' => 7,

diff --git a/src/Contexts/ContextMySql50600.php b/src/Contexts/ContextMySql50600.php
@@ -178,8 +178,8 @@ class ContextMySql50600 extends Context
         'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7,
         'DATA DIRECTORY' => 7,
         'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7,
-        'SUBPARTITION BY' => 7,
-        'GENERATED ALWAYS' => 7,
+        'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
+        'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
         'START TRANSACTION' => 7,
         'SELECT TRANSACTION' => 7,
         'DEFAULT CHARACTER SET' => 7,

diff --git a/src/Contexts/ContextMySql50700.php b/src/Contexts/ContextMySql50700.php
@@ -186,8 +186,8 @@ class ContextMySql50700 extends Context
         'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7,
         'DATA DIRECTORY' => 7,
         'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'INDEX DIRECTORY' => 7,
-        'SUBPARTITION BY' => 7,
-        'GENERATED ALWAYS' => 7,
+        'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
+        'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
         'START TRANSACTION' => 7,
         'SELECT TRANSACTION' => 7,
         'DEFAULT CHARACTER SET' => 7,

diff --git a/src/Parser.php b/src/Parser.php
@@ -172,10 +172,18 @@ class Parser
             'class'             => 'SqlParser\\Components\\JoinKeyword',
             'field'             => 'join',
         ),
+        'LEFT OUTER JOIN'       => array(
+            'class'             => 'SqlParser\\Components\\JoinKeyword',
+            'field'             => 'join',
+        ),
         'RIGHT JOIN'            => array(
             'class'             => 'SqlParser\\Components\\JoinKeyword',
             'field'             => 'join',
         ),
+        'RIGHT OUTER JOIN'      => array(
+            'class'             => 'SqlParser\\Components\\JoinKeyword',
+            'field'             => 'join',
+        ),
         'INNER JOIN'            => array(
             'class'             => 'SqlParser\\Components\\JoinKeyword',
             'field'             => 'join',

diff --git a/tools/contexts/_common.txt b/tools/contexts/_common.txt
@@ -39,6 +39,7 @@ INTERVAL (D)
 JSON (D)
 KEY (K)
 LEFT JOIN
+LEFT OUTER JOIN
 LESS THAN
 LINEAR HASH
 LINEAR KEY
@@ -62,6 +63,7 @@ PERSISTENT
 PRIMARY KEY (K)
 REAL (D)
 RIGHT JOIN
+RIGHT OUTER JOIN
 SELECT TRANSACTION
 SERIAL (D)
 SET (D)