test: Fix integration tests for new identity

src/firebolt/async_db/connection.py

@@ -238,8 +238,8 @@ async def connect(
 
             if database is not None and database != attached_db:
                 raise InterfaceError(
-                    f"Engine {engine_name} is not attached to {database}, "
-                    f"but to {attached_db}"
+                    f"Engine {engine_name} is attached to {attached_db} "
+                    f"instead of {database}"
                 )
             elif database is None:
                 database = attached_db

src/firebolt/async_db/cursor.py

@@ -111,7 +111,7 @@ async def _raise_if_error(self, resp: Response) -> None:
     async def _api_request(
         self,
         query: str = "",
-        parameters: dict[str, Any] = {},
+        parameters: Optional[dict[str, Any]] = None,
         path: str = "",
         use_set_parameters: bool = True,
     ) -> Response:
@@ -130,8 +130,9 @@ async def _api_request(
                 set parameters are sent. Setting this to False will allow
                 self._set_parameters to be ignored.
         """
+        parameters = parameters or {}
         if use_set_parameters:
-            parameters = {**(self._set_parameters or {}), **(parameters or {})}
+            parameters = {**(self._set_parameters or {}), **parameters}
         if self.connection.database:
             parameters["database"] = self.connection.database
         if self.connection._is_system:

src/firebolt/common/base_cursor.py

@@ -337,6 +337,10 @@ def _get_next_range(self, size: int) -> Tuple[int, int]:
         self._idx = right
         return left, right
 
+    _performance_log_message = (
+        "[PERFORMANCE] Parsing query output into native Python types"
+    )
+
     @check_not_closed
     @check_query_executed
     def fetchone(self) -> Optional[List[ColType]]:
@@ -346,7 +350,7 @@ def fetchone(self) -> Optional[List[ColType]]:
             # We are out of elements
             return None
         assert self._rows is not None
-        with Timer("[PERFORMANCE] Parsing query output into native Python types "):
+        with Timer(self._performance_log_message):
             result = self._parse_row(self._rows[left])
         return result
 
@@ -361,7 +365,7 @@ def fetchmany(self, size: Optional[int] = None) -> List[List[ColType]]:
         left, right = self._get_next_range(size)
         assert self._rows is not None
         rows = self._rows[left:right]
-        with Timer("[PERFORMANCE] Parsing query output into native Python types "):
+        with Timer(self._performance_log_message):
             result = [self._parse_row(row) for row in rows]
         return result
 
@@ -372,7 +376,7 @@ def fetchall(self) -> List[List[ColType]]:
         left, right = self._get_next_range(self.rowcount)
         assert self._rows is not None
         rows = self._rows[left:right]
-        with Timer("[PERFORMANCE] Parsing query output into native Python types "):
+        with Timer(self._performance_log_message):
             result = [self._parse_row(row) for row in rows]
         return result
 

src/firebolt/db/connection.py

@@ -247,8 +247,8 @@ def connect(
 
             if database is not None and database != attached_db:
                 raise InterfaceError(
-                    f"Engine {engine_name} is not attached to {database}, "
-                    f"but to {attached_db}"
+                    f"Engine {engine_name} is attached to {attached_db} "
+                    f"instead of {database}"
                 )
             elif database is None:
                 database = attached_db

src/firebolt/db/cursor.py

@@ -98,7 +98,7 @@ def _raise_if_error(self, resp: Response) -> None:
     def _api_request(
         self,
         query: str = "",
-        parameters: dict[str, Any] = {},
+        parameters: Optional[dict[str, Any]] = None,
         path: str = "",
         use_set_parameters: bool = True,
     ) -> Response:
@@ -117,8 +117,9 @@ def _api_request(
                 set parameters are sent. Setting this to False will allow
                 self._set_parameters to be ignored.
         """
+        parameters = parameters or {}
         if use_set_parameters:
-            parameters = {**(self._set_parameters or {}), **(parameters or {})}
+            parameters = {**(self._set_parameters or {}), **parameters}
         if self.connection.database:
             parameters["database"] = self.connection.database
         if self.connection._is_system:

tests/integration/dbapi/async/test_errors_async.py

@@ -92,7 +92,8 @@ async def test_database_not_exists(
             await connection.cursor().execute("show tables")
 
     assert (
-        str(exc_info.value) == f"Database {new_db_name} does not exist"
+        str(exc_info.value)
+        == f"Engine {engine_name} is attached to {database_name} instead of {new_db_name}"
     ), "Invalid database name error message."
 
 

tests/integration/dbapi/async/test_queries_async.py

@@ -127,10 +127,10 @@ async def test_long_query(
 async def test_drop_create(connection: Connection) -> None:
     """Create and drop table/index queries are handled properly."""
 
-    async def test_query(c: Cursor, query: str, empty_response=True) -> None:
+    async def test_query(c: Cursor, query: str) -> None:
         await c.execute(query)
         assert c.description == None
-        assert c.rowcount == (-1 if empty_response else 0)
+        assert c.rowcount == 0
 
     """Create table query is handled properly"""
     with connection.cursor() as c:
@@ -166,7 +166,6 @@ async def test_query(c: Cursor, query: str, empty_response=True) -> None:
             c,
             "CREATE AGGREGATING INDEX test_db_agg_idx ON "
             "test_drop_create_async(id, sum(f), count(dt))",
-            empty_response=False,
         )
 
         # Drop join index