refactor: replace explicit fields with tag-based property system

db/db.go

@@ -8,8 +8,6 @@ import (
 	"os/user"
 	"path/filepath"
 
-	"axolotl/models"
-
 	_ "modernc.org/sqlite"
 )
 
@@ -18,38 +16,16 @@ type DB struct {
 	path string
 }
 
-var database *DB
-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 TABLE IF NOT EXISTS aliases (
-		name TEXT PRIMARY KEY,
-		command TEXT NOT NULL
-	)`,
-	`CREATE INDEX IF NOT EXISTS idx_tags_tag ON tags(tag)`,
-	`CREATE INDEX IF NOT EXISTS idx_rels_from ON rels(from_id)`,
-	`CREATE INDEX IF NOT EXISTS idx_rels_to ON rels(to_id)`,
-}
+var (
+	database   *DB
+	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 TABLE IF NOT EXISTS aliases (name TEXT PRIMARY KEY, command TEXT NOT NULL)`,
+		`CREATE INDEX IF NOT EXISTS idx_tags_tag ON tags(tag)`, `CREATE INDEX IF NOT EXISTS idx_rels_from ON rels(from_id)`, `CREATE INDEX IF NOT EXISTS idx_rels_to ON rels(to_id)`,
+	}
+)
 
 func GetDB() (*DB, error) {
 	if database != nil {
@@ -60,25 +36,22 @@ func GetDB() (*DB, error) {
 		return nil, err
 	}
 	for {
-		path := filepath.Join(dir, ".ax.db")
-		if _, err := os.Stat(path); err == nil {
-			database, err = Open(path)
-			if err != nil {
+		if _, err := os.Stat(filepath.Join(dir, ".ax.db")); err == nil {
+			if database, err = Open(filepath.Join(dir, ".ax.db")); err != nil {
 				return nil, fmt.Errorf("failed to open database: %w", err)
 			}
 			return database, nil
 		}
-		parent := filepath.Dir(dir)
-		if parent == dir {
+		if parent := filepath.Dir(dir); parent == dir {
 			return nil, errors.New("no .ax.db found (run 'ax init' first)")
+		} else {
+			dir = parent
 		}
-		path = parent
 	}
 }
 
-func Init(path string) (error) {
-	dir := filepath.Dir(path)
-	if err := os.MkdirAll(dir, 0755); err != nil {
+func Init(path string) error {
+	if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
 		return err
 	}
 	var err error
@@ -87,19 +60,16 @@ func Init(path string) (error) {
 }
 
 func Open(path string) (*DB, error) {
-	database, err := sql.Open("sqlite", path)
+	db, err := sql.Open("sqlite", path)
 	if err != nil {
 		return nil, err
 	}
-	database.Exec("PRAGMA journal_mode=WAL")
-	database.Exec("PRAGMA busy_timeout=5000")
-	database.Exec("PRAGMA foreign_keys=ON")
-	for _, m := range migrations {
-		if _, err := database.Exec(m); err != nil {
+	for _, q := range append([]string{"PRAGMA journal_mode=WAL", "PRAGMA busy_timeout=5000", "PRAGMA foreign_keys=ON"}, migrations...) {
+		if _, err := db.Exec(q); err != nil {
 			return nil, err
 		}
 	}
-	return &DB{DB: database, path: path}, nil
+	return &DB{DB: db, path: path}, nil
 }
 
 func GetCurrentUser() string {
@@ -111,44 +81,3 @@ func GetCurrentUser() string {
 	}
 	return "unknown"
 }
-
-func (db *DB) NodeExists(id string) (bool, error) {
-	var exists bool
-	err := db.QueryRow("SELECT EXISTS(SELECT 1 FROM nodes WHERE id = ?)", id).Scan(&exists)
-	return exists, err
-}
-
-func (db *DB) NodeByID(id string) (*models.Node, error) {
-	n := &models.Node{Relations: make(map[string][]string)}
-	err := db.QueryRow(
-		"SELECT id, title, COALESCE(content, ''), COALESCE(due_date, ''), created_at, updated_at FROM nodes WHERE id = ?",
-		id,
-	).Scan(&n.ID, &n.Title, &n.Content, &n.DueDate, &n.CreatedAt, &n.UpdatedAt)
-	if err != nil {
-		return nil, err
-	}
-
-	rows, err := db.Query("SELECT tag FROM tags WHERE node_id = ?", id)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	for rows.Next() {
-		var tag string
-		rows.Scan(&tag)
-		n.Tags = append(n.Tags, tag)
-	}
-
-	rows, err = db.Query("SELECT to_id, rel_type FROM rels WHERE from_id = ?", id)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	for rows.Next() {
-		var toID, relType string
-		rows.Scan(&toID, &relType)
-		n.Relations[relType] = append(n.Relations[relType], toID)
-	}
-
-	return n, nil
-}