Merge pull request #20614 from d-m-u/tenant_uniqueness_when_changed

use uniqueness when changed for tenant

app/models/tenant.rb

@@ -43,14 +43,14 @@ class Tenant < ApplicationRecord
   belongs_to :default_miq_group, :class_name => "MiqGroup", :dependent => :destroy
   belongs_to :source, :polymorphic => true
 
-  validates :subdomain, :uniqueness => true, :allow_nil => true
-  validates :domain,    :uniqueness => true, :allow_nil => true
+  validates :subdomain, :uniqueness_when_changed => true, :allow_nil => true
+  validates :domain,    :uniqueness_when_changed => true, :allow_nil => true
   validate  :validate_only_one_root
   validates :description, :presence => true
-  validates :name, :presence => true, :unless => :use_config_for_attributes?
-  validates :name, :uniqueness => {:scope      => :ancestry,
-                                   :conditions => -> { in_my_region },
-                                   :message    => "should be unique per parent"}
+  validates :name, :presence                  => true, :unless => :use_config_for_attributes?,
+                   :uniqueness_when_changed   => {:scope      => :ancestry,
+                                                  :conditions => -> { in_my_region },
+                                                  :message    => "should be unique per parent"}
   validate :validate_default_tenant, :on => :update, :if => :saved_change_to_default_miq_group_id?
 
   scope :all_tenants,  -> { where(:divisible => true) }

spec/models/tenant_spec.rb

@@ -17,6 +17,11 @@
     Tenant.seed
   end
 
+  it "doesn't access database when unchanged model is saved" do
+    m = described_class.create!(:parent => described_class.create!)
+    expect { m.valid? }.not_to make_database_queries
+  end
+
   describe "#default_tenant" do
     it "has a default tenant" do
       expect(default_tenant).to be_truthy