From 5a638ec75679235fc7fd3e528548aa39ce44138d Mon Sep 17 00:00:00 2001
From: zakaria-zoulati <zoulatizakaria3@gmail.com>
Date: Sat, 6 Jun 2026 12:56:44 +0100
Subject: [PATCH] Fix Oracle current_db query to return actual database name

---
 data/xml/queries.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/xml/queries.xml b/data/xml/queries.xml
index e2f28405781..b88007973ee 100644
--- a/data/xml/queries.xml
+++ b/data/xml/queries.xml
@@ -250,7 +250,8 @@
         NOTE: current physical DB but not usable for enumeration
         <current_db query="SELECT SYS.DATABASE_NAME FROM DUAL"/>
         -->
-        <current_db query="SELECT USER FROM DUAL"/>
+        <!-- ORA_DATABASE_NAME works for any user in Oracle 12c+; fallback to USER for older versions -->
+        <current_db query="SELECT ORA_DATABASE_NAME FROM DUAL" query2="SELECT USER FROM DUAL"/>
         <!--
              NOTE: in Oracle to check if the session user is DBA you can use:
              SELECT USERENV('ISDBA') FROM DUAL