github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-19 05:59:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Truncate bookmarks.name when remapping

Browse Source 
The new name may be too long for the bookmarks.name column and raise an
exception. This changes allows the remapper to truncate the new value to
fit (truncates to 100 characters).
This commit is contained in:
Bianca Nenciu 2024-12-11 18:23:30 +02:00 committed by Michael Brown
parent 8bd55c35fb
commit a835fd99bd
2 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/db_helper.rb
View File

@ -18,7 +18,7 @@ class DbHelper
WHERE trigger_name LIKE '%_readonly'
SQL
TRUNCATABLE_COLUMNS = ["topic_links.url"]
TRUNCATABLE_COLUMNS = %w[bookmarks.name topic_links.url]
def self.remap(
from,

64
spec/lib/db_helper_spec.rb
View File

@ -1,10 +1,10 @@
# frozen_string_literal: true
RSpec.describe DbHelper do
fab!(:bookmark1) { Fabricate(:bookmark, name: "short-bookmark") }
fab!(:bookmark2) { Fabricate(:bookmark, name: "another-bookmark") }
let(:bookmark_name_limit) { Bookmark.columns_hash["name"].limit }
let(:long_bookmark_name) { "a" * (bookmark_name_limit + 1) }
fab!(:sidebar_url1) { Fabricate(:sidebar_url, name: "short-sidebar-url") }
fab!(:sidebar_url2) { Fabricate(:sidebar_url, name: "another-sidebar-url") }
let(:sidebar_url_name_limit) { SidebarUrl.columns_hash["name"].limit }
let(:long_sidebar_url_name) { "a" * (sidebar_url_name_limit + 1) }
describe ".remap" do
it "should remap columns properly" do
@ -52,39 +52,39 @@ RSpec.describe DbHelper do
context "when skip_max_length_violations is false" do
it "raises an exception if remap exceeds column length constraint by default" do
expect { DbHelper.remap("bookmark", long_bookmark_name) }.to raise_error(
expect { DbHelper.remap("sidebar-url", long_sidebar_url_name) }.to raise_error(
PG::StringDataRightTruncation,
/value too long.*table: bookmarks,.*name/,
/value too long.*table: sidebar_urls,.*name/,
)
end
end
context "when skip_max_length_violations is true" do
it "skips a remap eligible row if new value exceeds column length constraint" do
DbHelper.remap("bookmark", long_bookmark_name, skip_max_length_violations: true)
DbHelper.remap("sidebar-url", long_sidebar_url_name, skip_max_length_violations: true)
bookmark1.reload
bookmark2.reload
sidebar_url1.reload
sidebar_url2.reload
expect(bookmark1.name).to eq("short-bookmark")
expect(bookmark2.name).to eq("another-bookmark")
expect(sidebar_url1.name).to eq("short-sidebar-url")
expect(sidebar_url2.name).to eq("another-sidebar-url")
end
it "logs skipped remaps due to max length constraints when verbose is true" do
expect {
DbHelper.remap(
"bookmark",
long_bookmark_name,
"sidebar-url",
long_sidebar_url_name,
verbose: true,
skip_max_length_violations: true,
)
}.to output(/SKIPPED:/).to_stdout
bookmark1.reload
bookmark2.reload
sidebar_url1.reload
sidebar_url2.reload
expect(bookmark1.name).to eq("short-bookmark")
expect(bookmark2.name).to eq("another-bookmark")
expect(sidebar_url1.name).to eq("short-sidebar-url")
expect(sidebar_url2.name).to eq("another-sidebar-url")
end
end
end
@ -100,39 +100,43 @@ RSpec.describe DbHelper do
context "when skip_max_length_violations is false" do
it "raises an exception if regexp_replace exceeds column length constraint by default" do
expect { DbHelper.regexp_replace("bookmark", long_bookmark_name) }.to raise_error(
expect { DbHelper.regexp_replace("sidebar-url", long_sidebar_url_name) }.to raise_error(
PG::StringDataRightTruncation,
/value too long.*table: bookmarks,.*name/,
/value too long.*table: sidebar_urls,.*name/,
)
end
end
context "when skip_max_length_violations is true" do
it "skips regexp_replace eligible rows if new value exceeds column length constraint" do
DbHelper.regexp_replace("bookmark", long_bookmark_name, skip_max_length_violations: true)
DbHelper.regexp_replace(
"sidebar-url",
long_sidebar_url_name,
skip_max_length_violations: true,
)
bookmark1.reload
bookmark2.reload
sidebar_url1.reload
sidebar_url2.reload
expect(bookmark1.name).to eq("short-bookmark")
expect(bookmark2.name).to eq("another-bookmark")
expect(sidebar_url1.name).to eq("short-sidebar-url")
expect(sidebar_url2.name).to eq("another-sidebar-url")
end
it "logs skipped regexp_replace due to max length constraints when verbose is true" do
expect {
DbHelper.regexp_replace(
"bookmark",
long_bookmark_name,
"sidebar-url",
long_sidebar_url_name,
verbose: true,
skip_max_length_violations: true,
)
}.to output(/SKIPPED:/).to_stdout
bookmark1.reload
bookmark2.reload
sidebar_url1.reload
sidebar_url2.reload
expect(bookmark1.name).to eq("short-bookmark")
expect(bookmark2.name).to eq("another-bookmark")
expect(sidebar_url1.name).to eq("short-sidebar-url")
expect(sidebar_url2.name).to eq("another-sidebar-url")
end
end
end