Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion src/codegraph/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from .scanner.walk import discover_files
from .store import IndexStore

_RESOLVER_VERSION = 4
_RESOLVER_VERSION = 5


@dataclass
Expand Down
20 changes: 17 additions & 3 deletions tests/test_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,20 @@ def test_resolver_version_change_re_resolves_stale_absolute_import(self):
store = IndexStore(str(cfg.db_path))
try:
package_id = store.file_by_path("pkg/foo.py")["id"]
package_target_id = store.symbol_by_qualname("pkg.foo.target")["id"]
import_row = store.find_import(module="foo")
store.conn.execute(
"UPDATE imports SET target_id = ? WHERE id = ?",
(package_id, import_row["id"]),
)
call_row = store.find_call(callee="foo.target")
self.assertIsNotNone(call_row)
store.conn.execute(
"UPDATE calls SET callee_id = ? WHERE id = ?",
(package_target_id, call_row["id"]),
)
scan_config = json.loads(store.get_meta("scan_config"))
scan_config["resolver_version"] = 1
scan_config["resolver_version"] = 4
store.set_meta("scan_config", json.dumps(scan_config))
store.conn.commit()
finally:
Expand All @@ -120,6 +127,11 @@ def test_resolver_version_change_re_resolves_stale_absolute_import(self):
self.assertEqual(
store.file_by_id(import_row["target_id"])["path"], "foo.py"
)
call_row = store.find_call(callee="foo.target")
self.assertIsNotNone(call_row)
self.assertEqual(
store.file_by_id(call_row["callee_id"])["path"], "foo.py"
)
finally:
store.close()

Expand All @@ -128,9 +140,11 @@ def test_resolver_version_change_re_resolves_fallback_import(self):
root = Path(tmp)
src = root / "src"
src.mkdir()
source_package = src / "pkg"
source_package.mkdir()
(src / "util.py").write_text(
"def target():\n return 'src'\n", encoding="utf-8")
(src / "app.py").write_text(
(source_package / "app.py").write_text(
"import util\n\n"
"def invoke():\n return util.target()\n",
encoding="utf-8",
Expand All @@ -149,7 +163,7 @@ def test_resolver_version_change_re_resolves_fallback_import(self):
(import_row["id"],),
)
scan_config = json.loads(store.get_meta("scan_config"))
scan_config["resolver_version"] = 1
scan_config["resolver_version"] = 4
store.set_meta("scan_config", json.dumps(scan_config))
store.conn.commit()
finally:
Expand Down
6 changes: 4 additions & 2 deletions tests/test_resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@ def test_absolute_python_import_falls_back_to_source_root(self):
root = Path(tmp)
src = root / "src"
src.mkdir()
source_package = src / "pkg"
source_package.mkdir()
(src / "util.py").write_text(
"def target():\n return 'src'\n", encoding="utf-8")
(src / "app.py").write_text(
(source_package / "app.py").write_text(
"import util\n\n"
"def invoke():\n return util.target()\n",
encoding="utf-8",
Expand All @@ -67,7 +69,7 @@ def test_absolute_python_import_falls_back_to_source_root(self):
build_index(cfg)
store = IndexStore(str(cfg.db_path))
try:
fid = store.file_by_path("src/app.py")["id"]
fid = store.file_by_path("src/pkg/app.py")["id"]
self.assertEqual(
resolve_module(store, fid, "util"),
store.file_by_path("src/util.py")["id"],
Expand Down