Fix some small typing issues

Author: Photonios

psqlextra/compiler.py

@@ -323,7 +323,7 @@ def _format_field_value(self, field_name) -> str:
 
     def _compile_expression(
         self, expression: Union[Expression, Q, str]
-    ) -> Tuple[str, tuple]:
+    ) -> Tuple[str, Union[tuple, list]]:
         """Compiles an expression, Q object or raw SQL string into SQL and
         tuple of parameters."""
 

psqlextra/expressions.py

@@ -137,10 +137,12 @@ def __init__(self, name: str, key: str):
         super().__init__(name)
         self.key = key
 
-    def resolve_expression(self, *args, **kwargs) -> HStoreColumn:
+    def resolve_expression(self, *args, **kwargs):
         """Resolves the expression into a :see:HStoreColumn expression."""
 
-        original_expression = super().resolve_expression(*args, **kwargs)
+        original_expression: expressions.Col = super().resolve_expression(
+            *args, **kwargs
+        )
         expression = HStoreColumn(
             original_expression.alias, original_expression.target, self.key
         )

psqlextra/models/options.py

@@ -14,7 +14,7 @@ def __init__(self, method: PostgresPartitioningMethod, key: List[str]):
         self.method = method
         self.key = key
         self.original_attrs: Dict[
-            str, Union[PostgresPartitioningMethod, List[key]]
+            str, Union[PostgresPartitioningMethod, List[str]]
         ] = dict(method=method, key=key)
 
 

psqlextra/sql.py

@@ -67,7 +67,7 @@ def rename_annotations(self, annotations) -> None:
         self.annotations.clear()
         self.annotations.update(new_annotations)
 
-    def add_fields(self, field_names: List[str], *args, **kwargs) -> bool:
+    def add_fields(self, field_names: List[str], *args, **kwargs) -> None:
         """Adds the given (model) fields to the select set.
 
         The field names are added in the order specified. This overrides

psqlextra/types.py

@@ -7,7 +7,7 @@
 
 class StrEnum(str, Enum):
     @classmethod
-    def all(cls) -> List["PostgresPartitioningMethod"]:
+    def all(cls) -> List["StrEnum"]:
         return [choice for choice in cls]
 
     @classmethod