Re-add code to avoid conflict with other MR

3 files changed, 6 insertions, 4 deletions

diff --git a/app/models/concerns/descendant.rb b/app/models/concerns/descendant.rb
index fd195ae20f5..4c436522122 100644
--- a/app/models/concerns/descendant.rb
+++ b/app/models/concerns/descendant.rb
@@ -5,8 +5,7 @@ module Descendant
 
   class_methods do
     def supports_nested_objects?
-      # TODO: Refactor and remove https://gitlab.com/gitlab-org/gitlab-ce/issues/65056
-      true
+      Gitlab::Database.postgresql?
     end
   end
 end
diff --git a/lib/gitlab/object_hierarchy.rb b/lib/gitlab/object_hierarchy.rb
index e57651dbf64..38b32770e90 100644
--- a/lib/gitlab/object_hierarchy.rb
+++ b/lib/gitlab/object_hierarchy.rb
@@ -136,8 +136,7 @@ module Gitlab
     private
 
     def hierarchy_supported?
-      # TODO: Refactor and remove unused method (https://gitlab.com/gitlab-org/gitlab-ce/issues/65055)
-      true
+      Gitlab::Database.postgresql?
     end
 
     # rubocop: disable CodeReuse/ActiveRecord
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 94cd944db3d..a44b5069ade 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -262,6 +262,10 @@ RSpec.configure do |config|
     example.run if Group.supports_nested_objects?
   end
 
+  config.around(:each, :postgresql) do |example|
+    example.run if Gitlab::Database.postgresql?
+  end
+
   # This makes sure the `ApplicationController#can?` method is stubbed with the
   # original implementation for all view specs.
   config.before(:each, type: :view) do