From: Jakub Vrana <jakub@vrana.cz>
Date: Sun, 23 Feb 2025 16:42:23 +0000 (+0100)
Subject: Print SQL errors as comments in export
X-Git-Tag: v4.17.0~7
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=eb0d5c3c5e1478282c0bc1f20a6a685508dda7d5;p=adminer.git

Print SQL errors as comments in export
---

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 397b7266..fb3c745e 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -392,7 +392,7 @@ function get_rows($query, $connection2 = null, $error = "<p class='error'>") {
 		while ($row = $result->fetch_assoc()) {
 			$return[] = $row;
 		}
-	} elseif (!$result && !is_object($connection2) && $error && defined("PAGE_HEADER")) {
+	} elseif (!$result && !is_object($connection2) && $error && (defined("PAGE_HEADER") || $error == "-- ")) {
 		echo $error . error() . "\n";
 	}
 	return $return;
diff --git a/changes.txt b/changes.txt
index 02a6d2ff..663eb9b9 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,6 +1,7 @@
 Adminer 4.17.0-dev:
 Hide index column options by default
 Offer original values in multi-row editing (regression from 4.16.0)
+Print SQL errors as comments in export (regression from 3.2.0)
 MySQL, PostgreSQL, MS SQL: Support CHECK constraint
 MySQL: Show comments at routine call (bug #874)
 MySQL: Don't offer empty enum value in edit