carrier.rb in earth-0.11.11

- old
+ new

@@ -1,16 +1,17 @@
 class Carrier < ActiveRecord::Base
-  set_primary_key :name
+  self.primary_key = "name"
   
   has_many :carrier_modes, :foreign_key => 'carrier_name', :primary_key => 'name'
   
   # TODO calculate these
   falls_back_on :route_inefficiency_factor => 1.03,
                 :transport_emission_factor => 0.0005266,
                 :corporate_emission_factor => 0.221
   
   col :name
+  col :full_name
   col :package_volume, :type => :float
   col :route_inefficiency_factor, :type => :float
   col :transport_emission_factor, :type => :float
   col :transport_emission_factor_units
   col :corporate_emission_factor, :type => :float
@@ -62,6 +63,6 @@
   #       raise "Missing corporate emission factor units for Carrier #{carrier.name}"
   #     end
   #   end
   # end
   
-end
\ No newline at end of file
+end