GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Fix Row count wrong when grouping joined tables, phpmyadmin/phpmyadmi… · phpmyadmin/sql-parser@2eb3372

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

src/Components
- JoinKeyword.php

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/Components/JoinKeyword.php‎`

Copy file name to clipboardExpand all lines: src/Components/JoinKeyword.php

+11-3Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ class JoinKeyword extends Component`
`62`	`62`	`* @var Condition[]`
`63`	`63`	`*/`
`64`	`64`	`public $on;`
	`65`	`+ public $using;`
`65`	`66`
`66`	`67`	`/**`
`67`	`68`	`* @param Parser $parser The parser that serves as context.`
`@@ -85,10 +86,12 @@ public static function parse(Parser $parser, TokensList $list, array $options =`
`85`	`86`	`*`
`86`	`87`	`* 1 -----------------------[ expr ]----------------------> 2`
`87`	`88`	`*`
`88`		`- * 2 ------------------------[ ON ]-----------------------> 3`
	`89`	`+ * 2 ---------------------[ ON\|USING ]--------------------> 3/4`
`89`	`90`	`*`
`90`	`91`	`* 3 --------------------[ conditions ]-------------------> 0`
`91`	`92`	`*`
	`93`	`+ * 4 ----------------------[ columns ]--------------------> 0`
	`94`	`+ *`
`92`	`95`	`* @var int $state`
`93`	`96`	`*/`
`94`	`97`	`$state = 0;`
`@@ -131,14 +134,19 @@ public static function parse(Parser $parser, TokensList $list, array $options =`
`131`	`134`	`$expr->expr = Expression::parse($parser, $list, array('field' => 'table'));`
`132`	`135`	`$state = 2;`
`133`	`136`	`} elseif ($state === 2) {`
`134`		`- if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'ON')) {`
`135`		`- $state = 3;`
	`137`	`+ if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'ON' \|\| $token->value === 'USING')) {`
	`138`	`+ $state = $token->value === 'ON' ? 3 : 4;`
`136`	`139`	`}`
`137`	`140`	`} elseif ($state === 3) {`
`138`	`141`	`$expr->on = Condition::parse($parser, $list);`
`139`	`142`	`$ret[] = $expr;`
`140`	`143`	`$expr = new JoinKeyword();`
`141`	`144`	`$state = 0;`
	`145`	`+ } elseif ($state === 4) {`
	`146`	`+ $expr->using = ArrayObj::parse($parser, $list);`
	`147`	`+ $ret[] = $expr;`
	`148`	`+ $expr = new JoinKeyword();`
	`149`	`+ $state = 0;`
`142`	`150`	`}`
`143`	`151`
`144`	`152`	`}`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.