7878 ANY_USER_ID_SENTINEL ,
7979 BaseProjectDB ,
8080 ProjectAccessRights ,
81+ _build_workbench_subquery ,
8182 assemble_array_groups ,
8283 convert_to_db_names ,
8384 convert_to_schema_names ,
@@ -387,10 +388,11 @@ def _create_private_workspace_query(
387388 ).group_by (project_to_groups .c .project_uuid )
388389 ).subquery ("access_rights_subquery" )
389390
391+ workbench_subquery = _build_workbench_subquery ()
390392 private_workspace_query = (
391393 sa .select (
392394 * PROJECT_DB_COLS ,
393- projects .c .workbench ,
395+ workbench_subquery .c .workbench ,
394396 access_rights_subquery .c .access_rights ,
395397 projects_to_products .c .product_name ,
396398 projects_to_folders .c .folder_id ,
@@ -411,6 +413,10 @@ def _create_private_workspace_query(
411413 isouter = True ,
412414 )
413415 .join (project_tags_subquery , isouter = True )
416+ .outerjoin (
417+ workbench_subquery ,
418+ projects .c .uuid == workbench_subquery .c .project_uuid ,
419+ )
414420 )
415421 .where (
416422 (
@@ -469,10 +475,11 @@ def _create_shared_workspace_query(
469475 ).group_by (workspaces_access_rights .c .workspace_id )
470476 ).subquery ("workspace_access_rights_subquery" )
471477
478+ workbench_subquery = _build_workbench_subquery ()
472479 shared_workspace_query = (
473480 sa .select (
474481 * PROJECT_DB_COLS ,
475- projects .c .workbench ,
482+ workbench_subquery .c .workbench ,
476483 workspace_access_rights_subquery .c .access_rights ,
477484 projects_to_products .c .product_name ,
478485 projects_to_folders .c .folder_id ,
@@ -497,6 +504,10 @@ def _create_shared_workspace_query(
497504 isouter = True ,
498505 )
499506 .join (project_tags_subquery , isouter = True )
507+ .outerjoin (
508+ workbench_subquery ,
509+ projects .c .uuid == workbench_subquery .c .project_uuid ,
510+ )
500511 )
501512 .where (
502513 (
0 commit comments