diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-12-26 14:23:38 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-12-26 14:23:38 +0000 |
| commit | 0d100b57dcffe54ec7f46d8f577a4c26fcf34202 (patch) | |
| tree | ffcfb6c4cb5e1f9481479620c87b37a2c7b6ebec /includes/database/database.inc | |
| parent | fc063806de3ded56d1c3d78a49e8a60de7a7fe1c (diff) | |
| download | brdo-0d100b57dcffe54ec7f46d8f577a4c26fcf34202.tar.gz brdo-0d100b57dcffe54ec7f46d8f577a4c26fcf34202.tar.bz2 | |
- Patch #332002 by Crell et al: MergeQuery should refuse to execute if there are no key fields. With tests.
Diffstat (limited to 'includes/database/database.inc')
| -rw-r--r-- | includes/database/database.inc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc index eecb8f88c..043515548 100644 --- a/includes/database/database.inc +++ b/includes/database/database.inc @@ -1170,6 +1170,14 @@ abstract class Database { class TransactionsNotSupportedException extends PDOException { } /** + * Exception thrown for merge queries that do not make semantic sense. + * + * There are many ways that a merge query could be malformed. They should all + * throw this exception and set an appropriately descriptive message. + */ +class InvalidMergeQueryException extends Exception {} + +/** * A wrapper class for creating and managing database transactions. * * Not all databases or database configurations support transactions. For |