Skip to content

#41049: quote MariaDB reserved keywords in SQL identifiers #41050

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
Nuranto wants to merge 1 commit into
base: 2.4-develop
Choose a base branch
from
+5 −2
Open

#41049: quote MariaDB reserved keywords in SQL identifiers #41050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/code/Magento/SalesRule/Model/ResourceModel/Rule/DateApplier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function applyDate($select, $now)
'main_table.from_date is null or main_table.from_date <= ?',
$now
)->where(
'main_table.to_date is null or main_table.to_date >= ?',
'main_table.`to_date` is null or main_table.`to_date` >= ?',
$now
);
}
Expand Down
5 changes: 4 additions & 1 deletion lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,10 @@ abstract class AbstractDb extends \Magento\Framework\Data\Collection
'WIDTH_BUCKET' => 898, 'WINDOW' => 899, 'WITH' => 900, 'WITHIN' => 901, 'WITHIN_GROUP' => 902,
'WITHOUT' => 903, 'WLM' => 904, 'WORK' => 905, 'WRITE' => 906, 'WRITETEXT' => 907,
'XMLCAST' => 908, 'XMLEXISTS' => 909, 'XMLNAMESPACES' => 910, 'XOR' => 911, 'YEAR' => 912,
'YEAR_MONTH' => 913, 'YEARS' => 914, 'ZEROFILL' => 915, 'ZEROIFNULL' => 916, 'ZONE' => 917
'YEAR_MONTH' => 913, 'YEARS' => 914, 'ZEROFILL' => 915, 'ZEROIFNULL' => 916, 'ZONE' => 917,
// Recent MariaDB reserved parser keywords (unquoted use raises ERROR 1064):
// VECTOR (11.6), ST_COLLECT (11.8), CONVERSION and TO_DATE (12.2).
'VECTOR' => 918, 'ST_COLLECT' => 919, 'CONVERSION' => 920, 'TO_DATE' => 921
];

/**
Expand Down