Merge pull request #77 from RickMohr/extra-with-header-map

When creating header map, add extra column defaults before adding `field_header_map`

Author: Steve Lamb

djqscsv/djqscsv.py

@@ -116,9 +116,9 @@ def write_csv(queryset, file_obj, **kwargs):
 
     # merge the custom field headers into the verbose/raw defaults, if provided
     merged_header_map = name_map.copy()
-    merged_header_map.update(field_header_map)
     if extra_columns:
         merged_header_map.update(dict((k, k) for k in extra_columns))
+    merged_header_map.update(field_header_map)
 
     merged_header_map = dict((k, _safe_utf8_stringify(v))
                              for (k, v) in merged_header_map.items())

test_app/djqscsv_tests/tests/test_csv_creation.py

@@ -271,6 +271,20 @@ def test_extra_select_ordering(self):
         self.assertQuerySetBecomesCsv(self.qs, custom_order_csv,
                                       field_order=['id', 'Most Powerful'])
 
+    def test_extra_select_header_map(self):
+        csv_with_extra = SELECT(self.BASE_CSV,
+                                AS('id', 'ID'),
+                                AS('name', "Person's name"),
+                                'address',
+                                AS('info', 'Info on Person'),
+                                'hobby_id',
+                                'born',
+                                AS('Most Powerful', 'Sturdiest'))
+
+        self.assertQuerySetBecomesCsv(
+            self.qs, csv_with_extra,
+            field_header_map={'Most Powerful': 'Sturdiest'})
+
 class RenderToCSVResponseTests(CSVTestCase):
 
     def test_render_to_csv_response_with_filename_and_datestamp(self):