ImportMerge: fix AttributeError when adding/merging Tag objects

Tag is a table object without a gramps_id field, so the generic
has_<obj_type>_gramps_id / find_next_<obj_type>_gramps_id lookups in
do_commits raised AttributeError when the user selected Add on a Tag
row. Guard both the S_ADD and S_DIFFERS GID-conflict blocks so they
skip Tag.

Adds integration tests covering both branches; verified they fail
without the guard and pass with it.

Fixes bug 0014056

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: eduralph

ImportMerge/importmerge.py

@@ -803,8 +803,8 @@ def do_commits(self, status, obj_type, hndl, action, trans):
                     continue
                 # now check the missing list for a match
                 changed += self.check_miss(r_objtype, r_hndl, item)
-            # check for GID conflict
-            if item.gramps_id != item1.gramps_id:
+            # check for GID conflict (Tag is a table object without gramps_id)
+            if obj_type != 'Tag' and item.gramps_id != item1.gramps_id:
                 if getattr(self.db1, 'has_' + obj_type.lower() +
                            '_gramps_id')(item.gramps_id):
                     item.gramps_id = getattr(self.db1, 'find_next_' +
@@ -823,9 +823,10 @@ def do_commits(self, status, obj_type, hndl, action, trans):
                     continue
                 # now check the differences list for a match
                 self.check_diffs(r_objtype, r_hndl, obj_type, item)
-            # check for GID conflict
-            if getattr(self.db1, 'has_' + obj_type.lower() +
-                       '_gramps_id')(item.gramps_id):
+            # check for GID conflict (Tag is a table object without gramps_id)
+            if obj_type != 'Tag' and getattr(
+                    self.db1, 'has_' + obj_type.lower() +
+                    '_gramps_id')(item.gramps_id):
                 item.gramps_id = getattr(self.db1, 'find_next_' +
                                          obj_type.lower() +
                                          '_gramps_id')()

ImportMerge/tests/__init__.py

@@ -0,0 +1,173 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2026  Eduard Ralph
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+"""Integration tests for the Import and Merge tool.
+
+These tests exercise ``ImportMerge.do_commits`` against a real Gramps SQLite
+database.  We call the method unbound with a stub ``self`` so the GUI
+(ManagedWindow + Gtk dialog) doesn't need to be instantiated — the data-path
+logic is what we're verifying.
+
+Regression coverage:
+
+* Gramps bug 0014056 — Adding a Tag via the Import Merge tool raised
+  ``AttributeError: 'SQLite' object has no attribute 'has_tag_gramps_id'``
+  because Tag is a table object and has no gramps_id.
+"""
+
+# ------------------------
+# Python modules
+# ------------------------
+import os
+import shutil
+import tempfile
+import types
+from types import SimpleNamespace
+
+import pytest
+
+# The ImportMerge module imports Gtk at module load — skip the whole file if
+# gi/Gtk aren't available (headless-without-GTK environments).
+pytest.importorskip("gi")
+
+# ------------------------
+# Gramps modules
+# ------------------------
+from gramps.gen.db import DbTxn
+from gramps.gen.db.utils import make_database
+from gramps.gen.lib import Tag
+
+# ------------------------
+# Gramps specific
+# ------------------------
+from ImportMerge.importmerge import ImportMerge, S_ADD, S_DIFFERS, A_ADD
+
+
+def _make_db(suffix):
+    """Create a fresh on-disk Gramps SQLite DB inside a temp directory."""
+    tmpdir = tempfile.mkdtemp(prefix=f"gramps_test_{suffix}_")
+    db_path = os.path.join(tmpdir, f"db_{suffix}")
+    os.makedirs(db_path)
+    db = make_database("sqlite")
+    db.load(db_path, None)
+    return db, tmpdir
+
+
+@pytest.fixture
+def db1():
+    """Destination Gramps DB (the one being merged into)."""
+    db, tmpdir = _make_db("db1")
+    yield db
+    try:
+        db.close()
+    except Exception:
+        pass
+    shutil.rmtree(tmpdir, ignore_errors=True)
+
+
+@pytest.fixture
+def db2():
+    """Source Gramps DB (simulates the XML being imported)."""
+    db, tmpdir = _make_db("db2")
+    yield db
+    try:
+        db.close()
+    except Exception:
+        pass
+    shutil.rmtree(tmpdir, ignore_errors=True)
+
+
+def _make_stub(db1, db2):
+    """Stub ``self`` for ``ImportMerge.do_commits`` — no GUI attributes."""
+    return SimpleNamespace(
+        db1=db1,
+        db2=db2,
+        added={},
+        missing={},
+        diffs={},
+    )
+
+
+def _add_tag(db, name):
+    """Add a Tag to ``db`` and return its handle."""
+    tag = Tag()
+    tag.set_name(name)
+    with DbTxn("add tag", db, batch=True) as trans:
+        handle = db.add_tag(tag, trans)
+    return handle
+
+
+def test_add_tag_does_not_crash(db1, db2):
+    """Regression for bug 0014056 — adding a Tag via do_commits must succeed.
+
+    Before the fix, this raised ``AttributeError: 'SQLite' object has no
+    attribute 'has_tag_gramps_id'`` because the generic GID-conflict check
+    didn't special-case Tag (a table object without a gramps_id field).
+    """
+    tag_handle = _add_tag(db2, "Imported")
+    stub = _make_stub(db1, db2)
+
+    with DbTxn("import merge", db1, batch=True) as trans:
+        ImportMerge.do_commits(stub, S_ADD, "Tag", tag_handle, A_ADD, trans)
+
+    # Tag should now exist in the destination DB.
+    assert db1.get_number_of_tags() == 1
+    committed = db1.get_tag_from_handle(tag_handle)
+    assert committed is not None
+    assert committed.get_name() == "Imported"
+
+
+def test_differing_tag_does_not_crash(db1, db2):
+    """S_DIFFERS branch must also skip the gramps_id check for Tag.
+
+    Same root cause as the S_ADD path: the GID-conflict block at the end of
+    the S_DIFFERS branch dereferences ``item.gramps_id`` and calls
+    ``has_tag_gramps_id`` — both fail for Tag objects.
+    """
+    tag_handle = _add_tag(db1, "Original")
+    # Same handle in db2 with a different name — simulates S_DIFFERS.
+    tag2 = Tag()
+    tag2.set_handle(tag_handle)
+    tag2.set_name("Modified")
+    with DbTxn("seed db2", db2, batch=True) as trans:
+        db2.add_tag(tag2, trans)
+
+    stub = _make_stub(db1, db2)
+
+    # diff_result is invoked by do_commits on the S_DIFFERS path; stub it to
+    # return the db2 version as the resolved item (action = A_ADD ⇒ "replace").
+    def fake_diff_result(action, obj_type, hndl):
+        item1 = db1.get_tag_from_handle(hndl)
+        item2 = db2.get_tag_from_handle(hndl)
+        return item1, item2, item2
+
+    stub.diff_result = fake_diff_result
+    stub.check_diffs = lambda *a, **kw: False
+    stub.check_added = lambda *a, **kw: False
+    stub.check_miss = lambda *a, **kw: False
+
+    with DbTxn("import merge", db1, batch=True) as trans:
+        ImportMerge.do_commits(
+            stub, S_DIFFERS, "Tag", tag_handle, A_ADD, trans
+        )
+
+    committed = db1.get_tag_from_handle(tag_handle)
+    assert committed is not None
+    assert committed.get_name() == "Modified"