A C++ method call whose receiver is another call's result — `Foo::instance().bar()`, `WidgetFactory::create().draw()`, `openSession()->run()`, or the same stored in an `auto` local first — lost the receiver's type during extraction. The callee degraded to a bare method name, so when two classes shared a method name the call silently resolved to whichever was indexed first (or not at all), corrupting callers / impact / trace with a plausible-but-wrong edge. Three parts: - Capture C++ return types (new nodes.return_type column, schema v5): the function_definition's `type` field, normalized — smart-pointer pointee unwrapped, void/primitives dropped. - Preserve the inner-call receiver in extraction: a C/C++ field_expression whose receiver is itself a call is encoded `inner().method` instead of dropping to the bare name. Other languages keep the existing behavior. - New resolution strategy (matchCppCallChain): infer the receiver's class from the inner call's return type, then resolve AND validate the method on it. Handles singletons/accessors, factories returning a different type, free-function factories, make_unique/make_shared/new/direct construction, single-level member chains, and namespace-qualified inner calls. A wrong inference yields no edge, never a wrong one. EXTRACTION_VERSION 2->3 (re-index to populate return types). Validated on the issue repro + spdlog: node count stable (no explosion), deterministic, and ~100 pre-existing wrong `.size()`-style edges removed. Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
153 lines
5.7 KiB
SQL
153 lines
5.7 KiB
SQL
-- CodeGraph SQLite Schema
|
|
-- Version 1
|
|
|
|
-- Schema version tracking
|
|
CREATE TABLE IF NOT EXISTS schema_versions (
|
|
version INTEGER PRIMARY KEY,
|
|
applied_at INTEGER NOT NULL,
|
|
description TEXT
|
|
);
|
|
|
|
-- Insert initial version
|
|
INSERT INTO schema_versions (version, applied_at, description)
|
|
VALUES (1, strftime('%s', 'now') * 1000, 'Initial schema');
|
|
|
|
-- =============================================================================
|
|
-- Core Tables
|
|
-- =============================================================================
|
|
|
|
-- Nodes: Code symbols (functions, classes, variables, etc.)
|
|
CREATE TABLE IF NOT EXISTS nodes (
|
|
id TEXT PRIMARY KEY,
|
|
kind TEXT NOT NULL,
|
|
name TEXT NOT NULL,
|
|
qualified_name TEXT NOT NULL,
|
|
file_path TEXT NOT NULL,
|
|
language TEXT NOT NULL,
|
|
start_line INTEGER NOT NULL,
|
|
end_line INTEGER NOT NULL,
|
|
start_column INTEGER NOT NULL,
|
|
end_column INTEGER NOT NULL,
|
|
docstring TEXT,
|
|
signature TEXT,
|
|
visibility TEXT,
|
|
is_exported INTEGER DEFAULT 0,
|
|
is_async INTEGER DEFAULT 0,
|
|
is_static INTEGER DEFAULT 0,
|
|
is_abstract INTEGER DEFAULT 0,
|
|
decorators TEXT, -- JSON array
|
|
type_parameters TEXT, -- JSON array
|
|
return_type TEXT, -- normalized return/result type name (e.g. C++ method return, for receiver-type inference)
|
|
updated_at INTEGER NOT NULL
|
|
);
|
|
|
|
-- Edges: Relationships between nodes
|
|
CREATE TABLE IF NOT EXISTS edges (
|
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
source TEXT NOT NULL,
|
|
target TEXT NOT NULL,
|
|
kind TEXT NOT NULL,
|
|
metadata TEXT, -- JSON object
|
|
line INTEGER,
|
|
col INTEGER,
|
|
provenance TEXT DEFAULT NULL,
|
|
FOREIGN KEY (source) REFERENCES nodes(id) ON DELETE CASCADE,
|
|
FOREIGN KEY (target) REFERENCES nodes(id) ON DELETE CASCADE
|
|
);
|
|
|
|
-- Files: Tracked source files
|
|
CREATE TABLE IF NOT EXISTS files (
|
|
path TEXT PRIMARY KEY,
|
|
content_hash TEXT NOT NULL,
|
|
language TEXT NOT NULL,
|
|
size INTEGER NOT NULL,
|
|
modified_at INTEGER NOT NULL,
|
|
indexed_at INTEGER NOT NULL,
|
|
node_count INTEGER DEFAULT 0,
|
|
errors TEXT -- JSON array
|
|
);
|
|
|
|
-- Unresolved References: References that need resolution after full indexing
|
|
CREATE TABLE IF NOT EXISTS unresolved_refs (
|
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
from_node_id TEXT NOT NULL,
|
|
reference_name TEXT NOT NULL,
|
|
reference_kind TEXT NOT NULL,
|
|
line INTEGER NOT NULL,
|
|
col INTEGER NOT NULL,
|
|
candidates TEXT, -- JSON array
|
|
file_path TEXT NOT NULL DEFAULT '',
|
|
language TEXT NOT NULL DEFAULT 'unknown',
|
|
FOREIGN KEY (from_node_id) REFERENCES nodes(id) ON DELETE CASCADE
|
|
);
|
|
|
|
-- =============================================================================
|
|
-- Indexes for Query Performance
|
|
-- =============================================================================
|
|
|
|
-- Node indexes
|
|
CREATE INDEX IF NOT EXISTS idx_nodes_kind ON nodes(kind);
|
|
CREATE INDEX IF NOT EXISTS idx_nodes_name ON nodes(name);
|
|
CREATE INDEX IF NOT EXISTS idx_nodes_qualified_name ON nodes(qualified_name);
|
|
CREATE INDEX IF NOT EXISTS idx_nodes_file_path ON nodes(file_path);
|
|
CREATE INDEX IF NOT EXISTS idx_nodes_language ON nodes(language);
|
|
CREATE INDEX IF NOT EXISTS idx_nodes_file_line ON nodes(file_path, start_line);
|
|
CREATE INDEX IF NOT EXISTS idx_nodes_lower_name ON nodes(lower(name));
|
|
|
|
-- Full-text search index on node names, docstrings, and signatures
|
|
CREATE VIRTUAL TABLE IF NOT EXISTS nodes_fts USING fts5(
|
|
id,
|
|
name,
|
|
qualified_name,
|
|
docstring,
|
|
signature,
|
|
content='nodes',
|
|
content_rowid='rowid'
|
|
);
|
|
|
|
-- Triggers to keep FTS index in sync
|
|
CREATE TRIGGER IF NOT EXISTS nodes_ai AFTER INSERT ON nodes BEGIN
|
|
INSERT INTO nodes_fts(rowid, id, name, qualified_name, docstring, signature)
|
|
VALUES (NEW.rowid, NEW.id, NEW.name, NEW.qualified_name, NEW.docstring, NEW.signature);
|
|
END;
|
|
|
|
CREATE TRIGGER IF NOT EXISTS nodes_ad AFTER DELETE ON nodes BEGIN
|
|
INSERT INTO nodes_fts(nodes_fts, rowid, id, name, qualified_name, docstring, signature)
|
|
VALUES ('delete', OLD.rowid, OLD.id, OLD.name, OLD.qualified_name, OLD.docstring, OLD.signature);
|
|
END;
|
|
|
|
CREATE TRIGGER IF NOT EXISTS nodes_au AFTER UPDATE ON nodes BEGIN
|
|
INSERT INTO nodes_fts(nodes_fts, rowid, id, name, qualified_name, docstring, signature)
|
|
VALUES ('delete', OLD.rowid, OLD.id, OLD.name, OLD.qualified_name, OLD.docstring, OLD.signature);
|
|
INSERT INTO nodes_fts(rowid, id, name, qualified_name, docstring, signature)
|
|
VALUES (NEW.rowid, NEW.id, NEW.name, NEW.qualified_name, NEW.docstring, NEW.signature);
|
|
END;
|
|
|
|
-- Edge indexes.
|
|
-- idx_edges_source / idx_edges_target are intentionally omitted —
|
|
-- the (source, kind) and (target, kind) composites below cover the
|
|
-- corresponding source-only / target-only lookups via SQLite's
|
|
-- left-prefix scan, so the narrow indexes are dead weight on writes.
|
|
-- Migration v4 drops them on existing databases.
|
|
CREATE INDEX IF NOT EXISTS idx_edges_kind ON edges(kind);
|
|
CREATE INDEX IF NOT EXISTS idx_edges_source_kind ON edges(source, kind);
|
|
CREATE INDEX IF NOT EXISTS idx_edges_target_kind ON edges(target, kind);
|
|
|
|
-- File indexes
|
|
CREATE INDEX IF NOT EXISTS idx_files_language ON files(language);
|
|
CREATE INDEX IF NOT EXISTS idx_files_modified_at ON files(modified_at);
|
|
|
|
-- Unresolved refs indexes
|
|
CREATE INDEX IF NOT EXISTS idx_unresolved_from_node ON unresolved_refs(from_node_id);
|
|
CREATE INDEX IF NOT EXISTS idx_unresolved_name ON unresolved_refs(reference_name);
|
|
CREATE INDEX IF NOT EXISTS idx_unresolved_file_path ON unresolved_refs(file_path);
|
|
CREATE INDEX IF NOT EXISTS idx_unresolved_from_name ON unresolved_refs(from_node_id, reference_name);
|
|
CREATE INDEX IF NOT EXISTS idx_edges_provenance ON edges(provenance);
|
|
|
|
-- Project metadata for version/provenance tracking
|
|
CREATE TABLE IF NOT EXISTS project_metadata (
|
|
key TEXT PRIMARY KEY,
|
|
value TEXT NOT NULL,
|
|
updated_at INTEGER NOT NULL
|
|
);
|