From 44d25c41e1a52895b2792726da5aaf299c8bcd27 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 25 Jul 2024 12:09:29 +0200
Subject: [PATCH] [plsql] Fix TomKytesDespair for more complex exception
 handlers

Fixes #5132
---
 docs/pages/release_notes.md                   |  2 ++
 .../category/plsql/bestpractices.xml          |  4 +++-
 .../bestpractices/xml/TomKytesDespair.xml     | 22 +++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index bc1a36ec7a..6c5b01f83d 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -15,6 +15,8 @@ This is a {{ site.pmd.release_type }} release.
 ### 🚀 New and noteworthy
 
 ### 🐛 Fixed Issues
+* plsql-bestpractices
+  * [#5132](https://github.com/pmd/pmd/issues/5132): \[plsql] TomKytesDespair - exception for more complex exception handler
 
 ### 🚨 API Changes
 
diff --git a/pmd-plsql/src/main/resources/category/plsql/bestpractices.xml b/pmd-plsql/src/main/resources/category/plsql/bestpractices.xml
index d859856eac..2584e54715 100644
--- a/pmd-plsql/src/main/resources/category/plsql/bestpractices.xml
+++ b/pmd-plsql/src/main/resources/category/plsql/bestpractices.xml
@@ -24,7 +24,9 @@ Rules which enforce generally accepted best practices.
             <property name="xpath">
                 <value>
 <![CDATA[
-//ExceptionHandler[QualifiedName/@Image='OTHERS' and upper-case(Statement/UnlabelledStatement/Expression/@Image)='NULL']
+//ExceptionHandler[QualifiedName/@Image='OTHERS']
+                  [count(Statement)=1]
+                  [Statement/UnlabelledStatement/Expression/PrimaryPrefix/Literal/NullLiteral]
 ]]>
                 </value>
             </property>
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/bestpractices/xml/TomKytesDespair.xml b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/bestpractices/xml/TomKytesDespair.xml
index d8cb27c197..c28bd26398 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/bestpractices/xml/TomKytesDespair.xml
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/bestpractices/xml/TomKytesDespair.xml
@@ -98,4 +98,26 @@ END update_planned_hrs;
 /
         ]]></code>
     </test-code>
+
+    <test-code>
+        <description>#5132 [plsql] TomKytesDespair - exception for more complex exception handler</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+create or replace procedure x
+is
+  v_cursor number;
+begin
+  v_cursor  := DBMS_SQL.open_cursor;
+  dbms_output.put_line('Blah');
+exception
+  WHEN OTHERS THEN
+        IF DBMS_SQL.is_open(v_cursor) THEN
+          DBMS_SQL.close_cursor(v_cursor);
+        END IF;
+        DBMS_OUTPUT.Put_Line('Blah');
+        DBMS_OUTPUT.Put_Line(SQLERRM);
+end;
+/
+]]></code>
+    </test-code>
 </test-data>