FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix(builder): preserve whitespace between SELECT and UNION body in CREATE VIEW (#655) by SAY-5 · Pull Request #657 · phpmyadmin/sql-parser · GitHub

/ sql-parser Public

fix(builder): preserve whitespace between SELECT and UNION body in CREATE VIEW (#655) #657

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

Open
SAY-5 wants to merge 2 commits into
base: master
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
Conversation 1 Commits 2 Checks 0 Files changed
Open

fix(builder): preserve whitespace between SELECT and UNION body in CREATE VIEW (#655) #657

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
29a63b1
fix(builder): preserve whitespace between SELECT and UNION body in CR…
SAY-5 Apr 30, 2026
91123d2
chore: remove em-dashes from comments
SAY-5 May 11, 2026
File filter

Filter by extension

Filter by extension .php  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
13 changes: 12 additions & 1 deletion src/Statements/CreateStatement.php
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -462,11 +462,22 @@ public function build(): string
$builtStatement = $this->with->build();
}

$body = TokensList::buildFromArray($this->body);
// Body tokens (e.g. trailing `UNION ALL (SELECT ...)` after the
// primary SELECT) are concatenated raw, so without a separator
// the rebuilt SQL collides with the SELECT's last token,
// `WHERE 3 = 3union all` instead of `WHERE 3 = 3 union all`.
// Only insert a space when neither side already has one to
// avoid double-spacing the WITH...AS path.
$separator = ($builtStatement !== '' && $body !== ''
&& substr($builtStatement, -1) !== ' '
&& $body[0] !== ' ') ? ' ' : '';

return 'CREATE '
. $this->options->build() . ' '
. $this->name->build() . ' '
. $fields . ' AS ' . $builtStatement
. TokensList::buildFromArray($this->body) . ' '
. $separator . $body . ' '
. ($this->entityOptions?->build() ?? '');
}

Expand Down
25 changes: 25 additions & 0 deletions tests/Builder/CreateStatementTest.php
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -897,4 +897,29 @@ public function testBuildCreateTableComplexIndexes(): void
$stmt->build(),
);
}

/**
* Regression for #655: `CREATE VIEW ... AS SELECT ... WHERE ... UNION ALL (...)`
* used to lose the whitespace between the SELECT body and the trailing
* UNION clause, producing invalid SQL like `WHERE 3 = 3union all (...)`.
*/
public function testBuilderViewWithUnionPreservesWhitespace(): void
{
$sql = "CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER "
. "VIEW `v1` AS select 1 AS `a` where 3 = 3 union all (select 2 AS `a`)";

$parser = new Parser($sql);
$built = $parser->statements[0]->build();

$this->assertStringNotContainsString(
'3union all',
$built,
'rebuilt CREATE VIEW must keep the space between WHERE clause and UNION',
);
$this->assertStringContainsString(
'3 union all',
// case-insensitive match: builder may upper-case the keyword
preg_replace('/UNION\s+ALL/i', 'union all', $built),
);
}
}
Back | FazBrowse Home | New Git URL