From 596960f35a0d57672ef1594897f8014d7db337ca Mon Sep 17 00:00:00 2001 From: Omar Roth Date: Tue, 30 Oct 2018 10:03:03 -0500 Subject: [PATCH] Remove migration points --- src/invidious/channels.cr | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/src/invidious/channels.cr b/src/invidious/channels.cr index 877d0279..d3f4588d 100644 --- a/src/invidious/channels.cr +++ b/src/invidious/channels.cr @@ -97,20 +97,12 @@ def fetch_channel(ucid, client, db, pull_all_videos = true) db.exec("UPDATE users SET notifications = notifications || $1 \ WHERE updated < $2 AND $3 = ANY(subscriptions) AND $1 <> ALL(notifications)", video.id, video.published, ucid) - # Migration point - video_array = video.to_a[0..-2] - # video_array = video.to_a - + video_array = video.to_a args = arg_array(video_array) - # Migration point db.exec("INSERT INTO channel_videos VALUES (#{args}) \ - ON CONFLICT (id) DO UPDATE SET title = $2, published = $3, \ - updated = $4, ucid = $5, author = $6", video_array) - - # db.exec("INSERT INTO channel_videos VALUES (#{args}) \ - # ON CONFLICT (id) DO UPDATE SET title = $2, published = $3, \ - # updated = $4, ucid = $5, author = $6, length_seconds = $7", video_array) + ON CONFLICT (id) DO UPDATE SET title = $2, published = $3, \ + updated = $4, ucid = $5, author = $6, length_seconds = $7", video_array) end else page = 1 @@ -147,18 +139,11 @@ def fetch_channel(ucid, client, db, pull_all_videos = true) db.exec("UPDATE users SET notifications = notifications || $1 \ WHERE updated < $2 AND $3 = ANY(subscriptions) AND $1 <> ALL(notifications)", video.id, video.published, video.ucid) - # Migration point - video_array = video.to_a[0..-2] - # video_array = video.to_a - + video_array = video.to_a args = arg_array(video_array) - # Migration point db.exec("INSERT INTO channel_videos VALUES (#{args}) ON CONFLICT (id) DO UPDATE SET title = $2, \ - published = $3, updated = $4, ucid = $5, author = $6", video_array) - - # db.exec("INSERT INTO channel_videos VALUES (#{args}) ON CONFLICT (id) DO UPDATE SET title = $2, \ - # published = $3, updated = $4, ucid = $5, author = $6, length_seconds = $7", video_array) + published = $3, updated = $4, ucid = $5, author = $6, length_seconds = $7", video_array) end end