Move handling of field name normalisation into a method

Author: Photonios

psqlextra/compiler.py

@@ -171,9 +171,7 @@ def _build_conflict_target(self):
             ) % str(self.query.conflict_target))
 
         def _assert_valid_field(field_name):
-            if isinstance(field_name, tuple):
-                field_name, _ = field_name
-
+            field_name = self._normalize_field_name(field_name)
             if self._get_model_field(field_name):
                 return
 
@@ -215,9 +213,7 @@ def _get_model_field(self, name: str):
             no such field exists.
         """
 
-        field_name = name
-        if isinstance(field_name, tuple):
-            field_name = field_name[0]
+        field_name = self._normalize_field_name(name)
 
         for field in self.query.model._meta.local_concrete_fields:
             if field.name == field_name or field.column == field_name:
@@ -253,12 +249,29 @@ def _format_field_value(self, field_name) -> str:
             in SQL.
         """
 
-        if isinstance(field_name, tuple):
-            field_name, _ = field_name
-
+        field_name = self._normalize_field_name(field_name)
         field = self._get_model_field(field_name)
+
         return SQLInsertCompiler.prepare_value(
             self,
             field,
             getattr(self.query.objs[0], field_name)
         )
+
+    def _normalize_field_name(self, field_name) -> str:
+        """Normalizes a field name into a string by
+        extracting the field name if it was specified
+        as a reference to a HStore key (as a tuple).
+
+        Arguments:
+            field_name:
+                The field name to normalize.
+
+        Returns:
+            The normalized field name.
+        """
+
+        if isinstance(field_name, tuple):
+            field_name, _ = field_name
+
+        return field_name

tests/test_on_conflict.py

@@ -270,11 +270,9 @@ def test_on_conflict_unique_together2(conflict_action):
     """Asserts that inserts on models with a unique_together
     works properly."""
 
-    model = get_fake_model(
-        {
-            'name': models.CharField(max_length=140),
-        },
-    )
+    model = get_fake_model({
+        'name': models.CharField(max_length=140)
+    })
 
     model2 = get_fake_model(
         {
@@ -294,14 +292,14 @@ def test_on_conflict_unique_together2(conflict_action):
 
     id3 = (
         model2.objects
-            .on_conflict(['model1_id', 'model2_id'], conflict_action)
-            .insert(model1_id=id1, model2_id=id2)
+        .on_conflict(['model1_id', 'model2_id'], conflict_action)
+        .insert(model1_id=id1, model2_id=id2)
     )
 
     id4 = (
         model2.objects
-            .on_conflict(['model1_id', 'model2_id'], conflict_action)
-            .insert(model1_id=id1, model2_id=id2)
+        .on_conflict(['model1_id', 'model2_id'], conflict_action)
+        .insert(model1_id=id1, model2_id=id2)
     )
 
     assert id3 == id4