diff --git a/app/models/dwc_occurrence.rb b/app/models/dwc_occurrence.rb index 6658fe647e..3fc04909dc 100644 --- a/app/models/dwc_occurrence.rb +++ b/app/models/dwc_occurrence.rb @@ -188,7 +188,7 @@ def self.target_columns # @return [Array] # of symbols def self.excluded_columns - ::DwcOccurrence.columns.collect{|c| c.name.to_sym} - (self.target_columns - [:dwc_occurrence_object_id, :dwc_occurrence_object_type]) + ::DwcOccurrence.columns.collect{|c| c.name.to_sym} - (self.target_columns - [:id, :dwc_occurrence_object_id, :dwc_occurrence_object_type]) end # @return [Scope] diff --git a/lib/export/dwca/data.rb b/lib/export/dwca/data.rb index 2e9d07f11c..4e08f7953c 100644 --- a/lib/export/dwca/data.rb +++ b/lib/export/dwca/data.rb @@ -474,7 +474,6 @@ def biological_associations_resource_relationship def meta_fields return [] if no_records? h = File.open(all_data, &:gets)&.strip&.split("\t") - h&.shift h || [] end diff --git a/spec/lib/export/dwca/data_spec.rb b/spec/lib/export/dwca/data_spec.rb index 4604cb069d..b116a5e144 100644 --- a/spec/lib/export/dwca/data_spec.rb +++ b/spec/lib/export/dwca/data_spec.rb @@ -168,7 +168,7 @@ end specify 'generated headers are restricted to data' do - expect(csv.headers).to contain_exactly(*(['id'] + headers)) + expect(csv.headers).to contain_exactly(*headers) end specify '#meta_fields can be returned, and exclude id' do diff --git a/spec/models/dwc_occurrence_spec.rb b/spec/models/dwc_occurrence_spec.rb index e0763de0cc..5682bceeed 100644 --- a/spec/models/dwc_occurrence_spec.rb +++ b/spec/models/dwc_occurrence_spec.rb @@ -16,6 +16,10 @@ expect(DwcOccurrence.target_columns).to include(:occurrenceID) end + specify '.excluded_columns must include id' do + expect(DwcOccurrence.excluded_columns).to include(:id) + end + specify 'extending predicates' do include ActiveJob::TestHelper