mirror of https://github.com/stashapp/stash.git
Ignore other conflicts in 35 migration
This commit is contained in:
parent
e96a09d9fd
commit
0e0d201ff3
|
@ -250,7 +250,8 @@ INSERT INTO `performers_images_new`
|
||||||
SELECT
|
SELECT
|
||||||
`performer_id`,
|
`performer_id`,
|
||||||
`image_id`
|
`image_id`
|
||||||
FROM `performers_images`;
|
FROM `performers_images` WHERE true
|
||||||
|
ON CONFLICT (`image_id`, `performer_id`) DO NOTHING;
|
||||||
|
|
||||||
DROP TABLE `performers_images`;
|
DROP TABLE `performers_images`;
|
||||||
ALTER TABLE `performers_images_new` rename to `performers_images`;
|
ALTER TABLE `performers_images_new` rename to `performers_images`;
|
||||||
|
@ -332,7 +333,8 @@ INSERT INTO `scenes_galleries_new`
|
||||||
SELECT
|
SELECT
|
||||||
`scene_id`,
|
`scene_id`,
|
||||||
`gallery_id`
|
`gallery_id`
|
||||||
FROM `scenes_galleries`;
|
FROM `scenes_galleries` WHERE true
|
||||||
|
ON CONFLICT (`scene_id`, `gallery_id`) DO NOTHING;
|
||||||
|
|
||||||
DROP TABLE `scenes_galleries`;
|
DROP TABLE `scenes_galleries`;
|
||||||
ALTER TABLE `scenes_galleries_new` rename to `scenes_galleries`;
|
ALTER TABLE `scenes_galleries_new` rename to `scenes_galleries`;
|
||||||
|
@ -359,7 +361,8 @@ INSERT INTO `galleries_images_new`
|
||||||
SELECT
|
SELECT
|
||||||
`gallery_id`,
|
`gallery_id`,
|
||||||
`image_id`
|
`image_id`
|
||||||
FROM `galleries_images`;
|
FROM `galleries_images` WHERE true
|
||||||
|
ON CONFLICT (`gallery_id`, `image_id`) DO NOTHING;
|
||||||
|
|
||||||
DROP TABLE `galleries_images`;
|
DROP TABLE `galleries_images`;
|
||||||
ALTER TABLE `galleries_images_new` rename to `galleries_images`;
|
ALTER TABLE `galleries_images_new` rename to `galleries_images`;
|
||||||
|
|
Loading…
Reference in New Issue