Skip to content

Use subquery on session search so we can do SELECT DISTINCT correctly #997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nonprofittechy merged 1 commit into from
Dec 1, 2025
Merged

Use subquery on session search so we can do SELECT DISTINCT correctly #997

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 60 additions & 54 deletions docassemble/AssemblyLine/sessions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,38 +379,39 @@ def get_saved_interview_list(
filenames_to_exclude.extend([current_filename, filename_to_exclude])

query_draft = """
SELECT DISTINCT ON (userdict.key) userdict.indexno
,userdict.filename as filename
,num_keys
,userdictkeys.user_id as user_id
,userdict.modtime as modtime
,userdict.key as key
,jsonstorage.data->'auto_title' as auto_title
,jsonstorage.data->'title' as title
,jsonstorage.data->'description' as description
,jsonstorage.data->'steps' as steps
,jsonstorage.data->'progress' as progress
,jsonstorage.data->'original_interview_filename' as original_interview_filename
,jsonstorage.data->'answer_count' as answer_count
,jsonstorage.data as data
FROM userdict
NATURAL JOIN
(
SELECT key
,MAX(modtime) AS modtime
,COUNT(key) AS num_keys
FROM userdict
GROUP BY key
) mostrecent
LEFT JOIN userdictkeys
ON userdictkeys.key = userdict.key
LEFT JOIN jsonstorage
ON userdict.key = jsonstorage.key AND (jsonstorage.tags = :metadata)
WHERE (userdictkeys.user_id = :user_id or :user_id is null)
AND (userdict.filename = :filename OR :filename is null)
AND (userdict.filename NOT IN :filenames_to_exclude)
AND (NOT :exclude_newly_started_sessions OR num_keys > 1)
"""
SELECT * FROM (
SELECT DISTINCT ON (userdict.key) userdict.indexno
,userdict.filename as filename
,num_keys
,userdictkeys.user_id as user_id
,userdict.modtime as modtime
,userdict.key as key
,jsonstorage.data->'auto_title' as auto_title
,jsonstorage.data->'title' as title
,jsonstorage.data->'description' as description
,jsonstorage.data->'steps' as steps
,jsonstorage.data->'progress' as progress
,jsonstorage.data->'original_interview_filename' as original_interview_filename
,jsonstorage.data->'answer_count' as answer_count
,jsonstorage.data as data
FROM userdict
NATURAL JOIN
(
SELECT key
,MAX(modtime) AS modtime
,COUNT(key) AS num_keys
FROM userdict
GROUP BY key
) mostrecent
LEFT JOIN userdictkeys
ON userdictkeys.key = userdict.key
LEFT JOIN jsonstorage
ON userdict.key = jsonstorage.key AND (jsonstorage.tags = :metadata)
WHERE (userdictkeys.user_id = :user_id or :user_id is null)
AND (userdict.filename = :filename OR :filename is null)
AND (userdict.filename NOT IN :filenames_to_exclude)
AND (NOT :exclude_newly_started_sessions OR num_keys > 1)
"""
if packages_to_exclude:
query_draft += (
"""
Expand All @@ -424,7 +425,9 @@ def get_saved_interview_list(
"""
)
query_draft += """
ORDER BY modtime desc
ORDER BY userdict.key, modtime DESC
) AS unique_sessions
ORDER BY modtime DESC
LIMIT :limit
OFFSET :offset;
"""
Expand Down Expand Up @@ -589,27 +592,30 @@ def find_matching_sessions(

get_sessions_query = text(
f"""
SELECT DISTINCT ON (userdict.key) userdict.indexno,
userdict.filename as filename,
num_keys,
userdictkeys.user_id as user_id,
userdict.modtime as modtime,
userdict.key as key,
{', '.join(f"jsonstorage.data->>{repr(column)} as {column}" for column in metadata_column_names)},
jsonstorage.data as data
FROM userdict
NATURAL JOIN (
SELECT key, MAX(modtime) AS modtime, COUNT(key) AS num_keys
FROM userdict
GROUP BY key
) mostrecent
LEFT JOIN userdictkeys ON userdictkeys.key = userdict.key
LEFT JOIN jsonstorage ON userdict.key = jsonstorage.key AND (jsonstorage.tags = :metadata)
WHERE (userdictkeys.user_id = :user_id OR :user_id is NULL)
AND {filename_condition}
AND (userdict.filename NOT IN :filenames_to_exclude)
AND (NOT :exclude_newly_started_sessions OR num_keys > 1)
AND ({metadata_search_conditions})
SELECT * FROM (
SELECT DISTINCT ON (userdict.key) userdict.indexno,
userdict.filename as filename,
num_keys,
userdictkeys.user_id as user_id,
userdict.modtime as modtime,
userdict.key as key,
{', '.join(f"jsonstorage.data->>{repr(column)} as {column}" for column in metadata_column_names)},
jsonstorage.data as data
FROM userdict
NATURAL JOIN (
SELECT key, MAX(modtime) AS modtime, COUNT(key) AS num_keys
FROM userdict
GROUP BY key
) mostrecent
LEFT JOIN userdictkeys ON userdictkeys.key = userdict.key
LEFT JOIN jsonstorage ON userdict.key = jsonstorage.key AND (jsonstorage.tags = :metadata)
WHERE (userdictkeys.user_id = :user_id OR :user_id is NULL)
AND {filename_condition}
AND (userdict.filename NOT IN :filenames_to_exclude)
AND (NOT :exclude_newly_started_sessions OR num_keys > 1)
AND ({metadata_search_conditions})
ORDER BY userdict.key, modtime DESC
) AS unique_sessions
ORDER BY modtime DESC
LIMIT :limit OFFSET :offset;
"""
Expand Down
Loading