From 4cf0cc98cca72badbc23bd871d388487f7f3375b Mon Sep 17 00:00:00 2001 From: dave Date: Sun, 19 Feb 2017 21:45:49 +0000 Subject: [PATCH] Added expected result for issue95 test. Looks like it's already working as expected, UNION is showing up under FROM key --- tests/cases/parser/issue95Test.php | 15 +++++++-------- tests/expected/parser/issue95.serialized | 1 + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/cases/parser/issue95Test.php b/tests/cases/parser/issue95Test.php index 2322e247..b51dd2a5 100644 --- a/tests/cases/parser/issue95Test.php +++ b/tests/cases/parser/issue95Test.php @@ -39,15 +39,14 @@ * */ namespace PHPSQLParser\Test\Parser; -use PHPSQLParser\PHPSQLParser; -use PHPSQLParser\PHPSQLCreator; - -class issue95Test extends \PHPUnit_Framework_TestCase { - - public function testIssue95() { +use PHPUnit_Framework_TestCase; +use PHPSQLParser\PHPSQLParser; - // TODO: not solved, the parser doesn't recognize the UNION +class issue95Test extends PHPUnit_Framework_TestCase +{ + public function testIssue95() + { $sql="SELECT * FROM ((SELECT 1 AS `ID`) UNION (SELECT 2 AS `ID`)) AS `Tmp`"; try { @@ -56,8 +55,8 @@ public function testIssue95() { $p = $parser->parsed; $expected = getExpectedValue(dirname(__FILE__), 'issue95.serialized'); - $this->assertEquals($expected, $p, 'union within the from clause'); + $this->assertEquals($expected, $p, 'union within the from clause'); } } diff --git a/tests/expected/parser/issue95.serialized b/tests/expected/parser/issue95.serialized index e69de29b..0e871e67 100644 --- a/tests/expected/parser/issue95.serialized +++ b/tests/expected/parser/issue95.serialized @@ -0,0 +1 @@ +a:2:{s:6:"SELECT";a:1:{i:0;a:5:{s:9:"expr_type";s:6:"colref";s:5:"alias";b:0;s:9:"base_expr";s:1:"*";s:8:"sub_tree";b:0;s:5:"delim";b:0;}}s:4:"FROM";a:1:{i:0;a:8:{s:9:"expr_type";s:16:"table_expression";s:5:"alias";a:4:{s:2:"as";b:1;s:4:"name";s:5:"`Tmp`";s:9:"base_expr";s:8:"AS `Tmp`";s:9:"no_quotes";a:2:{s:5:"delim";b:0;s:5:"parts";a:1:{i:0;s:3:"Tmp";}}}s:5:"hints";b:0;s:9:"join_type";s:4:"JOIN";s:8:"ref_type";b:0;s:10:"ref_clause";b:0;s:9:"base_expr";s:43:"(SELECT 1 AS `ID`) UNION (SELECT 2 AS `ID`)";s:8:"sub_tree";a:1:{s:5:"UNION";a:2:{i:0;a:1:{s:6:"SELECT";a:1:{i:0;a:5:{s:9:"expr_type";s:5:"const";s:5:"alias";a:4:{s:2:"as";b:1;s:4:"name";s:4:"`ID`";s:9:"base_expr";s:7:"AS `ID`";s:9:"no_quotes";a:2:{s:5:"delim";b:0;s:5:"parts";a:1:{i:0;s:2:"ID";}}}s:9:"base_expr";s:1:"1";s:8:"sub_tree";b:0;s:5:"delim";b:0;}}}i:1;a:1:{s:6:"SELECT";a:1:{i:0;a:5:{s:9:"expr_type";s:5:"const";s:5:"alias";a:4:{s:2:"as";b:1;s:4:"name";s:4:"`ID`";s:9:"base_expr";s:7:"AS `ID`";s:9:"no_quotes";a:2:{s:5:"delim";b:0;s:5:"parts";a:1:{i:0;s:2:"ID";}}}s:9:"base_expr";s:1:"2";s:8:"sub_tree";b:0;s:5:"delim";b:0;}}}}}}}} \ No newline at end of file