[superset] 06/07: solve conflict

[hu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hugh pushed a commit to branch 2023.13.1
in repository https://gitbox.apache.org/repos/asf/superset.git

commit 971c6c3d2f874bd46d6780c2f03e94c23bc20100
Author: Akshay Kumar Sharma <ak...@gmail.com>
AuthorDate: Tue Apr 11 02:07:16 2023 +0530

    solve conflict
---
 superset/models/sql_lab.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset/models/sql_lab.py b/superset/models/sql_lab.py
index f12c8d6c45..11ea7ef528 100644
--- a/superset/models/sql_lab.py
+++ b/superset/models/sql_lab.py
@@ -372,7 +372,7 @@ class SavedQuery(Model, AuditMixinNullable, ExtraJSONMixin, ImportExportMixin):
             secondary="tagged_object",
             primaryjoin="and_(SavedQuery.id == TaggedObject.object_id)",
             secondaryjoin="and_(TaggedObject.tag_id == Tag.id, "
-            "TaggedObject.object_type == 'saved_query')",
+            "TaggedObject.object_type == 'query')",
         )
 
     export_parent = "database"