fix: Few fixes in DBAPI (#1085)

ankiaga · web-flow · commit 1ed5a47ce9cf · 2024-01-29T04:22:04.000-08:00
* fix: Few fixes in DBAPI 

* Small fix

* Test fix
diff --git a/google/cloud/spanner_dbapi/connection.py b/google/cloud/spanner_dbapi/connection.py
@@ -273,10 +273,11 @@ def _release_session(self):
 
         The session will be returned into the sessions pool.
         """
+        if self._session is None:
+            return
         if self.database is None:
             raise ValueError("Database needs to be passed for this operation")
-        if self._session is not None:
-            self.database._pool.put(self._session)
+        self.database._pool.put(self._session)
         self._session = None
 
     def transaction_checkout(self):
diff --git a/google/cloud/spanner_dbapi/cursor.py b/google/cloud/spanner_dbapi/cursor.py
@@ -124,7 +124,13 @@ def description(self):
         :rtype: tuple
         :returns: The result columns' description.
         """
-        if not getattr(self._result_set, "metadata", None):
+        if (
+            self._result_set is None
+            or self._result_set.metadata is None
+            or self._result_set.metadata.row_type is None
+            or self._result_set.metadata.row_type.fields is None
+            or len(self._result_set.metadata.row_type.fields) == 0
+        ):
             return
 
         columns = []
diff --git a/tests/unit/spanner_dbapi/test_connection.py b/tests/unit/spanner_dbapi/test_connection.py
@@ -160,6 +160,7 @@ def test__release_session(self, mock_database):
 
     def test_release_session_database_error(self):
         connection = Connection(INSTANCE)
+        connection._session = "session"
         with pytest.raises(ValueError):
             connection._release_session()
 
