try to catch the correct exception, moron

Author: yedpodtrzitko

tagstudio/src/core/library/alchemy/library.py

@@ -19,7 +19,7 @@
     exists,
     delete,
 )
-from sqlalchemy.exc import IntegrityError, InvalidRequestError
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import (
     Session,
     contains_eager,
@@ -731,7 +731,6 @@ def add_field_tag(
                     session.add(tag)
                     session.flush()
 
-                assert tag.id
                 tag_field = TagField(
                     tag_id=tag.id,
                     field_id=field.id,
@@ -744,9 +743,10 @@ def add_field_tag(
                 )
 
                 return True
-            except InvalidRequestError as e:
+            except IntegrityError as e:
                 logger.exception(e)
                 session.rollback()
+
                 return False
 
     def save_library_backup_to_disk(self) -> Path:

tagstudio/tests/qt/test_tag_widget.py

@@ -1,6 +1,5 @@
 from unittest.mock import patch
 
-import pytest
 
 from src.core.library.alchemy.fields import _FieldID
 from src.qt.widgets.tag import TagWidget
@@ -25,26 +24,19 @@ def test_tag_widget(qtbot, library, qt_driver):
     assert tag_widget.add_modal.isVisible()
 
 
-@pytest.mark.skip
-def test_tag_widget_add_existing_raises(qtbot, library, qt_driver):
+def test_tag_widget_add_existing_raises(library, qt_driver, entry_full):
     # Given
-    entry = next(library.get_entries(with_joins=True))
-    print(entry.tag_box_fields)
-
-    tag_field = [f for f in entry.tag_box_fields if f.type_key == _FieldID.TAGS.name][0]
-
-    assert len(entry.tags) == 1
-    tag = next(iter(entry.tags))
-    tag_widget = TagBoxWidget(tag_field, "title", qt_driver)
+    tag_field = [
+        f for f in entry_full.tag_box_fields if f.type_key == _FieldID.TAGS.name
+    ][0]
+    assert len(entry_full.tags) == 1
+    tag = next(iter(entry_full.tags))
 
     # When
-    qtbot.add_widget(tag_widget)
-    tag_widget.driver.frame_content = [entry]
+    tag_widget = TagBoxWidget(tag_field, "title", qt_driver)
+    tag_widget.driver.frame_content = [entry_full]
     tag_widget.driver.selected = [0]
 
-    entry = next(library.get_entries(with_joins=True))
-    print(entry.tag_box_fields)
-
     # Then
     with patch.object(tag_widget, "error_occurred") as mocked:
         tag_widget.add_modal.widget.tag_chosen.emit(tag.id)