LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2025-01-08 19:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'combined_tables_2' into combined_profile

Browse source
This commit is contained in:
Dessalines 2024-12-08 09:19:04 -05:00
commit cf2b00e0ba
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api_tests/src/shared.ts
View file

@ -208,7 +208,7 @@ async function allowInstance(api: LemmyHttp, instance: string) {
try { try {
await api.adminAllowInstance(params); await api.adminAllowInstance(params);
} catch (error) { } catch (error) {
console.error(error); // console.error(error);
} }
} }

12
migrations/2024-12-02-181601_add_report_combined_table/up.sql
View file

@ -19,23 +19,23 @@ INSERT INTO report_combined (published, post_report_id, comment_report_id, priva
SELECT SELECT
published, published,
id, id,
NULL, NULL::int,
NULL NULL::int
FROM FROM
post_report post_report
UNION ALL UNION ALL
SELECT SELECT
published, published,
NULL, NULL::int,
id, id,
NULL NULL::int
FROM FROM
comment_report comment_report
UNION ALL UNION ALL
SELECT SELECT
published, published,
NULL, NULL::int,
NULL, NULL::int,
id id
FROM FROM
private_message_report; private_message_report;