File tree 1 file changed +2
-10
lines changed
1 file changed +2
-10
lines changed Original file line number Diff line number Diff line change @@ -667,12 +667,7 @@ protected function parseJoins(&$joins, &$query)
667
667
private function getColumnChainsRegxp ()
668
668
{
669
669
return '~
670
- (?(DEFINE)
671
- (?P<word> [\w_]*[a-z][\w_]* )
672
- (?P<del> [.:] )
673
- (?P<node> (?&del)? (?&word) (\((?&word)\))? )
674
- )
675
- (?P<chain> (?!\.) (?&node)*) \. (?P<column> (?&word) | \* )
670
+ (?P<chain> (?!\.) (?: [.:]? (?>[\w_]*[a-z][\w_]*) (\([\w_]*[a-z][\w_]*\))? ) *) \. (?P<column> (?>[\w_]*[a-z][\w_]*) | \* )
676
671
~xi ' ;
677
672
}
678
673
@@ -688,10 +683,7 @@ public function parseJoinsCb(&$joins, $match)
688
683
}
689
684
690
685
preg_match_all ('~
691
- (?(DEFINE)
692
- (?P<word> [\w_]*[a-z][\w_]* )
693
- )
694
- (?P<del> [.:])?(?P<key> (?&word))(\((?P<throughColumn> (?&word))\))?
686
+ (?P<del> [.:])?(?P<key> [\w_]*[a-z][\w_]* )(\((?P<throughColumn> [\w_]*[a-z][\w_]* )\))?
695
687
~xi ' , $ chain , $ keyMatches , PREG_SET_ORDER );
696
688
697
689
$ parent = $ this ->tableName ;
You can’t perform that action at this time.
0 commit comments