jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tag implications: convert descendant_names to array (#3987).

Browse Source
This commit is contained in:
evazion
2018-11-14 12:46:35 -06:00
parent 308a5021b4
commit fe2698a011
4 changed files with 49 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/tag_implication.rb
View File

@@ -1,6 +1,8 @@
class TagImplication < TagRelationship class TagImplication < TagRelationship
extend Memoist extend Memoist
array_attribute :descendant_names
before_save :update_descendant_names before_save :update_descendant_names
after_save :update_descendant_names_for_parents after_save :update_descendant_names_for_parents
after_destroy :update_descendant_names_for_parents after_destroy :update_descendant_names_for_parents
@@ -22,7 +24,7 @@ class TagImplication < TagRelationship
module ClassMethods module ClassMethods
# assumes names are normalized # assumes names are normalized
def with_descendants(names) def with_descendants(names)
(names + active.where(antecedent_name: names).flat_map(&:descendant_names_array)).uniq (names + active.where(antecedent_name: names).flat_map(&:descendant_names)).uniq
end end
def automatic_tags_for(names) def automatic_tags_for(names)
@@ -44,12 +46,8 @@ class TagImplication < TagRelationship
end end
memoize :descendants memoize :descendants
def descendant_names_array
descendant_names.split(/ /)
end
def update_descendant_names def update_descendant_names
self.descendant_names = descendants.join(" ") self.descendant_names = descendants
end end
def update_descendant_names! def update_descendant_names!
@@ -88,7 +86,7 @@ class TagImplication < TagRelationship
def absence_of_transitive_relation def absence_of_transitive_relation
# Find everything else the antecedent implies, not including the current implication. # Find everything else the antecedent implies, not including the current implication.
implications = TagImplication.active.where("antecedent_name = ? and consequent_name != ?", antecedent_name, consequent_name) implications = TagImplication.active.where("antecedent_name = ? and consequent_name != ?", antecedent_name, consequent_name)
implied_tags = implications.flat_map(&:descendant_names_array) implied_tags = implications.flat_map(&:descendant_names)
if implied_tags.include?(consequent_name) if implied_tags.include?(consequent_name)
self.errors[:base] << "#{antecedent_name} already implies #{consequent_name} through another implication" self.errors[:base] << "#{antecedent_name} already implies #{consequent_name} through another implication"
end end
@@ -170,7 +168,7 @@ class TagImplication < TagRelationship
def update_posts def update_posts
Post.without_timeout do Post.without_timeout do
Post.raw_tag_match(antecedent_name).where("true /* TagImplication#update_posts */").find_each do |post| Post.raw_tag_match(antecedent_name).where("true /* TagImplication#update_posts */").find_each do |post|
fixed_tags = "#{post.tag_string} #{descendant_names}".strip fixed_tags = "#{post.tag_string} #{descendant_names_string}".strip
CurrentUser.scoped(creator, creator_ip_addr) do CurrentUser.scoped(creator, creator_ip_addr) do
post.update_attributes( post.update_attributes(
:tag_string => fixed_tags :tag_string => fixed_tags

13
db/migrate/20181114180205_change_descendant_names_to_array_on_tag_implications.rb Normal file
View File

@@ -0,0 +1,13 @@
class ChangeDescendantNamesToArrayOnTagImplications < ActiveRecord::Migration[5.2]
def up
TagImplication.without_timeout do
change_column :tag_implications, :descendant_names, "text[]", using: "string_to_array(descendant_names, ' ')::text[]", default: "{}"
end
end
def down
TagImplication.without_timeout do
change_column :tag_implications, :descendant_names, "text", using: "array_to_string(descendant_names, ' ')", default: nil
end
end
end

5
db/structure.sql
View File

@@ -3012,7 +3012,7 @@ CREATE TABLE public.tag_implications (
id integer NOT NULL, id integer NOT NULL,
antecedent_name character varying NOT NULL, antecedent_name character varying NOT NULL,
consequent_name character varying NOT NULL, consequent_name character varying NOT NULL,
descendant_names text NOT NULL, descendant_names text[] DEFAULT '{}'::text[] NOT NULL,
creator_id integer NOT NULL, creator_id integer NOT NULL,
creator_ip_addr inet NOT NULL, creator_ip_addr inet NOT NULL,
forum_topic_id integer, forum_topic_id integer,
@@ -7572,6 +7572,7 @@ INSERT INTO "schema_migrations" (version) VALUES
('20180916002448'), ('20180916002448'),
('20181108162204'), ('20181108162204'),
('20181108205842'), ('20181108205842'),
('20181113174914'); ('20181113174914'),
('20181114180205');

57
test/unit/tag_implication_test.rb
View File

@@ -46,7 +46,7 @@ class TagImplicationTest < ActiveSupport::TestCase
ti2 = FactoryBot.build(:tag_implication, :antecedent_name => "b", :consequent_name => "c", :status => "pending") ti2 = FactoryBot.build(:tag_implication, :antecedent_name => "b", :consequent_name => "c", :status => "pending")
ti2.save ti2.save
ti1 = FactoryBot.create(:tag_implication, :antecedent_name => "a", :consequent_name => "b") ti1 = FactoryBot.create(:tag_implication, :antecedent_name => "a", :consequent_name => "b")
assert_equal("b", ti1.descendant_names) assert_equal(%w[b], ti1.descendant_names)
end end
should "populate the creator information" do should "populate the creator information" do
@@ -89,14 +89,11 @@ class TagImplicationTest < ActiveSupport::TestCase
should "calculate all its descendants" do should "calculate all its descendants" do
ti1 = FactoryBot.create(:tag_implication, :antecedent_name => "bbb", :consequent_name => "ccc") ti1 = FactoryBot.create(:tag_implication, :antecedent_name => "bbb", :consequent_name => "ccc")
assert_equal("ccc", ti1.descendant_names) assert_equal(%w[ccc], ti1.descendant_names)
assert_equal(["ccc"], ti1.descendant_names_array)
ti2 = FactoryBot.create(:tag_implication, :antecedent_name => "aaa", :consequent_name => "bbb") ti2 = FactoryBot.create(:tag_implication, :antecedent_name => "aaa", :consequent_name => "bbb")
assert_equal("bbb ccc", ti2.descendant_names) assert_equal(%w[bbb ccc], ti2.descendant_names)
assert_equal(["bbb", "ccc"], ti2.descendant_names_array)
ti1.reload ti1.reload
assert_equal("ccc", ti1.descendant_names) assert_equal(%w[ccc], ti1.descendant_names)
assert_equal(["ccc"], ti1.descendant_names_array)
end end
should "update its descendants on save" do should "update its descendants on save" do
@@ -109,8 +106,8 @@ class TagImplicationTest < ActiveSupport::TestCase
) )
ti1.reload ti1.reload
ti2.reload ti2.reload
assert_equal("bbb ddd", ti1.descendant_names) assert_equal(%w[bbb ddd], ti1.descendant_names)
assert_equal("ddd", ti2.descendant_names) assert_equal(%w[ddd], ti2.descendant_names)
end end
should "update the descendants for all of its parents on destroy" do should "update the descendants for all of its parents on destroy" do
@@ -122,49 +119,49 @@ class TagImplicationTest < ActiveSupport::TestCase
ti2.reload ti2.reload
ti3.reload ti3.reload
ti4.reload ti4.reload
assert_equal("bbb ccc ddd", ti1.descendant_names) assert_equal(%w[bbb ccc ddd], ti1.descendant_names)
assert_equal("bbb ccc ddd", ti2.descendant_names) assert_equal(%w[bbb ccc ddd], ti2.descendant_names)
assert_equal("ccc ddd", ti3.descendant_names) assert_equal(%w[ccc ddd], ti3.descendant_names)
assert_equal("ddd", ti4.descendant_names) assert_equal(%w[ddd], ti4.descendant_names)
ti3.destroy ti3.destroy
ti1.reload ti1.reload
ti2.reload ti2.reload
ti4.reload ti4.reload
assert_equal("bbb", ti1.descendant_names) assert_equal(%w[bbb], ti1.descendant_names)
assert_equal("bbb", ti2.descendant_names) assert_equal(%w[bbb], ti2.descendant_names)
assert_equal("ddd", ti4.descendant_names) assert_equal(%w[ddd], ti4.descendant_names)
end end
should "update the descendants for all of its parents on create" do should "update the descendants for all of its parents on create" do
ti1 = FactoryBot.create(:tag_implication, :antecedent_name => "aaa", :consequent_name => "bbb") ti1 = FactoryBot.create(:tag_implication, :antecedent_name => "aaa", :consequent_name => "bbb")
ti1.reload ti1.reload
assert_equal("active", ti1.status) assert_equal("active", ti1.status)
assert_equal("bbb", ti1.descendant_names) assert_equal(%w[bbb], ti1.descendant_names)
ti2 = FactoryBot.create(:tag_implication, :antecedent_name => "bbb", :consequent_name => "ccc") ti2 = FactoryBot.create(:tag_implication, :antecedent_name => "bbb", :consequent_name => "ccc")
ti1.reload ti1.reload
ti2.reload ti2.reload
assert_equal("active", ti1.status) assert_equal("active", ti1.status)
assert_equal("active", ti2.status) assert_equal("active", ti2.status)
assert_equal("bbb ccc", ti1.descendant_names) assert_equal(%w[bbb ccc], ti1.descendant_names)
assert_equal("ccc", ti2.descendant_names) assert_equal(%w[ccc], ti2.descendant_names)
ti3 = FactoryBot.create(:tag_implication, :antecedent_name => "ccc", :consequent_name => "ddd") ti3 = FactoryBot.create(:tag_implication, :antecedent_name => "ccc", :consequent_name => "ddd")
ti1.reload ti1.reload
ti2.reload ti2.reload
ti3.reload ti3.reload
assert_equal("bbb ccc ddd", ti1.descendant_names) assert_equal(%w[bbb ccc ddd], ti1.descendant_names)
assert_equal("ccc ddd", ti2.descendant_names) assert_equal(%w[ccc ddd], ti2.descendant_names)
ti4 = FactoryBot.create(:tag_implication, :antecedent_name => "ccc", :consequent_name => "eee") ti4 = FactoryBot.create(:tag_implication, :antecedent_name => "ccc", :consequent_name => "eee")
ti1.reload ti1.reload
ti2.reload ti2.reload
ti3.reload ti3.reload
ti4.reload ti4.reload
assert_equal("bbb ccc ddd eee", ti1.descendant_names) assert_equal(%w[bbb ccc ddd eee], ti1.descendant_names)
assert_equal("ccc ddd eee", ti2.descendant_names) assert_equal(%w[ccc ddd eee], ti2.descendant_names)
assert_equal("ddd", ti3.descendant_names) assert_equal(%w[ddd], ti3.descendant_names)
assert_equal("eee", ti4.descendant_names) assert_equal(%w[eee], ti4.descendant_names)
ti5 = FactoryBot.create(:tag_implication, :antecedent_name => "xxx", :consequent_name => "bbb") ti5 = FactoryBot.create(:tag_implication, :antecedent_name => "xxx", :consequent_name => "bbb")
ti1.reload ti1.reload
@@ -172,11 +169,11 @@ class TagImplicationTest < ActiveSupport::TestCase
ti3.reload ti3.reload
ti4.reload ti4.reload
ti5.reload ti5.reload
assert_equal("bbb ccc ddd eee", ti1.descendant_names) assert_equal(%w[bbb ccc ddd eee], ti1.descendant_names)
assert_equal("ccc ddd eee", ti2.descendant_names) assert_equal(%w[ccc ddd eee], ti2.descendant_names)
assert_equal("ddd", ti3.descendant_names) assert_equal(%w[ddd], ti3.descendant_names)
assert_equal("eee", ti4.descendant_names) assert_equal(%w[eee], ti4.descendant_names)
assert_equal("bbb ccc ddd eee", ti5.descendant_names) assert_equal(%w[bbb ccc ddd eee], ti5.descendant_names)
end end
should "update any affected post upon save" do should "update any affected post upon save" do