From ddcbd774045f1dddd7b5539592594f80b1254f00 Mon Sep 17 00:00:00 2001
From: Carsten Rose <carsten.rose@math.uzh.ch>
Date: Sun, 27 Jan 2019 22:29:20 +0100
Subject: [PATCH] PhpDoc for new marked SQL error.
---
extension/Source/core/exceptions/AbstractException.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/extension/Source/core/exceptions/AbstractException.php b/extension/Source/core/exceptions/AbstractException.php
index 548a8b9d9..af3c55a0a 100644
--- a/extension/Source/core/exceptions/AbstractException.php
+++ b/extension/Source/core/exceptions/AbstractException.php
@@ -136,10 +136,11 @@ class AbstractException extends \Exception {
$arrMerged = OnArray::htmlentitiesOnArray(array_merge($arrMsg, $arrDebugShow));
if (!empty($os = $arrMerged[ERROR_MESSAGE_OS] ?? '')) {
- // [ mysqli: 1146 ] Table 'crose_qfq_db.ksajfdkhaskf' doesn't exist
+ // [ mysqli: 1146 ] Table 'qfq_db.UNKNOWN_TABLE' doesn't exist
$before=$this->getTableToken( html_entity_decode($arrMerged[ERROR_MESSAGE_OS],ENT_QUOTES));
$arrMerged[EXCEPTION_SQL_FINAL] = $this->sqlHighlightError($arrMerged[ERROR_MESSAGE_OS], 'mysqli: 1146', $arrMerged[EXCEPTION_SQL_FINAL], $before, "' doesn't exist");
$arrMerged[EXCEPTION_SQL_FINAL] = $this->sqlHighlightError($arrMerged[ERROR_MESSAGE_OS], 'mysqli: 1064', $arrMerged[EXCEPTION_SQL_FINAL], "the right syntax to use near '", "' at line [0-9]*$");
+ // [ mysqli: 1054 ] Unknown column 'noPsp.pspElement' in 'field list'
$arrMerged[EXCEPTION_SQL_FINAL] = $this->sqlHighlightError($arrMerged[ERROR_MESSAGE_OS], 'mysqli: 1054', $arrMerged[EXCEPTION_SQL_FINAL], "Unknown column '", "' in 'field list'");
}
@@ -173,6 +174,10 @@ class AbstractException extends \Exception {
}
/**
+ * Extract 'beforeMatch', incl. dynamic db name as token to do underlining later.
+ * E.g.: "[ mysqli: 1146 ] Table 'qfq_db.UNKNOWN_TABLE' doesn't exist"
+ * return: "Table 'qfq_db."
+ *
* @param $os
* @return string
*/
--
GitLab