Skip to content
/ sir Public

SEARCH-642 (indexer): Drop id fields for cdstub and tag #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
reosarevok wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

SEARCH-642 (indexer): Drop id fields for cdstub and tag #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdb8233
SEARCH-642: Drop id fields for cdstub and tag
reosarevok Jan 29, 2021
0f66c9c
Amend SEARCH-642: Regenerate triggers
yvanzo May 12, 2022
e3fcb24
Amend SEARCH-642: Update tests
reosarevok Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions sir/schema/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@


SearchCDStub = E(modelext.CustomReleaseRaw, [
F("id", "id"),
F("title", "title"),
F("artist", "artist"),
F("comment", "comment"),
Expand Down Expand Up @@ -508,7 +507,6 @@


SearchTag = E(models.Tag, [
F("id", "id"),
F("tag", "name")
],
1.5,
Expand Down
8 changes: 4 additions & 4 deletions sql/CreateTriggers.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,9 @@ CREATE TRIGGER search_area_tag_delete BEFORE DELETE ON musicbrainz.area_tag
CREATE TRIGGER search_tag_insert AFTER INSERT ON musicbrainz.tag
FOR EACH ROW EXECUTE PROCEDURE search_tag_insert();

CREATE TRIGGER search_tag_update AFTER UPDATE OF id, name ON musicbrainz.tag
CREATE TRIGGER search_tag_update AFTER UPDATE OF name ON musicbrainz.tag
FOR EACH ROW
WHEN ((OLD.id, OLD.name) IS DISTINCT FROM (NEW.id, NEW.name))
WHEN ((OLD.name) IS DISTINCT FROM (NEW.name))
EXECUTE PROCEDURE search_tag_update();

CREATE TRIGGER search_tag_delete BEFORE DELETE ON musicbrainz.tag
Expand Down Expand Up @@ -401,9 +401,9 @@ CREATE TRIGGER search_artist_type_delete BEFORE DELETE ON musicbrainz.artist_typ
CREATE TRIGGER search_release_raw_insert AFTER INSERT ON musicbrainz.release_raw
FOR EACH ROW EXECUTE PROCEDURE search_release_raw_insert();

CREATE TRIGGER search_release_raw_update AFTER UPDATE OF added, artist, barcode, comment, id, title ON musicbrainz.release_raw
CREATE TRIGGER search_release_raw_update AFTER UPDATE OF added, artist, barcode, comment, title ON musicbrainz.release_raw
FOR EACH ROW
WHEN ((OLD.added, OLD.artist, OLD.barcode, OLD.comment, OLD.id, OLD.title) IS DISTINCT FROM (NEW.added, NEW.artist, NEW.barcode, NEW.comment, NEW.id, NEW.title))
WHEN ((OLD.added, OLD.artist, OLD.barcode, OLD.comment, OLD.title) IS DISTINCT FROM (NEW.added, NEW.artist, NEW.barcode, NEW.comment, NEW.title))
EXECUTE PROCEDURE search_release_raw_update();

CREATE TRIGGER search_release_raw_delete BEFORE DELETE ON musicbrainz.release_raw
Expand Down
9 changes: 2 additions & 7 deletions test/test_indexing_real_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,25 +550,21 @@ def test_index_tag(self):
{
'tag': u'musical',
'_store': '<ns0:tag xmlns:ns0="http://musicbrainz.org/ns/mmd-2.0#"><ns0:name>musical</ns0:name></ns0:tag>',
'id': 1
},
{
'tag': u'rock',
'_store': '<ns0:tag xmlns:ns0="http://musicbrainz.org/ns/mmd-2.0#"><ns0:name>rock</ns0:name></ns0:tag>',
'id': 2
},
{
'tag': u'jazz',
'_store': '<ns0:tag xmlns:ns0="http://musicbrainz.org/ns/mmd-2.0#"><ns0:name>jazz</ns0:name></ns0:tag>',
'id': 3
},
{
'tag': u'world music',
'_store': '<ns0:tag xmlns:ns0="http://musicbrainz.org/ns/mmd-2.0#"><ns0:name>world music</ns0:name></ns0:tag>',
'id': 4
}
]
self._test_index_entity("tag", expected, key="id")
self._test_index_entity("tag", expected, key="tag")

def test_index_url(self):
expected = [
Expand Down Expand Up @@ -663,10 +659,9 @@ def test_index_cdstub(self):
'barcode': u'837101029192',
'tracks': 2,
'title': u'Test Stub',
'id': 1
}
]
self._test_index_entity("cdstub", expected, key="id")
self._test_index_entity("cdstub", expected, key="discid")

def test_index_annotation(self):
expected = [
Expand Down