1 files changed, 13 insertions, 5 deletions
diff --git a/app/models/referential.rb b/app/models/referential.rb
index 09c2e7d34..91a88d02d 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -408,6 +408,7 @@ class Referential < ActiveRecord::Base
       end
 
       check_migration_count(report)
+      # raise "Wrong migration count: #{migration_count}" if migration_count < 300
     end
   end
 
@@ -417,13 +418,20 @@ class Referential < ActiveRecord::Base
   end
 
   def migration_count
-    if self.class.connection.table_exists?("#{slug}.schema_migrations")
-      self.class.connection.select_value("select count(*) from #{slug}.schema_migrations;")
-    end
+    raw_value =
+      if self.class.connection.table_exists?("#{slug}.schema_migrations")
+        self.class.connection.select_value("select count(*) from #{slug}.schema_migrations;")
+      end
+
+    raw_value.to_i
   end
 
-  def assign_slug
-    self.slug ||= "#{name.parameterize.gsub('-', '_')}_#{Time.now.to_i}" if name
+  def assign_slug(time_reference = Time)
+    self.slug ||= begin
+      prefix = name.parameterize.gsub('-','_').gsub(/[^a-zA-Z_]/,'').gsub(/^_/,'')
+      prefix = "referential" if prefix.blank?
+      "#{prefix}_#{time_reference.now.to_i}"
+    end if name
   end
 
   def assign_prefix