Skip to content

Fixing an issue if there is no alias in subquery #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
moufmouf merged 2 commits into from
Jul 22, 2020
Merged

Fixing an issue if there is no alias in subquery #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
beb8e5d
Adding failing test
moufmouf Jul 22, 2020
306f4f4
Fixing testing of aliases
moufmouf Jul 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/SQLParser/Node/NodeFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static function toObject(array $desc)

// If the constant has an alias, it is declared in the columns section.
// If this is the case, let's wrap it in an "expression"
if (isset($desc['alias'])) {
if (isset($desc['alias']['name'])) {
$expression = new Expression();
$expression->setBaseExpression($desc['base_expr']);
$expression->setSubTree($const);
Expand Down Expand Up @@ -108,7 +108,7 @@ public static function toObject(array $desc)
$instance->setDatabase($baseName);
}

if (!empty($desc['alias'])) {
if (!empty($desc['alias']['name'])) {
$instance->setAlias($desc['alias']['name']);
}

Expand Down Expand Up @@ -225,7 +225,7 @@ public static function toObject(array $desc)
$expr->setJoinType($desc['join_type']);
}

if (isset($desc['alias'])) {
if (isset($desc['alias']['name'])) {
$expr->setAlias($desc['alias']['name']);
}

Expand Down Expand Up @@ -285,7 +285,7 @@ public static function toObject(array $desc)
$expr->setSubTree(self::buildFromSubtree($desc['sub_tree']));
}

if (isset($desc['alias'])) {
if (isset($desc['alias']['name'])) {
$expr->setAlias($desc['alias']['name']);
}
if (isset($desc['direction'])) {
Expand Down
9 changes: 6 additions & 3 deletions tests/Mouf/Database/MagicQueryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public function testStandardSelect()

$sql = "SELECT Substring_index(ee.`data`, ':', -1) as foo FROM users";
$this->assertEquals("SELECT Substring_index(ee.data, ':', -1) AS foo FROM users", self::simplifySql($magicQuery->build($sql)));

$sql = 'SELECT * FROM users GROUP BY id, login';
$this->assertEquals('SELECT * FROM users GROUP BY id, login', self::simplifySql($magicQuery->build($sql)));

Expand Down Expand Up @@ -202,6 +202,9 @@ public function testStandardSelect()

$sql = 'SELECT (id + 2) AS foo FROM bar';
$this->assertEquals($sql, self::simplifySql($magicQuery->build($sql)));

$sql = 'SELECT COUNT(*) FROM (SELECT DISTINCT states.country_id, states.code FROM states)';
$this->assertEquals($sql, self::simplifySql($magicQuery->build($sql)));
}

/**
Expand Down Expand Up @@ -380,9 +383,9 @@ public function testMatchAgainst()
ORDER BY MATCH(column) AGAINST(:searchTerm IN BOOLEAN MODE) DESC
";
$expectedSql = "SELECT MATCH(column) AGAINST('searchString' IN BOOLEAN MODE) AS rang FROM table WHERE MATCH(column) AGAINST('searchString' IN BOOLEAN MODE) ORDER BY MATCH(column) AGAINST('searchString' IN BOOLEAN MODE) DESC";

$params["searchTerm"] = "searchString";

$this->assertEquals($expectedSql, self::simplifySql($magicQuery->build($sql, $params)));
}

Expand Down