Skip to content

Commit

Permalink
Fix support for orderByPosition (ORDER BY 1 ASC/ORDER BY 1 DESC) (#345)
Browse files Browse the repository at this point in the history
  • Loading branch information
j-angnoe committed Feb 1, 2022
1 parent ec0ab93 commit 97593a7
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/PHPSQLParser/builders/OrderByBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ protected function buildBracketExpression($parsed) {
}

protected function buildPosition($parsed) {
$builder = new PositionBuilder();
$builder = new OrderByPositionBuilder();
return $builder->build($parsed);
}

Expand Down
66 changes: 66 additions & 0 deletions src/PHPSQLParser/builders/OrderByPositionBuilder.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<?php
/**
* PositionBuilder.php
*
* Builds positions of the GROUP BY clause.
*
* PHP version 5
*
* LICENSE:
* Copyright (c) 2010-2014 Justin Swanhart and André Rothe
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* @author André Rothe <andre.rothe@phosco.info>
* @copyright 2010-2014 Justin Swanhart and André Rothe
* @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
* @version SVN: $Id$
*
*/

namespace PHPSQLParser\builders;
use PHPSQLParser\utils\ExpressionType;

/**
* This class implements the builder for positions of the GROUP-BY clause.
* You can overwrite all functions to achieve another handling.
*
* @author André Rothe <andre.rothe@phosco.info>
* @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
*
*/
class OrderByPositionBuilder implements Builder {
protected function buildDirection($parsed) {
$builder = new DirectionBuilder();
return $builder->build($parsed);
}

public function build(array $parsed) {
if ($parsed['expr_type'] !== ExpressionType::POSITION) {
return "";
}
return $parsed['base_expr'] . $this->buildDirection($parsed);
}
}
?>
2 changes: 1 addition & 1 deletion tests/expected/creator/orderbyposition.sql
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SELECT c1, c2 FROM t ORDER BY 1
SELECT c1, c2 FROM t ORDER BY 1 ASC

0 comments on commit 97593a7

Please sign in to comment.