Small fixes

Author: damian3031

trino/client.py

@@ -753,7 +753,8 @@ def columns(self):
             while not self._columns and not self.finished and not self.cancelled:
                 # Columns are not returned immediately after query is submitted.
                 # Continue fetching data until columns information is available and push fetched rows into buffer.
-                self._result.rows += self.fetch()
+                if self._result:
+                    self._result.rows += self.fetch()
         return self._columns
 
     @property

trino/dbapi.py

@@ -338,6 +338,12 @@ def stats(self) -> Optional[Dict[Any, Any]]:
             return self._query.stats
         return None
 
+    @property
+    def query_id(self) -> Optional[str]:
+        if self._query is not None:
+            return self._query.query_id
+        return None
+
     @property
     def warnings(self) -> Optional[List[Dict[Any, Any]]]:
         if self._query is not None:
@@ -505,6 +511,7 @@ def executemany(self, operation: str, seq_of_params: Any) -> None:
         for parameters in seq_of_params[:-1]:
             self.execute(operation, parameters)
             self.fetchall()
+            assert self._query is not None
             if self._query.update_type is None:
                 raise NotSupportedError("Query must return update type")
         if seq_of_params:
@@ -586,8 +593,10 @@ def describe(self, sql: str) -> List[DescribeOutput]:
 
         return list(map(lambda x: DescribeOutput.from_row(x), result))
 
-    def genall(self) -> trino.client.TrinoResult:
-        return self._query.result
+    def genall(self) -> Any:
+        if self._query:
+            return self._query.result
+        return None
 
     def fetchall(self) -> List[List[Any]]:
         return list(self.genall())
@@ -625,6 +634,8 @@ def __init__(self, *values: str):
         self.values = [v.lower() for v in values]
 
     def __eq__(self, other: object) -> bool:
+        if not isinstance(other, str):
+            return NotImplemented
         return other.lower() in self.values