Fixed CSV export from Query Tool results does not include all columns for multiple CTEs. #6122

docs/en_US/release_notes_7_0.rst

@@ -70,3 +70,4 @@ Bug fixes
   | `Issue #6093 <https://github.com/pgadmin-org/pgadmin4/issues/6093>`_ -  Fix the dependents SQL of Roles which is throwing a type casting error on PostgreSQL 15.
   | `Issue #6100 <https://github.com/pgadmin-org/pgadmin4/issues/6100>`_ -  Fixed the LDAP authentication issue for the simultaneous login attempts.(CVE-2023-1907)
   | `Issue #6109 <https://github.com/pgadmin-org/pgadmin4/issues/6109>`_ -  Fixed asyncio random task error messages in Query tool.
+  | `Issue #6122 <https://github.com/pgadmin-org/pgadmin4/issues/6122>`_ -  Fixed CSV export from Query Tool results does not include all columns for multiple CTEs.

web/pgadmin/utils/driver/psycopg3/cursor.py

@@ -316,11 +316,12 @@ class AsyncDictCursor(_async_cursor):
         Fetch many tuples as ordered dictionary list.
         """
         self._odt_desc = None
-        if _tupples:
-            self.row_factory = tuple_row
+        self.row_factory = tuple_row
         res = asyncio.run(self._fetchmany(size))
-        if _tupples:
-            self.row_factory = dict_row
+        if not _tupples and res is not None:
+            res = [self._dict_tuple(t) for t in res]
+
+        self.row_factory = dict_row
         return res
 
     async def _fetchmany(self, size=None):
@@ -340,11 +341,12 @@ class AsyncDictCursor(_async_cursor):
         Fetch all tuples as ordered dictionary list.
         """
         self._odt_desc = None
-        if _tupples:
-            self.row_factory = tuple_row
+        self.row_factory = tuple_row
         res = asyncio.run(self._fetchall())
-        if _tupples:
-            self.row_factory = dict_row
+        if not _tupples and res is not None:
+            res = [self._dict_tuple(t) for t in res]
+
+        self.row_factory = dict_row
         return res
 
     async def _fetchone(self):