diff options
| -rw-r--r-- | src/Components/JoinKeyword.php | 2 | ||||
| -rw-r--r-- | src/Contexts/ContextMySql50000.php | 4 | ||||
| -rw-r--r-- | src/Contexts/ContextMySql50100.php | 4 | ||||
| -rw-r--r-- | src/Contexts/ContextMySql50500.php | 4 | ||||
| -rw-r--r-- | src/Contexts/ContextMySql50600.php | 4 | ||||
| -rw-r--r-- | src/Contexts/ContextMySql50700.php | 4 | ||||
| -rw-r--r-- | src/Parser.php | 8 | ||||
| -rw-r--r-- | tools/contexts/_common.txt | 2 |
8 files changed, 22 insertions, 10 deletions
diff --git a/src/Components/JoinKeyword.php b/src/Components/JoinKeyword.php index ac2fa02..2a7693e 100644 --- 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 index e5b6377..01090b3 100644 --- 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 index 02e6afc..b10ff1c 100644 --- 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 index b0332b5..c7faa84 100644 --- 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 index 46c0277..9854d37 100644 --- 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 index 817ed0a..a308f5a 100644 --- 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 index 1859ae0..1280d72 100644 --- 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 index 1282f4f..246fc07 100644 --- 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) |