Merge master

1 files changed, 2 insertions, 17 deletions

diff --git a/db/migrate/20150312104557_set_default_value_for_data_format_in_organisation.rb b/db/migrate/20150312104557_set_default_value_for_data_format_in_organisation.rb
index 9efd941c4..03d48e0bb 100644
--- a/db/migrate/20150312104557_set_default_value_for_data_format_in_organisation.rb
+++ b/db/migrate/20150312104557_set_default_value_for_data_format_in_organisation.rb
@@ -1,22 +1,7 @@
 class SetDefaultValueForDataFormatInOrganisation < ActiveRecord::Migration
   def change
-    Organisation.all.each do |organisation|
-      if organisation.data_format.neptune?
-        organisation.update_attributes :data_format => "neptune"
-      end
-    end
-    Referential.all.each do |referential|
-      if referential.data_format.neptune?
-        referential.update_attributes :data_format => "neptune"
-      elsif referential.data_format.netex?
-        referential.update_attributes :data_format => "netex"
-      elsif referential.data_format.gtfs?
-        referential.update_attributes :data_format => "gtfs"
-      elsif referential.data_format.hub?
-        referential.update_attributes :data_format => "hub"
-      end
-    end
-    
+    Organisation.where(data_format: nil).update_all(data_format: "neptune")
+    execute "update referentials set data_format = organisations.data_format from organisations where referentials.data_format is null and referentials.organisation_id = organisations.id"
     change_column :organisations, :data_format, :string, :default => "neptune"
   end
 end