Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/gitlab/sql/cte.rb b/lib/gitlab/sql/cte.rb
index 8f37602aeaa..67f61e0db40 100644
--- a/lib/gitlab/sql/cte.rb
+++ b/lib/gitlab/sql/cte.rb
@@ -33,7 +33,7 @@ module Gitlab
 
       # Returns the Arel relation for this CTE.
       def to_arel
-        sql = Arel::Nodes::SqlLiteral.new("(#{query.to_sql})")
+        sql = Arel::Nodes::SqlLiteral.new("(#{query_as_sql})")
 
         Gitlab::Database::AsWithMaterialized.new(table, sql, materialized: @materialized)
       end
@@ -54,6 +54,12 @@ module Gitlab
           .with(to_arel)
           .from(alias_to(relation.model.arel_table))
       end
+
+      private
+
+      def query_as_sql
+        query.is_a?(String) ? query : query.to_sql
+      end
     end
   end
 end