Merge pull request #2856 from sap-contributions/override-dataset-any

Use Sequel's any_not_empty extension
cloudfoundry · Sep 12, 2022 · 5b358a0 · 5b358a0
2 parents acf3f08 + e075d01
commit 5b358a0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/app/models/services/service_broker.rb b/app/models/services/service_broker.rb
@@ -47,11 +47,11 @@ def space_scoped?
     end
 
     def has_service_instances?
-      !VCAP::CloudController::ServiceInstance.
+      VCAP::CloudController::ServiceInstance.
         join(:service_plans, id: :service_plan_id).
         join(:services, id: :service_id).
         where(services__service_broker_id: id).
-        empty?
+        any?
     end
 
     def self.user_visibility_filter(user)

diff --git a/lib/cloud_controller/db.rb b/lib/cloud_controller/db.rb
@@ -94,6 +94,7 @@ def self.load_models_without_migrations_check(db_config, logger)
 Sequel::Model.plugin :validation_helpers
 
 Sequel::Database.extension(:current_datetime_timestamp)
+Sequel::Database.extension(:any_not_empty)
 
 require 'cloud_controller/encryptor'
 Sequel::Model.include VCAP::CloudController::Encryptor::FieldEncryptor

diff --git a/spec/unit/models/services/service_broker_spec.rb b/spec/unit/models/services/service_broker_spec.rb
@@ -213,7 +213,7 @@ module VCAP::CloudController
         end
 
         it 'does a single db query' do
-          expect { service_broker.has_service_instances? }.to have_queried_db_times(/select/i, 1)
+          expect { service_broker.has_service_instances? }.to have_queried_db_times(/select 1.*limit 1/i, 1)
         end
       end
 
@@ -223,7 +223,7 @@ module VCAP::CloudController
         end
 
         it 'does a single db query' do
-          expect { service_broker.has_service_instances? }.to have_queried_db_times(/select/i, 1)
+          expect { service_broker.has_service_instances? }.to have_queried_db_times(/select 1.*limit 1/i, 1)
         end
       end
     end