Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 7 additions & 1 deletion system/Database/Postgre/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,13 @@ public function getVersion(): string
protected function execute(string $sql)
{
try {
return pg_query($this->connID, $sql);
$result = pg_query($this->connID, $sql);

if ($result === false && $this->DBDebug) {
throw new DatabaseException(pg_last_error($this->connID));
}

return $result;
} catch (ErrorException $e) {
$trace = array_slice($e->getTrace(), 2); // remove the call to error handler

Expand Down
18 changes: 18 additions & 0 deletions tests/system/Database/Live/BadQueryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,22 @@ public function testBadQueryDebugFalse(): void

$this->enableDBDebug();
}

public function testPostgreBadQueryDebugTrueWithWarningsDisabled(): void
{
if ($this->db->DBDriver !== 'Postgre') {
$this->markTestSkipped('This test is only for Postgre.');
}

$this->enableDBDebug();
$errorReporting = error_reporting(E_ALL & ~E_WARNING);

try {
$this->expectException(DatabaseException::class);
$this->expectExceptionMessage('table_does_not_exist');
$this->db->query('SELECT * FROM table_does_not_exist');
} finally {
error_reporting($errorReporting);
}
}
}
1 change: 1 addition & 0 deletions user_guide_src/source/changelogs/v4.7.5.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ Bugs Fixed
- **Cookie:** Fixed a bug where ``Cookie`` instances created with ``raw: true`` allowed invalid characters in cookie values rejected by ``setrawcookie()``.
- **Cookie:** Fixed a bug where ``Cookie`` instances allowed invalid characters in path, domain, and prefix attributes rejected by ``setcookie()`` and ``setrawcookie()``.
- **Database:** Fixed a bug where rebuilding a SQLite3 table (e.g., ``Forge::dropColumn()``, ``Forge::modifyColumn()``, ``Forge::dropForeignKey()`` and ``Forge::dropPrimaryKey()``) corrupted the table names referenced by its foreign keys when ``DBPrefix`` was set.
- **Database:** Fixed a bug where Postgre query failures were silently ignored when ``DBDebug`` was enabled and PHP warnings were disabled. A ``DatabaseException`` is now thrown.
- **Debug:** Fixed a bug where ``Timer::start()`` treated ``0.0`` as an empty value and substituted the current time.
- **Files:** Fixed a bug where ``File::move()`` and ``UploadedFile::move()`` set executable and overly permissive file permissions (``0777 & ~umask()`` instead of ``0666 & ~umask()``), and ``UploadedFile::move()`` targeted the parent directory instead of the destination file for ``chmod()``.
- **Helpers:** Fixed a bug where ``get_dir_file_info()`` returned incomplete entries for subdirectories and missing files instead of omitting them.
Expand Down
Loading