eliaskohout/ax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: unify tags and edges into single rels table

Browse Source
This commit is contained in:
Elias Kohout
2026-04-01 12:50:45 +02:00
parent 27c72db042
commit 6288879468
9 changed files with 296 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
store/sqlite.go
View File

@@ -15,9 +15,7 @@ import (
var migrations = []string{
`CREATE TABLE IF NOT EXISTS nodes (id TEXT PRIMARY KEY, title TEXT NOT NULL, content TEXT, due_date TEXT, created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP, updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP)`,
`CREATE TABLE IF NOT EXISTS tags (node_id TEXT NOT NULL, tag TEXT NOT NULL, PRIMARY KEY (node_id, tag), FOREIGN KEY (node_id) REFERENCES nodes(id) ON DELETE CASCADE)`,
`CREATE TABLE IF NOT EXISTS rels (from_id TEXT NOT NULL, to_id TEXT NOT NULL, rel_type TEXT NOT NULL, PRIMARY KEY (from_id, to_id, rel_type), FOREIGN KEY (from_id) REFERENCES nodes(id) ON DELETE CASCADE, FOREIGN KEY (to_id) REFERENCES nodes(id) ON DELETE CASCADE)`,
`CREATE INDEX IF NOT EXISTS idx_tags_tag ON tags(tag)`,
`CREATE TABLE IF NOT EXISTS rels (from_id TEXT NOT NULL, rel_name TEXT NOT NULL, to_id TEXT NOT NULL DEFAULT '', PRIMARY KEY (from_id, rel_name, to_id), FOREIGN KEY (from_id) REFERENCES nodes(id) ON DELETE CASCADE)`,
`CREATE INDEX IF NOT EXISTS idx_rels_from ON rels(from_id)`,
`CREATE INDEX IF NOT EXISTS idx_rels_to ON rels(to_id)`,
}
@@ -81,22 +79,58 @@ func FindAndOpenSQLiteStore() (Store, error) {
}
}
// NewSQLiteStore opens a SQLite database at the given path and applies
// per-connection PRAGMAs. foreign_keys must be set on every connection.
// NewSQLiteStore opens a SQLite database at the given path, runs a one-time
// schema migration if needed, then applies per-connection PRAGMAs.
func NewSQLiteStore(path string) (Store, error) {
db, err := sql.Open("sqlite", path)
if err != nil {
return nil, fmt.Errorf("failed to open database: %w", err)
}
for _, q := range []string{"PRAGMA journal_mode=WAL", "PRAGMA busy_timeout=5000", "PRAGMA foreign_keys=ON"} {
// FK must be OFF during migration (table drops/renames).
for _, q := range []string{"PRAGMA journal_mode=WAL", "PRAGMA busy_timeout=5000", "PRAGMA foreign_keys=OFF"} {
if _, err := db.Exec(q); err != nil {
db.Close()
return nil, err
}
}
if err := migrateSchema(db); err != nil {
db.Close()
return nil, fmt.Errorf("schema migration failed: %w", err)
}
if _, err := db.Exec("PRAGMA foreign_keys=ON"); err != nil {
db.Close()
return nil, err
}
return &SQLiteStore{db: db}, nil
}
// migrateSchema migrates from the legacy two-table (tags + rels) schema to the
// unified rels-only schema. It is a no-op when migration has already been applied.
func migrateSchema(db *sql.DB) error {
var tagsExists int
if err := db.QueryRow("SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='tags'").Scan(&tagsExists); err != nil {
return err
}
if tagsExists == 0 {
return nil // already on new schema
}
for _, stmt := range []string{
`CREATE TABLE rels_new (from_id TEXT NOT NULL, rel_name TEXT NOT NULL, to_id TEXT NOT NULL DEFAULT '', PRIMARY KEY (from_id, rel_name, to_id), FOREIGN KEY (from_id) REFERENCES nodes(id) ON DELETE CASCADE)`,
`INSERT OR IGNORE INTO rels_new (from_id, rel_name, to_id) SELECT from_id, rel_type, to_id FROM rels`,
`INSERT OR IGNORE INTO rels_new (from_id, rel_name, to_id) SELECT node_id, tag, '' FROM tags`,
`DROP TABLE rels`,
`DROP TABLE tags`,
`ALTER TABLE rels_new RENAME TO rels`,
`CREATE INDEX IF NOT EXISTS idx_rels_from ON rels(from_id)`,
`CREATE INDEX IF NOT EXISTS idx_rels_to ON rels(to_id)`,
} {
if _, err := db.Exec(stmt); err != nil {
return err
}
}
return nil
}
// --- Transaction ---
func (s *SQLiteStore) Transaction(fn func(Store) error) error {
@@ -137,25 +171,19 @@ func getNode(q querier, id string) (*models.Node, error) {
if err != nil {
return nil, err
}
rows, err := q.Query("SELECT tag FROM tags WHERE node_id = ?", id)
rows, err := q.Query("SELECT rel_name, to_id FROM rels WHERE from_id = ?", id)
if err != nil {
return nil, err
}
defer rows.Close()
for rows.Next() {
var tag string
rows.Scan(&tag)
n.AddTag(tag)
}
rows2, err := q.Query("SELECT to_id, rel_type FROM rels WHERE from_id = ?", id)
if err != nil {
return nil, err
}
defer rows2.Close()
for rows2.Next() {
var toID, relType string
rows2.Scan(&toID, &relType)
n.AddRelation(models.RelType(relType), toID)
var relName, toID string
rows.Scan(&relName, &toID)
if toID == "" {
n.AddTag(relName)
} else {
n.AddRelation(models.RelType(relName), toID)
}
}
return n, nil
}
@@ -190,8 +218,8 @@ func (s *SQLiteStore) GetNode(id string) (*models.Node, error) { return getNode(
func (s *SQLiteStore) UpdateNode(id, title, content, dueDate, updatedAt string) error {
return updateNode(s.db, id, title, content, dueDate, updatedAt)
}
func (s *SQLiteStore) DeleteNode(id string) error { return deleteNode(s.db, id) }
func (s *SQLiteStore) NodeExists(id string) (bool, error) { return nodeExists(s.db, id) }
func (s *SQLiteStore) DeleteNode(id string) error { return deleteNode(s.db, id) }
func (s *SQLiteStore) NodeExists(id string) (bool, error) { return nodeExists(s.db, id) }
func (s *txStore) AddNode(id, title, content, dueDate, createdAt, updatedAt string) error {
return addNode(s.tx, id, title, content, dueDate, createdAt, updatedAt)
@@ -229,81 +257,60 @@ func generateID(q querier) (string, error) {
func (s *SQLiteStore) GenerateID() (string, error) { return generateID(s.db) }
func (s *txStore) GenerateID() (string, error) { return generateID(s.db) }
// --- Tag operations ---
// --- Rel operations ---
func addTag(q querier, nodeID, tag string) error {
_, err := q.Exec("INSERT OR IGNORE INTO tags (node_id, tag) VALUES (?, ?)", nodeID, tag)
func addRel(q querier, nodeID, relName, toID string) error {
_, err := q.Exec("INSERT OR IGNORE INTO rels (from_id, rel_name, to_id) VALUES (?, ?, ?)", nodeID, relName, toID)
return err
}
func removeTag(q querier, nodeID, tag string) error {
_, err := q.Exec("DELETE FROM tags WHERE node_id = ? AND tag = ?", nodeID, tag)
func removeRel(q querier, nodeID, relName, toID string) error {
_, err := q.Exec("DELETE FROM rels WHERE from_id = ? AND rel_name = ? AND to_id = ?", nodeID, relName, toID)
return err
}
func (s *SQLiteStore) AddTag(nodeID, tag string) error { return addTag(s.db, nodeID, tag) }
func (s *SQLiteStore) RemoveTag(nodeID, tag string) error { return removeTag(s.db, nodeID, tag) }
func (s *txStore) AddTag(nodeID, tag string) error { return addTag(s.tx, nodeID, tag) }
func (s *txStore) RemoveTag(nodeID, tag string) error { return removeTag(s.tx, nodeID, tag) }
// --- Edge operations ---
func addEdge(q querier, fromID, toID string, relType models.RelType) error {
_, err := q.Exec("INSERT OR IGNORE INTO rels (from_id, to_id, rel_type) VALUES (?, ?, ?)", fromID, toID, relType)
return err
func (s *SQLiteStore) AddRel(nodeID, relName, toID string) error {
return addRel(s.db, nodeID, relName, toID)
}
func removeEdge(q querier, fromID, toID string, relType models.RelType) error {
_, err := q.Exec("DELETE FROM rels WHERE from_id = ? AND to_id = ? AND rel_type = ?", fromID, toID, relType)
return err
func (s *SQLiteStore) RemoveRel(nodeID, relName, toID string) error {
return removeRel(s.db, nodeID, relName, toID)
}
func (s *SQLiteStore) AddEdge(fromID, toID string, relType models.RelType) error {
return addEdge(s.db, fromID, toID, relType)
func (s *txStore) AddRel(nodeID, relName, toID string) error {
return addRel(s.tx, nodeID, relName, toID)
}
func (s *SQLiteStore) RemoveEdge(fromID, toID string, relType models.RelType) error {
return removeEdge(s.db, fromID, toID, relType)
}
func (s *txStore) AddEdge(fromID, toID string, relType models.RelType) error {
return addEdge(s.tx, fromID, toID, relType)
}
func (s *txStore) RemoveEdge(fromID, toID string, relType models.RelType) error {
return removeEdge(s.tx, fromID, toID, relType)
func (s *txStore) RemoveRel(nodeID, relName, toID string) error {
return removeRel(s.tx, nodeID, relName, toID)
}
// --- FindNodes ---
func findNodes(q querier, tagPrefixes []string, edgeFilters []*models.Rel) ([]*models.Node, error) {
// Edge filter args come first (in JOIN ON clauses), tag args come last (in HAVING).
func findNodes(q querier, filters []*models.Rel) ([]*models.Node, error) {
query := "SELECT DISTINCT n.id FROM nodes n"
var joins []string
var args []any
// Edge filtering: each filter becomes an inner join with conditions in the ON clause.
for i, ef := range edgeFilters {
for i, f := range filters {
alias := fmt.Sprintf("r%d", i)
joins = append(joins, fmt.Sprintf(
"JOIN rels %s ON n.id = %s.from_id AND %s.rel_type = ? AND %s.to_id = ?",
alias, alias, alias, alias,
))
args = append(args, string(ef.Type), ef.Target)
if f.Target == "" {
// Tag/property filter: match rels with empty to_id by rel_name prefix.
joins = append(joins, fmt.Sprintf(
"JOIN rels %s ON n.id = %s.from_id AND %s.to_id = '' AND %s.rel_name LIKE ? || '%%'",
alias, alias, alias, alias,
))
args = append(args, string(f.Type))
} else {
// Edge filter: match rel by exact rel_name and to_id.
joins = append(joins, fmt.Sprintf(
"JOIN rels %s ON n.id = %s.from_id AND %s.rel_name = ? AND %s.to_id = ?",
alias, alias, alias, alias,
))
args = append(args, string(f.Type), f.Target)
}
}
// Tag filtering: join tags and use HAVING with aggregate to require all prefixes.
joins = append(joins, "JOIN tags t_tag ON n.id = t_tag.node_id")
if len(tagPrefixes) == 0 {
tagPrefixes = []string{""}
if len(joins) > 0 {
query += " " + strings.Join(joins, " ")
}
cond := ""
for _, t := range tagPrefixes {
cond += "t_tag.tag LIKE ? || '%' OR "
args = append(args, t)
}
having := "SUM(CASE WHEN " + cond[:len(cond)-4] + " THEN 1 ELSE 0 END) >= ?"
args = append(args, len(tagPrefixes))
query += " " + strings.Join(joins, " ")
query += " GROUP BY n.id HAVING " + having
query += " ORDER BY n.created_at DESC"
rows, err := q.Query(query, args...)
@@ -332,10 +339,10 @@ func findNodes(q querier, tagPrefixes []string, edgeFilters []*models.Rel) ([]*m
return nodes, nil
}
func (s *SQLiteStore) FindNodes(tagPrefixes []string, edgeFilters []*models.Rel) ([]*models.Node, error) {
return findNodes(s.db, tagPrefixes, edgeFilters)
func (s *SQLiteStore) FindNodes(filters []*models.Rel) ([]*models.Node, error) {
return findNodes(s.db, filters)
}
func (s *txStore) FindNodes(tagPrefixes []string, edgeFilters []*models.Rel) ([]*models.Node, error) {
return findNodes(s.tx, tagPrefixes, edgeFilters)
func (s *txStore) FindNodes(filters []*models.Rel) ([]*models.Node, error) {
return findNodes(s.tx, filters)
}