LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-12-23 03:11:32 +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 {
await api.adminAllowInstance(params);
} 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
published,
id,
NULL,
NULL
NULL::int,
NULL::int
FROM
post_report
UNION ALL
SELECT
published,
NULL,
NULL::int,
id,
NULL
NULL::int
FROM
comment_report
UNION ALL
SELECT
published,
NULL,
NULL,
NULL::int,
NULL::int,
id
FROM
private_message_report;