fix migrations for travis

2 files changed, 18 insertions, 12 deletions

diff --git a/db/migrate/20140113094406_move_options_to_parameter_set_import_task.rb b/db/migrate/20140113094406_move_options_to_parameter_set_import_task.rb
index cb12aa3c4..fb2b6475e 100644
--- a/db/migrate/20140113094406_move_options_to_parameter_set_import_task.rb
+++ b/db/migrate/20140113094406_move_options_to_parameter_set_import_task.rb
@@ -1,17 +1,17 @@
 class MoveOptionsToParameterSetImportTask < ActiveRecord::Migration
   def up
-    ImportTask.all.each do |import|
-      import.parameter_set.tap do |parameter_set|
-        parameter_set = {} if parameter_set.nil?
-        import.resources = "dummy"
-        import.update_attribute :format, "Neptune"
-        import.update_attribute :no_save, false
-        result = import.update_attribute( :parameter_set, {  :no_save => import.attributes[ "no_save"],
-                                                      :file_path => import.attributes[ "file_path"],
-                                                      :format => import.attributes[ "format"]}.merge( parameter_set))
-        raise Exception.new("Echec id=#{import.id}, import.valid? #{import.valid?}, import.erros #{import.errors.inspect}") unless result
-      end
-    end
+    # ImportTask.all.each do |import|
+    #   import.parameter_set.tap do |parameter_set|
+    #     parameter_set = {} if parameter_set.nil?
+    #     import.resources = "dummy"
+    #     import.update_attribute :format, "Neptune"
+    #     import.update_attribute :no_save, false
+    #     result = import.update_attribute( :parameter_set, {  :no_save => import.attributes[ "no_save"],
+    #                                                   :file_path => import.attributes[ "file_path"],
+    #                                                   :format => import.attributes[ "format"]}.merge( parameter_set))
+    #     raise Exception.new("Echec id=#{import.id}, import.valid? #{import.valid?}, import.erros #{import.errors.inspect}") unless result
+    #   end
+    # end
   end
 
   def down
diff --git a/db/migrate/20150219175300_insert_default_organisation.rb b/db/migrate/20150219175300_insert_default_organisation.rb
index 3742cede8..c8e97b562 100644
--- a/db/migrate/20150219175300_insert_default_organisation.rb
+++ b/db/migrate/20150219175300_insert_default_organisation.rb
@@ -1,4 +1,10 @@
 class InsertDefaultOrganisation < ActiveRecord::Migration
+  class Organisation  < ActiveRecord::Base
+    attr_accessor :name
+
+    has_many :rule_parameter_sets, :dependent => :destroy
+  end
+  
   def up
     organisation = Organisation.find_or_create_by!(:name => "Chouette")
     Referential.where(  :organisation_id => nil).each do |r|