From 6b3ec116493424b3a405073247c76a65c61bbd10 Mon Sep 17 00:00:00 2001 From: Daniel Andreasen Date: Thu, 20 Mar 2025 13:27:01 +0100 Subject: [PATCH 1/2] update sql export queries --- data-export/export_document_collections_with_meta.sql | 1 + data-export/export_documents_with_meta.sql | 4 ++-- data-export/export_external_with_meta.sql | 1 + data-export/export_folding_parts_of_documents.sql | 1 + data-export/export_news_posts_with_meta.sql | 1 + data-export/export_q_and_a_with_meta.sql | 2 ++ data-export/export_static_pages_with_meta.sql | 1 + 7 files changed, 9 insertions(+), 2 deletions(-) diff --git a/data-export/export_document_collections_with_meta.sql b/data-export/export_document_collections_with_meta.sql index 7cec356c5..3a9015a59 100644 --- a/data-export/export_document_collections_with_meta.sql +++ b/data-export/export_document_collections_with_meta.sql @@ -1,3 +1,4 @@ +-- USE local_loop; Select n_fd.nid, n_fd.type, diff --git a/data-export/export_documents_with_meta.sql b/data-export/export_documents_with_meta.sql index 7dc04087a..d7b457158 100644 --- a/data-export/export_documents_with_meta.sql +++ b/data-export/export_documents_with_meta.sql @@ -167,7 +167,7 @@ left join ( left join paragraph__os2loop_documents_tbl_desc as tbl_desc on tbl_content.entity_id = tbl_desc.entity_id ) as tbl on n_ddc.os2loop_documents_document_conte_target_id = tbl.entity_id -- where para_ifd.`type` = 'os2loop_documents_table' -- returns 3 of 16 records - left join paragraph__os2loop_documents_title as doc_title on n_ddc.os2loop_documents_document_conte_target_id = doc_title.entity_id + left join `local_loop`.`paragraph__os2loop_documents_title` as doc_title on n_ddc.os2loop_documents_document_conte_target_id = doc_title.entity_id left join paragraph__os2loop_documents_description as doc_desc on n_ddc.os2loop_documents_document_conte_target_id = doc_desc.entity_id -- all para doc desc relates to bundle step_by_step -- we miss content on step by step paragraphs, (we only have description so far) this must be added post querying using the dedicated query export_folding_parts_of_documents after it have been post-processed by the preprocess_loop_document_folding_parts.py -- we ignore table of contents as this does not add any additional information conveying text @@ -194,4 +194,4 @@ left join ( where n_st.bundle = 'os2loop_documents_document' group by n_st.entity_id) tags on n_fd.nid = tags.entity_id left join node__os2loop_shared_rev_date as rev_date on n_fd.nid = rev_date.entity_id -left join node__os2loop_shared_version as `version` on n_fd.nid = `version`.entity_id +left join node__os2loop_shared_version as `version` on n_fd.nid = `version`.entity_id \ No newline at end of file diff --git a/data-export/export_external_with_meta.sql b/data-export/export_external_with_meta.sql index f40105e43..0732cb329 100644 --- a/data-export/export_external_with_meta.sql +++ b/data-export/export_external_with_meta.sql @@ -1,3 +1,4 @@ +-- USE local_loop; Select n_fd.nid, n_fd.type, diff --git a/data-export/export_folding_parts_of_documents.sql b/data-export/export_folding_parts_of_documents.sql index 657e44a8b..cdc9b3f14 100644 --- a/data-export/export_folding_parts_of_documents.sql +++ b/data-export/export_folding_parts_of_documents.sql @@ -1,3 +1,4 @@ +-- USE local_loop; SELECT steps.bundle as step_bundle, steps.entity_id, diff --git a/data-export/export_news_posts_with_meta.sql b/data-export/export_news_posts_with_meta.sql index f719f1ab5..f2b8038cc 100644 --- a/data-export/export_news_posts_with_meta.sql +++ b/data-export/export_news_posts_with_meta.sql @@ -1,3 +1,4 @@ +-- USE local_loop; Select n_fd.nid, n_fd.type, diff --git a/data-export/export_q_and_a_with_meta.sql b/data-export/export_q_and_a_with_meta.sql index f7e321a1a..f9d0c25a0 100644 --- a/data-export/export_q_and_a_with_meta.sql +++ b/data-export/export_q_and_a_with_meta.sql @@ -1,3 +1,4 @@ +-- USE local_loop; WITH media_attachments AS (SELECT media_collected.mid, fm.uri, -- where public:// -> https://loop.sundhedogomsorg.dk/sites/loop.sundhedogomsorg.dk/files/ @@ -61,6 +62,7 @@ answer_attachment AS (SELECT Select -- *, n_fd.title as title, + n_fd.nid as nid, pa.alias as relative_public_url, n_qc.os2loop_question_content_value as question, DATE_FORMAT(FROM_UNIXTIME(n_fd.created), '%Y-%m-%dT%H:%i:%s') as question_created, diff --git a/data-export/export_static_pages_with_meta.sql b/data-export/export_static_pages_with_meta.sql index 11894dc5e..2cff985d9 100644 --- a/data-export/export_static_pages_with_meta.sql +++ b/data-export/export_static_pages_with_meta.sql @@ -1,3 +1,4 @@ +-- USE local_loop; Select n_fd.nid, n_fd.type, From e60c91145c711a0f87c3c1b2eb596ff7b5cb67df Mon Sep 17 00:00:00 2001 From: Daniel Andreasen Date: Fri, 21 Mar 2025 11:13:47 +0100 Subject: [PATCH 2/2] fix newly introduced bug --- data-export/export_document_collections_with_meta.sql | 1 - data-export/export_documents_with_meta.sql | 2 +- data-export/export_external_with_meta.sql | 1 - data-export/export_folding_parts_of_documents.sql | 1 - data-export/export_news_posts_with_meta.sql | 1 - data-export/export_q_and_a_with_meta.sql | 1 - data-export/export_static_pages_with_meta.sql | 1 - 7 files changed, 1 insertion(+), 7 deletions(-) diff --git a/data-export/export_document_collections_with_meta.sql b/data-export/export_document_collections_with_meta.sql index 3a9015a59..7cec356c5 100644 --- a/data-export/export_document_collections_with_meta.sql +++ b/data-export/export_document_collections_with_meta.sql @@ -1,4 +1,3 @@ --- USE local_loop; Select n_fd.nid, n_fd.type, diff --git a/data-export/export_documents_with_meta.sql b/data-export/export_documents_with_meta.sql index d7b457158..575680396 100644 --- a/data-export/export_documents_with_meta.sql +++ b/data-export/export_documents_with_meta.sql @@ -167,7 +167,7 @@ left join ( left join paragraph__os2loop_documents_tbl_desc as tbl_desc on tbl_content.entity_id = tbl_desc.entity_id ) as tbl on n_ddc.os2loop_documents_document_conte_target_id = tbl.entity_id -- where para_ifd.`type` = 'os2loop_documents_table' -- returns 3 of 16 records - left join `local_loop`.`paragraph__os2loop_documents_title` as doc_title on n_ddc.os2loop_documents_document_conte_target_id = doc_title.entity_id + left join `paragraph__os2loop_documents_title` as doc_title on n_ddc.os2loop_documents_document_conte_target_id = doc_title.entity_id left join paragraph__os2loop_documents_description as doc_desc on n_ddc.os2loop_documents_document_conte_target_id = doc_desc.entity_id -- all para doc desc relates to bundle step_by_step -- we miss content on step by step paragraphs, (we only have description so far) this must be added post querying using the dedicated query export_folding_parts_of_documents after it have been post-processed by the preprocess_loop_document_folding_parts.py -- we ignore table of contents as this does not add any additional information conveying text diff --git a/data-export/export_external_with_meta.sql b/data-export/export_external_with_meta.sql index 0732cb329..f40105e43 100644 --- a/data-export/export_external_with_meta.sql +++ b/data-export/export_external_with_meta.sql @@ -1,4 +1,3 @@ --- USE local_loop; Select n_fd.nid, n_fd.type, diff --git a/data-export/export_folding_parts_of_documents.sql b/data-export/export_folding_parts_of_documents.sql index cdc9b3f14..657e44a8b 100644 --- a/data-export/export_folding_parts_of_documents.sql +++ b/data-export/export_folding_parts_of_documents.sql @@ -1,4 +1,3 @@ --- USE local_loop; SELECT steps.bundle as step_bundle, steps.entity_id, diff --git a/data-export/export_news_posts_with_meta.sql b/data-export/export_news_posts_with_meta.sql index f2b8038cc..f719f1ab5 100644 --- a/data-export/export_news_posts_with_meta.sql +++ b/data-export/export_news_posts_with_meta.sql @@ -1,4 +1,3 @@ --- USE local_loop; Select n_fd.nid, n_fd.type, diff --git a/data-export/export_q_and_a_with_meta.sql b/data-export/export_q_and_a_with_meta.sql index f9d0c25a0..90140932f 100644 --- a/data-export/export_q_and_a_with_meta.sql +++ b/data-export/export_q_and_a_with_meta.sql @@ -1,4 +1,3 @@ --- USE local_loop; WITH media_attachments AS (SELECT media_collected.mid, fm.uri, -- where public:// -> https://loop.sundhedogomsorg.dk/sites/loop.sundhedogomsorg.dk/files/ diff --git a/data-export/export_static_pages_with_meta.sql b/data-export/export_static_pages_with_meta.sql index 2cff985d9..11894dc5e 100644 --- a/data-export/export_static_pages_with_meta.sql +++ b/data-export/export_static_pages_with_meta.sql @@ -1,4 +1,3 @@ --- USE local_loop; Select n_fd.nid, n_fd.type,