Skip to content

Report on order items, JSON totals and computed group keys #269

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
roncodes merged 3 commits into from
Sep 25, 2026
Merged

Report on order items, JSON totals and computed group keys #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77f4542
feat(reporting): expression columns, computed group keys and safer re…
roncodes Sep 25, 2026
85a23a2
test(reporting): mark the fixture month filter as clock-independent f…
roncodes Sep 25, 2026
fd32df4
fix(reporting): label relationship columns with the whole relationshi…
roncodes Sep 25, 2026
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
52 changes: 45 additions & 7 deletions src/Support/Reporting/ComputedColumnValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,28 @@

class ComputedColumnValidator
{
/**
* Keywords that are never column references.
*/
public const SQL_KEYWORDS = [
'INTERVAL', 'AND', 'OR', 'XOR', 'NOT', 'IS', 'NULL', 'TRUE', 'FALSE',
'AS', 'FROM', 'WHERE', 'DIV', 'CASE', 'WHEN', 'THEN', 'ELSE', 'END',
'DISTINCT', 'IN', 'LIKE', 'BETWEEN', 'ESCAPE', 'REGEXP',
'ORDER', 'BY', 'ASC', 'DESC', 'SEPARATOR',
];

/**
* Cast types and interval units. These are keywords after `AS` / `INTERVAL <n>` (e.g.
* `CAST(x AS SIGNED)`, `INTERVAL 7 DAY`) but may also be real column names (e.g. `time`).
*/
public const CONTEXTUAL_KEYWORDS = [
// CAST / CONVERT target types
'DECIMAL', 'SIGNED', 'UNSIGNED', 'INTEGER', 'INT', 'CHAR', 'NCHAR', 'BINARY',
'DATE', 'DATETIME', 'TIME', 'DOUBLE', 'FLOAT', 'REAL', 'JSON',
// INTERVAL units
'MICROSECOND', 'SECOND', 'MINUTE', 'HOUR', 'DAY', 'WEEK', 'MONTH', 'QUARTER', 'YEAR',
];

/**
* Allowed SQL functions.
*/
Expand All @@ -25,6 +47,8 @@ class ComputedColumnValidator
'SECOND',
'DATE_FORMAT',
'LAST_DAY', // Get last day of month
'DATE', // Date part of a datetime, e.g. DATE(created_at)
'TIME', // Time part of a datetime
'DAYOFWEEK', // Get day of week (1=Sunday, 7=Saturday)
'DAYOFMONTH', // Get day of month (1-31)
'DAYOFYEAR', // Get day of year (1-366)
Expand Down Expand Up @@ -118,6 +142,23 @@ class ComputedColumnValidator
// Type Conversion
'CAST',
'CONVERT',
'DECIMAL', // CAST(x AS DECIMAL(10,2))
'CHAR', // CAST(x AS CHAR(20))
'BINARY',
'DOUBLE',
'FLOAT',

// JSON Functions, e.g. JSON_UNQUOTE(JSON_EXTRACT(meta, '$.total'))
'JSON_EXTRACT',
'JSON_UNQUOTE',
'JSON_VALUE',
'JSON_LENGTH',
'JSON_CONTAINS',
'JSON_CONTAINS_PATH',
'JSON_KEYS',
'JSON_TYPE',
'JSON_VALID',
'JSON_SEARCH',

// Other Utility Functions
'INTERVAL', // For date arithmetic
Expand All @@ -141,7 +182,7 @@ class ComputedColumnValidator
'ALTER', 'CREATE', 'GRANT', 'REVOKE',
'EXEC', 'EXECUTE', 'UNION', 'INTO',
'INFORMATION_SCHEMA', 'LOAD_FILE', 'OUTFILE',
'DUMPFILE', 'BENCHMARK', 'SLEEP',
'DUMPFILE', 'BENCHMARK', 'SLEEP', 'SELECT',
];

protected ReportSchemaRegistry $registry;
Expand Down Expand Up @@ -221,7 +262,7 @@ protected function validateFunctions(string $expression): array
$errors = [];

// Match function calls: FUNCTION_NAME(
preg_match_all('/([A-Z_]+)\s*\(/i', $expression, $matches);
preg_match_all('/\b([A-Z_][A-Z0-9_]*)\s*\(/i', $this->removeStringLiterals($expression), $matches);

if (!empty($matches[1])) {
foreach ($matches[1] as $function) {
Expand Down Expand Up @@ -342,10 +383,7 @@ protected function removeStringLiterals(string $expression): string
*/
protected function isKeywordOrLiteral(string $word): bool
{
$keywords = array_merge($this->allowedFunctions, $this->allowedOperators, [
'TRUE', 'FALSE', 'NULL', 'AS', 'FROM', 'WHERE',
'INTERVAL', 'DAY', 'MONTH', 'YEAR', 'HOUR', 'MINUTE', 'SECOND',
]);
$keywords = array_merge($this->allowedFunctions, $this->allowedOperators, static::SQL_KEYWORDS, static::CONTEXTUAL_KEYWORDS);

return in_array(strtoupper($word), $keywords) || is_numeric($word);
}
Expand Down Expand Up @@ -393,7 +431,7 @@ protected function isValidColumnReference(string $columnRef, Table $table): bool
*/
protected function columnExistsInTable(string $columnName, Table $table): bool
{
$columns = $table->getColumns();
$columns = $table->getAllColumns();

foreach ($columns as $column) {
if ($column->getName() === $columnName) {
Expand Down
Loading
Loading