doc: update README and TODO

# Conflicts:
#	db_badger.go

.gitignore

@@ -1,8 +1,5 @@
 testdata/
-liblcl-*.zip
+qbolt
-liblcl.so
+qbolt.exe
-liblcl.dll
+qbolt.linux64.tar.xz
-yvbolt
+qbolt.win64.zip
-yvbolt.exe
-yvbolt.linux64.tar.xz
-yvbolt.win64.zip

CHANGELOG.md

@@ -0,0 +1,190 @@
+# Changelog
+
+2025-12-20 v2.0.0
+
+- Merge yvbolt and QBolt together
+- App: Show application version in main window titlebar
+
+2025-12-20 v0.11.0 (yvbolt)
+
+- Badger: Change encryption configuration options (**BREAKING**)
+- SSH Agent: Initial support, including lock/unlock
+- Badger, SQLite: Fix "all files" spec when choosing an export file path
+- Bolt: Support import/export as zip archive
+- Support SSH agents when using SSH tunnels (e.g. for Redis or Mongo)
+
+2025-12-17 v0.10.1 (yvbolt)
+
+- Fix mixed Qt 5 / Qt 6 syntax
+- Build release binaries with Go1.26
+- [⬇️ Download here](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/tag/v0.10.1)
+
+2025-12-16 v0.10.0 (yvbolt)
+
+- MongoDB: Initial support, including SSH tunnel, managing collections, traversing BSON documents, and querying
+- LotusDB: Initial support, including editing
+- Bitcask: Initial support, including editing and backup
+- RoseDB: Initial support, including editing
+- Badger: Fix k/v column display, support editing
+- LMDB: Support editing, add warning for destructive actions
+- LevelDB: Support editing
+- Pebble: Support editing
+- Starskey: Fix k/v column display, support editing
+- Redis: Bump driver version v9.16.0 -> v9.17.2
+- Bolt: Add warning for destructive actions
+- Connection manager: When saving, use the database's preferred name
+- App: Add hex viewer for binary data if it is not valid UTF-8
+- App: Use virtualized table renderer
+- App: Use multiple plug-in typed column stores in table backend
+- App: Fix graphical flicker when editing connections on Windows
+- App: Set up icon and exe properties on Windows
+- App: Embed version number in release builds
+- App: Show all driver versions as a virtual data table
+- App: Show unsaved-changes warning also when changing database
+- App: Fix rich text formatting appearing when pasting into the query window
+
+2025-12-02 v0.9.0 (yvbolt)
+
+- LMDB: Initial support, including multi-database mode, data editing, and managing child databases
+- Starskey: Initial support
+- Freedesktop.org Secret Service: Initial support, including unlocking collections and creating child collections
+- App: Use global toolbar style
+- App: Add connection manager, encrypting credentials with AEAD AES256-GCM using OS keychain
+- App: Offer to save valid quick-connection to the connection manager
+- App: Add 'About Qt' menu option
+- App: Fixed file extension filter for database files with no extension
+- App: Fixed background colour for Properties area on different OSes
+- App: Fixed libpng warnings about greyscale image data for embedded logo images
+- App: Fixed issue with non-UTF8 child database names
+- Debconf: Improve navigation speed by splitting applications into virtual tables
+- SSH: Redesign options to pick only one of the available auth methods
+- Fixed running release binary on Debian 12
+- [⬇️ Download here](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/tag/v0.9.0)
+
+2025-11-23 v0.8.0 (yvbolt)
+
+- Port from [liblcl](https://github.com/ying32/liblcl) to [MIQT Qt 6](https://github.com/mappu/miqt)
+- Badger: Upgrade v4.2.0 -> v4.8.0
+- Pebble: Upgrade v1.0.0 -> v1.1.5
+- SQLite: Upgrade v1.14.22 -> v1.14.32
+- Redis: Upgrade v9.5.3 -> v9.16.0
+- Bolt: Upgrade v1.4.0-alpha.1 -> v1.4.3
+- Bolt: Fix child buckets appearing in data area
+- Badger, Pebble, Debconf: Remove redundant "Data" navigation layer
+- Badger: Support encrypted databases
+- Badger: Support readonly databases
+- Badger: Add context-menu actions for backup, restore, and compact
+- Pebble: Support readonly databases
+- LevelDB: Add LevelDB database integration
+- Redis: Support SSH tunnel
+- SQLite: Allow editing the primary key column
+- App: New style connection dialog
+- App: Updated keyboard shortcuts (Ctrl+O to open new connection, F5 to refresh, F9 to execute query)
+- App: Add confirmation when refreshing the data table if there are uncommitted changes
+- [⬇️ Download here](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/tag/v0.8.0)
+
+2025-05-04 1.1.0 (qbolt)
+
+- New feature to import/export database as zip archive
+- Upgrade to Qt 6
+- Add keyboard shortcuts for refresh
+- Improve High DPI support
+- Rebuild artefacts with miqt v0.10.0, etcd-io/bbolt v1.4.0, go 1.23, Qt 6.8 (win64)
+- [⬇ Download here](https://git.ivysaur.me/code.ivysaur.me/qbolt/releases/tag/v1.1.0)
+
+2024-10-05 1.0.3 (qbolt)
+
+- Port from hybrid Go/C++ to now using [MIQT](https://github.com/mappu/miqt)
+- Switch Windows build to win64
+- Rebuild artefacts with miqt v0.5.0, etcd-io/bbolt v1.3.11, go 1.19 (deb12), go 1.23 (win64)
+- [⬇ Download here](https://git.ivysaur.me/code.ivysaur.me/qbolt/releases/tag/v1.0.3)
+
+2024-07-18 v0.7.0 (yvbolt)
+
+- SQLite, Bolt: Initial support for editing data (insert, per-cell update, delete)
+- SQLite: Add context menu actions for compact (vacuum), export, and drop table
+- App: New grid widget
+- App: Add refresh button
+- App: Bigger window size, use icons for toolbars, better UI colours for Windows
+- App: Prevent submitting blank queries to database
+- Refactor database interface and error handling
+- [⬇️ Download here](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/tag/v0.7.0)
+
+2024-06-30 v0.6.0 (yvbolt)
+
+- Debconf: Add as supported database
+- SQLite: Support table names containing special characters
+- SQLite: Improvements for experimental command-line driver 
+- Redis: Improve connection dialog window position
+- App: Cosmetic fixes for frame borders, help dialog, and Windows fonts+colours
+- Build: Change compression parameters for release builds
+- Build: Compile CGO with -O2 for release builds
+- [⬇️ Download here](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/tag/v0.6.0)
+
+2024-06-29 v0.5.0 (yvbolt)
+
+- Pebble: Add as supported database
+- Bolt: Support opening as readonly
+- Bolt: Support creating new databases
+- Bolt: Support adding/removing recursive child buckets
+- SQLite: Support custom CLI driver that parses `/usr/bin/sqlite3 -json` output (experimental)
+- Redis: Improve query parser to support quoted strings
+- App: Support refreshing elements in nav tree
+- App: Help menu option to show driver versions
+- App: Add image icons for refresh and close context menu actions
+- Build: Add makefile for cross-compiling release binaries
+- [⬇️ Download here](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/tag/v0.5.0)
+
+2024-06-23 v0.4.0 (yvbolt)
+
+- Redis: Add as supported database
+- Badger: Allow creating in-memory databases
+- App: Allow selecting partial query text to execute
+- App: Allow closing database connections from context menu
+- App: Allow scrolling large content on Properties pane
+- App: Preload recursive navigation
+- App: Automatically switch to selected database when new connection is created
+- App: Add help website link
+- App: Add database logo images
+
+2024-06-25 v0.3.0 (yvbolt)
+
+- Badger: Add BadgerDB v4 as supported database
+- SQLite: Add support for CGo-free SQLite driver under cross-compilation
+- Bolt: Update Bolt to v1.4.0-alpha.1
+- App: Add support for running custom queries
+- App: Add status bar showing currently selected DB
+- App: Fix missing icons in nav when selecting items 
+- App: Fix extra quotemarks when browsing string content of database
+
+2024-06-08 v0.2.0 (yvbolt)
+
+- SQLite: Add SQLite support (now requires CGo)
+- App: Add images for menu and navigation items
+
+2024-06-03 v0.1.0 (yvbolt)
+
+- Initial public release
+
+2020-04-12 1.0.2 (qbolt)
+
+- Rebuild artefacts with etcd-io/bbolt v1.3.5, go 1.15, Qt 5.15, and new GCC versions
+- Switch from hg to Git
+- Use Go modules
+- Add support for building Windows binary in Docker
+- [⬇ Download here](https://git.ivysaur.me/code.ivysaur.me/qbolt/releases/tag/v1.0.2)
+
+2017-06-19 1.0.1 (qbolt)
+
+- Feature: Option to open database as read-only
+- Fix an issue with support for bucket names and keys not surviving UTF-8 roundtrips (now binary-clean)
+- Fix an issue with crashing when deleting a bucket other than the selected one
+- Fix a cosmetic issue with application icon on Windows
+- [⬇ Download here](https://git.ivysaur.me/code.ivysaur.me/qbolt/releases/tag/v1.0.1)
+
+2017-05-21 1.0.0 (qbolt)
+
+- Initial public release
+- The project consists of two parts; a C binding (CGo) for the embeddable Bolt database engine, and a graphical interface built in C++/Qt that links to it.
+- [⬇ Download here](https://git.ivysaur.me/code.ivysaur.me/qbolt/releases/tag/v1.0.0)
+

LICENSE

@@ -1,7 +1,8 @@
 ISC License
 
-Copyright 2024 mappy
+Copyright 2025 mappy
-Copyright 2024 The yvbolt Author(s)
+Copyright 2025 The QBolt Author(s)
+Copyright 2025 The yvbolt Author(s)
 
 Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
 

Makefile

@@ -1,13 +1,19 @@
 SHELL:=/bin/bash
-SOURCES=$(find . -name '*.go' -type f)
+SOURCES := $(shell find . -name '*.go' -type f)
+GIT_REV := $(shell git describe --exact-match --tags 2>/dev/null || printf "%s-%s" $$(git describe --tags --abbrev=0) $$(git rev-parse HEAD | head -c8))
 .DEFAULT_GOAL := dist
+MIQT_UIC ?= ~/go/bin/miqt-uic
+MIQT_RCC ?= ~/go/bin/miqt-rcc
+MIQT_DOCKER ?= ~/go/bin/miqt-docker
+GO_WINRES ?= ~/go/bin/go-winres
 
 .PHONY: generate
 generate:
-	~/go/bin/miqt-uic -InFile mainwindow.ui -OutFile mainwindow.go -Qt6
+	/bin/bash -c '( echo "<RCC>" ; echo "  <qresource prefix=\"/\">" ; for f in assets/* ; do echo "    <file>$$f</file>" ; done ; echo "  </qresource>" ; echo "</RCC>" ) > embed.qrc'
-	~/go/bin/miqt-uic -InFile connectionDialog.ui -OutFile connectionDialog.go -Qt6
+	$(MIQT_UIC) -InFile mainwindow.ui -OutFile mainwindow.go -Qt6
-	~/go/bin/miqt-uic -InFile connectionManagerDialog.ui -OutFile connectionManagerDialog.go -Qt6
+	$(MIQT_UIC) -InFile connectionDialog.ui -OutFile connectionDialog.go -Qt6
-	~/go/bin/miqt-rcc -Input embed.qrc -Qt6
+	$(MIQT_UIC) -InFile connectionManagerDialog.ui -OutFile connectionManagerDialog.go -Qt6
+	$(MIQT_RCC) -Input embed.qrc -Qt6
 	
 .PHONY: designer
 designer:
@@ -20,30 +26,43 @@ optimize-images:
 	optipng -quiet -o5 assets/*.png
 	make generate
 
-yvbolt: $(SOURCES)
+qbolt: $(SOURCES)
 	# Target a debian-12 baseline build
-	~/go/bin/miqt-docker linux64-go1.25-qt6.4-dynamic -minify-build
+	sed -i -re 's/".+"/"$(GIT_REV)"/g' version.go
-	chmod 755 yvbolt
+	$(MIQT_DOCKER) linux64-go1.26-qt6.4-dynamic -minify-build
-	upx --lzma yvbolt
+	git checkout -- version.go
+	chmod 755 qbolt
+	upx --lzma qbolt
 
-yvbolt.exe: $(SOURCES)
+qbolt.exe: $(SOURCES)
-	~/go/bin/miqt-docker win64-cross-go1.24-qt6.5-static -windows-build --tags=windowsqtstatic
+	sed -i -re 's/".+"/"$(GIT_REV)"/g' version.go
-	upx --lzma yvbolt.exe
+	$(MIQT_DOCKER) win64-cross-go1.26-qt6.5-static -windows-build --tags=windowsqtstatic
+	git checkout -- version.go
+	$(GO_WINRES) patch --in winres.json --no-backup --product-version git-tag --file-version git-tag qbolt.exe
+	upx --lzma qbolt.exe
 
-yvbolt.apk: $(SOURCES)
+qbolt.apk: $(SOURCES)
-	~/go/bin/miqt-docker android-armv8a-go1.23-qt6.6-dynamic -android-build
+	$(MIQT_DOCKER) android-armv8a-go1.23-qt6.6-dynamic -android-build
 	
-yvbolt.linux64.tar.xz: yvbolt
+qbolt.linux64.tar.xz: qbolt
-	rm -f yvbolt.linux64.tar.xz
+	rm -f qbolt.linux64.tar.xz
-	XZ_OPT='-T0 -9' tar caf yvbolt.linux64.tar.xz --owner=0 --group=0 yvbolt
+	XZ_OPT='-T0 -9' tar caf qbolt.linux64.tar.xz --owner=0 --group=0 qbolt
 	
-yvbolt.win64.zip: yvbolt.exe
+qbolt.win64.zip: qbolt.exe
-	rm -f yvbolt.win64.zip
+	rm -f qbolt.win64.zip
-	zip -9 yvbolt.win64.zip yvbolt.exe
+	zip -9 qbolt.win64.zip qbolt.exe
 
 .PHONY: dist
-dist: yvbolt.linux64.tar.xz yvbolt.win64.zip
+dist: qbolt.linux64.tar.xz qbolt.win64.zip
 
 .PHONY: clean
 clean:
-	rm -f yvbolt.exe yvbolt yvbolt.linux64.tar.xz yvbolt.win64.zip
+	git checkout -- version.go
+	rm -f qbolt.exe qbolt qbolt.linux64.tar.xz qbolt.win64.zip
+
+#####
+# Test databases in Docker
+
+.PHONY: test-mongo
+test-mongo:
+	sudo docker run --rm  -p 127.0.0.1:27017:27017 -e MONGO_INITDB_ROOT_USERNAME=root -e MONGO_INITDB_ROOT_PASSWORD=toor mongo:latest

README.md

@@ -1,4 +1,4 @@
-# yvbolt
+# QBolt
 
 A graphical interface for multiple databases.
 
@@ -8,29 +8,36 @@ A graphical interface for multiple databases.
 - Connect to multiple databases at once
 - Browse table/bucket content
   - Use context menu to perform special table/bucket actions
+- Edit content, and add/delete rows for supported databases
+- View database/bucket statistics and metadata
 - Run custom SQL queries
   - Select text to run partial query
 - Safe handling for non-UTF8 key and data fields
+- Hex viewer for binary data
 - Connection Manager saves connections with AEAD AES256-GCM using OS keychain
 
-See also [qbolt](https://code.ivysaur.me/qbolt) for more/different functionality.
-
 ## Supported databases
 
-There are currently 10 supported databases:
+There are currently 16 supported databases:
 
-Database     |Read  |Editing  |Connection options  |Context menu actions
+Database     |Read  |Editing  |Query |Connection options  |Context menu actions
--------------|------|---------|--------------------|--------
+-------------|------|---------|------|--------------------|--------
-Badger v4    |Yes   |No       |Encrypted, readonly, in-memory |Backup, restore, compact
+Badger v4    |Yes   |Yes      |No    |Encrypted, readonly, in-memory |Backup, restore, compact
-Bolt         |Yes   |Yes      |Readonly            |Create/delete child buckets
+Bitcask      |Yes   |Yes      |No    |Readonly, autorecovery |Backup
-Debconf      |Yes   |No       |                    |
+BuntDB       |Yes   |Yes      |No    |In-memory           |Shrink
-Freedesktop.org Secret Service |Yes |No |          |Unlock, create new collection
+Bolt         |Yes   |Yes      |No    |Readonly            |Create/delete child buckets, import/export as zip
-LevelDB      |Yes   |No       |Readonly            |
+Debconf      |Yes   |No       |No    |                    |
-LMDB         |Yes   |Yes      |Multi-DB, readonly  |Create/delete child databases
+Freedesktop.org Secret Service |Yes |No | No |            |Unlock, create new collection
-Pebble       |Yes   |No       |Readonly, in-memory |
+LevelDB      |Yes   |Yes      |No    |Readonly            |
-Redis        |Yes   |No       |SSH tunnel, RESP v3 |
+LMDB         |Yes   |Yes      |No    |Multi-DB, readonly  |Create/delete child databases
-SQLite       |Yes   |Yes      |CLI driver, in-memory |Vacuum, export
+LotusDB      |Yes   |Yes      |No    |                    |
-Starskey     |Yes   |No       |Compression         |
+MongoDB      |Yes   |No       |Yes   |SSH tunnel          |Create/delete child databases and collections
+Pebble       |Yes   |Yes      |No    |Readonly, in-memory |
+Redis        |Yes   |No       |Yes   |SSH tunnel, RESP v3 |
+RoseDB       |Yes   |Yes      |No    |                    |
+SQLite       |Yes   |Yes      |Yes   |**SSH tunnel**, CLI driver, in-memory |Vacuum, export
+SSH Agent    |Yes   |No       |No    |Unix/TCP            |Lock, unlock
+Starskey     |Yes   |Yes      |No    |Compression         |
 
 ## License
 
@@ -41,126 +48,10 @@ The code in this project is licensed under the ISC license (see `LICENSE` file f
 - This project includes trademarked logo images for each supported database type.
 - The Windows binary is released under LGPL-3+ owing to the static copy of Qt.
 
+## Download
+
+Get the latest version from [the releases page »](https://git.ivysaur.me/code.ivysaur.me/qbolt/releases)
+
 ## Changelog
 
-2025-12-02 v0.9.0
+See [the full change history »](https://git.ivysaur.me/code.ivysaur.me/qbolt/src/branch/master/CHANGELOG.md)
-
-- LMDB: Initial support, including multi-database mode, data editing, and managing child databases
-- Starskey: Initial support
-- Freedesktop.org Secret Service: Initial support, including unlocking collections and creating child collections
-- App: Use global toolbar style
-- App: Add connection manager, encrypting credentials with AEAD AES256-GCM using OS keychain
-- App: Offer to save valid quick-connection to the connection manager
-- App: Add 'About Qt' menu option
-- App: Fixed file extension filter for database files with no extension
-- App: Fixed background colour for Properties area on different OSes
-- App: Fixed libpng warnings about greyscale image data for embedded logo images
-- App: Fixed issue with non-UTF8 child database names
-- Debconf: Improve navigation speed by splitting applications into virtual tables
-- SSH: Redesign options to pick only one of the available auth methods
-- Fixed running release binary on Debian 12
-
-[⬇️ Download for Windows x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.9.0/yvbolt.win64.zip)
-
-[⬇️ Download for Linux x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.9.0/yvbolt.linux64.tar.xz)
-
-2025-11-23 v0.8.0
-
-- Port from [liblcl](https://github.com/ying32/liblcl) to [MIQT Qt 6](https://github.com/mappu/miqt)
-- Badger: Upgrade v4.2.0 -> v4.8.0
-- Pebble: Upgrade v1.0.0 -> v1.1.5
-- SQLite: Upgrade v1.14.22 -> v1.14.32
-- Redis: Upgrade v9.5.3 -> v9.16.0
-- Bolt: Upgrade v1.4.0-alpha.1 -> v1.4.3
-- Bolt: Fix child buckets appearing in data area
-- Badger, Pebble, Debconf: Remove redundant "Data" navigation layer
-- Badger: Support encrypted databases
-- Badger: Support readonly databases
-- Badger: Add context-menu actions for backup, restore, and compact
-- Pebble: Support readonly databases
-- LevelDB: Add LevelDB database integration
-- Redis: Support SSH tunnel
-- SQLite: Allow editing the primary key column
-- App: New style connection dialog
-- App: Updated keyboard shortcuts (Ctrl+O to open new connection, F5 to refresh, F9 to execute query)
-- App: Add confirmation when refreshing the data table if there are uncommitted changes
-
-[⬇️ Download for Windows x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.8.0/yvbolt.win64.zip)
-
-[⬇️ Download for Linux x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.8.0/yvbolt.linux64.tar.xz)
-
-2024-07-18 v0.7.0
-
-- SQLite, Bolt: Initial support for editing data (insert, per-cell update, delete)
-- SQLite: Add context menu actions for compact (vacuum), export, and drop table
-- App: New grid widget
-- App: Add refresh button
-- App: Bigger window size, use icons for toolbars, better UI colours for Windows
-- App: Prevent submitting blank queries to database
-- Refactor database interface and error handling
-
-[⬇️ Download for Windows x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.7.0/yvbolt.win64.zip)
-
-[⬇️ Download for Linux x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.7.0/yvbolt.linux64.tar.xz)
-
-2024-06-30 v0.6.0
-
-- Debconf: Add as supported database
-- SQLite: Support table names containing special characters
-- SQLite: Improvements for experimental command-line driver 
-- Redis: Improve connection dialog window position
-- App: Cosmetic fixes for frame borders, help dialog, and Windows fonts+colours
-- Build: Change compression parameters for release builds
-- Build: Compile CGO with -O2 for release builds
-
-[⬇️ Download for Windows x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.6.0/yvbolt.win64.zip)
-
-[⬇️ Download for Linux x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.6.0/yvbolt.linux64.tar.xz)
-
-2024-06-29 v0.5.0
-
-- Pebble: Add as supported database
-- Bolt: Support opening as readonly
-- Bolt: Support creating new databases
-- Bolt: Support adding/removing recursive child buckets
-- SQLite: Support custom CLI driver that parses `/usr/bin/sqlite3 -json` output (experimental)
-- Redis: Improve query parser to support quoted strings
-- App: Support refreshing elements in nav tree
-- App: Help menu option to show driver versions
-- App: Add image icons for refresh and close context menu actions
-- Build: Add makefile for cross-compiling release binaries
-
-[⬇️ Download for Windows x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.5.0/yvbolt.win64.zip)
-
-[⬇️ Download for Linux x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.5.0/yvbolt.linux64.tar.xz)
-
-2024-06-23 v0.4.0
-
-- Redis: Add as supported database
-- Badger: Allow creating in-memory databases
-- App: Allow selecting partial query text to execute
-- App: Allow closing database connections from context menu
-- App: Allow scrolling large content on Properties pane
-- App: Preload recursive navigation
-- App: Automatically switch to selected database when new connection is created
-- App: Add help website link
-- App: Add database logo images
-
-2024-06-25 v0.3.0
-
-- Badger: Add BadgerDB v4 as supported database
-- SQLite: Add support for CGo-free SQLite driver under cross-compilation
-- Bolt: Update Bolt to v1.4.0-alpha.1
-- App: Add support for running custom queries
-- App: Add status bar showing currently selected DB
-- App: Fix missing icons in nav when selecting items 
-- App: Fix extra quotemarks when browsing string content of database
-
-2024-06-08 v0.2.0
-
-- SQLite: Add SQLite support (now requires CGo)
-- App: Add images for menu and navigation items
-
-2024-06-03 v0.1.0
-
-- Initial public release

TODO

@@ -1,31 +1,35 @@
-- Bolt, LMDB: Editing primary key causes duplicate field
+- BUG: Connecting to multiple DBs from connection manager: if one has an error, the error popup from the others is lost
-- Parity with QBolt, merge projects together
+- BUG: ExecQuery being called multiple times on error?
+- Drag and drop database into UI (QBolt parity)
 - Portable mode (portable.txt or portable/ dir)
 - Syntax highlighting in editor
+- Autorefresh
+- Sshagent
+	- want to trigger an async refresh from inside the LDB after lock/unlock
+	- support adding/removing keys (will need per-row actions)
+- SSH: knownhost parser is stricter than openssh, does not support hostname if there is known a knownhost for the IP address
+- Bolt: import/export should support passworded zips
+- Table: BSON view can't see data
+- Table: quick filter
+	- QSortFilterProxyModel
+- Cancellation
+- Loading animations for connection + queries
 - Mutation
-	- Badger: Support insert/update/delete
-	- Pebble: Support insert/update/delete
 	- Debconf: Support insert/update/delete
 	- Redis: Support insert/update/delete
-	- LevelDB: Support insert/update/delete
-	- Starskey: Support insert/update/delete
 	- SecretService: Support insert/update/delete
 - Binary data viewer
 	- Detect jpg/png and show as image
-	- Prevent editing invalid-utf8 fields as text (binary data editor?)
 - More DB types
 	- MySQL (& MariaDB/TiDB)
 	- Postgres
 		- CLI using psql
-	- MongoDB
+	- Lungo: Mini embeddable Mongo - https://github.com/256dpi/lungo 
-		- Lungo: Mini embeddable Mongo - https://github.com/256dpi/lungo 
 	- MSSQL (recursive navigation for instances)
 	- Other K/V stores from https://github.com/smallnest/kvbench 
 	- Windows registry
+		- Allow entering path for quick navigation
 	- LDAP
-	- LotusDB https://github.com/lotusdblabs/lotusdb
-	- Bitcask https://git.mills.io/prologic/bitcask
-		- Related: Rosedb https://github.com/rosedblabs/rosedb
 	- Dolt
 	- Memcache
 		- Listing all keys is not well supported, needs hacks
@@ -37,45 +41,74 @@
 	- Etcd
 		- v2: hierarchal
 		- v3: flat key namespace
-	- Tokyo Cabinet, Kyoto Cabinet, Tkrzw
-		- https://github.com/TerraTech/go-tokyocabinet needs pkg-config tokyocabinet
-		- https://github.com/estraier/tkrzw-go needs pkg-config tkrzw
 	- CSV file
 		- Allow querying with sqlite or duckDB?
 	- Parquet file
 		- Allow querying with duckDB?
-	- IRC client
 	- SSDB (Redis-compatible)
 	- Time-series DBs
 		- Prometheus
 		- VictoriaMetrics
 		- FrostDB https://github.com/polarsignals/frostdb
 	- https://dbdb.io/browse?programming=go-lang&q=
-- Connection dialog
+	- Maxmind GeoIP MMDB format
-	- SSH over Cockpit
+		- https://github.com/maxmind/mmdbwriter
+	- KeePass kdbx
+	- Not-quite-DBs
+		- IRC client
+		- Docker daemon (images, containers, ...)
+		- ssh-agent
+		- ssh known-hosts
+			- golang.org/x/crypto/ssh/knownhosts - already using this package
+	- Generic ODBC, database/sql, ...
+	- Other language DBs
+		- C, C++
+			- Tokyo Cabinet, Kyoto Cabinet, Tkrzw
+				- https://github.com/TerraTech/go-tokyocabinet needs pkg-config tokyocabinet
+				- https://github.com/estraier/tkrzw-go needs pkg-config tkrzw
+			- cdb (DJB's Constant Database)
+			- RocksDB
+				- https://github.com/tecbot/gorocksdb Go bindings, need pkg-config rocksdb
+		- Rust
+			- Stoolap https://github.com/stoolap/stoolap
+			- Rust, needs C binding layer https://github.com/mozilla/cbindgen
+		- JDBC Java databases
+			- H2, HSQLDB, Apache Derby
 - SQLite CLI driver:
 	- Context support
 	- Write support
-	- Attach to SSH tunnel
 	- Configure binary path
+	- Error handling: if an error occurs, listing db tables has problems/shows separators
 	- https://ricardoanderegg.com/posts/sqlite-remote-explorer-gui/
 	- https://github.com/litements/litexplore
 - Badger:
 	- v1/v2/v3 support
 	- option to use namespace separators for virtual buckets
-- SQLite: drop table doesn't autorefresh nav since callback is late
+- SQLite:
+	- drop table doesn't autorefresh nav since callback is late
+	- more accurate type handling
+		- binary data currently shows as "<<binary>>", edits wrongly
+	- views
+	- other special objects (triggers? udf functions?)
+	- remove current hardcoded LIMIT 1000
+	- attach additional db to same connection
 - LMDB: dupsort mode (duplicate keys / entries-per-key)
-- Build
+- MongoDB
-	- Win32 icon resource
+	- UI for replica sets, ssl certs, cluster, custom auth database
+	- SSH tunnel: error `ssh: tcpChan: deadline not supported` - needs workaround
+	- Backup/restore
+	- drop db/collection doesn't autorefresh nav since server is asynchronous
+- SSH tunnel
+	- option to use external/system SSH
+	- SSH over Cockpit
 - Performance
 	- Warning if data table is filtered to 1000 rows, or add pagination
 	- Context/interrupt slow queries
-	- Faster virtual rendering
 - Query history
+- Query log
 - Test suite
 	- `CREATE TABLE foo (id integer primary key, aaa text not null, bbb text not null);`
 - Ability to convert database types
 - Export all data from grid
 - Export all data from all buckets within a DB
 - Reconnect
-- Connecting to multiple DBs from connection manager: if one has an error, the error popup from the others is lost

config.go

@@ -20,25 +20,26 @@ type ConnectionConfig struct {
 	Type autoconfig.OneOf
 
 	Badger        *badgerConnection        `ylabel:"BadgerDB v4" yicon:":/assets/vendor_dgraph.png" json:",omitempty"`
+	Bitcask       *bitcaskDBConnection     `yicon:":/assets/vendor_riak.png" json:",omitempty"`
 	Bolt          *boltConfig              `yicon:":/assets/vendor_github.png" json:",omitempty"`
+	BuntDB        *buntDBConnection        `ylabel:"BuntDB" yicon:":/assets/vendor_buntdb.png" json:",omitempty"`
 	Debconf       *debconfConnection       `yicon:":/assets/vendor_debian.png" json:",omitempty"`
 	SecretService *secretServiceConnection `ylabel:"Freedesktop.org Secret Service" yicon:":/assets/vendor_freedesktop.png" json:",omitempty"`
-	LevelDB       *leveldbConnection       `yicon:":/assets/vendor_leveldb.png" json:",omitempty"`
+	LevelDB       *leveldbConnection       `ylabel:"LevelDB" yicon:":/assets/vendor_leveldb.png" json:",omitempty"`
 	LMDB          *lmdbConnection          `yicon:":/assets/vendor_lmdb.png" json:",omitempty"`
+	LotusDB       *lotusDBConnection       `ylabel:"LotusDB" yicon:":/assets/vendor_lotus.png" json:",omitempty"`
+	MongoDB       *mongoConnection         `ylabel:"MongoDB" yicon:":/assets/vendor_mongodb.png" json:",omitempty"`
 	Pebble        *pebbleConnection        `yicon:":/assets/vendor_cockroach.png" json:",omitempty"`
 	Redis         *redisConnectionOptions  `yicon:":/assets/vendor_redis.png" json:",omitempty"`
-	SQLite        *sqliteConnection        `yicon:":/assets/vendor_sqlite.png" json:",omitempty"`
+	RoseDB        *roseDBConn              `ylabel:"RoseDB" yicon:":/assets/vendor_rosedb.png" json:",omitempty"`
+	SQLite        *sqliteConnection        `ylabel:"SQLite" yicon:":/assets/vendor_sqlite.png" json:",omitempty"`
+	SSHAgent      *sshAgentConn            `yicon:":/assets/vendor_ssh.png" json:",omitempty"`
 	Starskey      *starskeyConnection      `yicon:":/assets/vendor_starskey.png" json:",omitempty"`
 }
 
 func NewConnectionConfig() *ConnectionConfig {
 	return &ConnectionConfig{
-		Debconf: &debconfConnection{
+		Type: "Bolt", // favouritism
-			Database: "/var/cache/debconf/config.dat", // Prefill default path
-		},
-		Redis: &redisConnectionOptions{
-			Address: autoconfig.AddressPort{Port: 6379}, // default value
-		},
 	}
 }
 
@@ -100,6 +101,11 @@ func (cc *ConnectionConfig) Connect(ctx context.Context) (loadedDatabase, string
 var _ DBConnector = &ConnectionConfig{}
 
 func (f *App) OnMnuConnectClick() {
+	config := NewConnectionConfig()
+	f.showConnectDialog(config)
+}
+
+func (f *App) showConnectDialog(config *ConnectionConfig) {
 
 	// autoconfig.OpenDialog() does not give us a "yes/no" result back from the
 	// dialog, so we still have to custom construct the dialog and use the
@@ -110,8 +116,6 @@ func (f *App) OnMnuConnectClick() {
 	dlg.ConnectDialog.SetModal(true)
 	dlg.ConnectDialog.SetAttribute(qt.WA_DeleteOnClose)
 
-	config := NewConnectionConfig()
-
 	saver := autoconfig.MakeConfigArea(config, dlg.formLayout)
 
 	dlg.ConnectDialog.OnAccept(func(super func()) {
@@ -139,7 +143,7 @@ func (f *App) OnMnuConnectClick() {
 		// Connection OK
 		// Offer to save into connection-manager
 		if res := qt.QMessageBox_Question2(dlg.ConnectDialog.QWidget, APPNAME, "Connection successful. Save the details into Connection Manager?", qt.QMessageBox__Save, qt.QMessageBox__Ignore); res == int(qt.QMessageBox__Save) {
-			f.TrySaveIntoConnectionManager(config)
+			f.TrySaveIntoConnectionManager(config, displayName)
 		}
 
 		// Default accept behaviour is: setResult(Accepted), emits onFinished; && Hide()
@@ -174,14 +178,18 @@ func (c ConnMgrSaveError) Unwrap() error {
 	return c.e
 }
 
-func (f *App) TrySaveIntoConnectionManager(cc *ConnectionConfig) {
+func (f *App) TrySaveIntoConnectionManager(cc *ConnectionConfig, displayName string) {
 	data, err := f.getConnectionManagerContents()
 	if err != nil {
 		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, ConnMgrLoadError{err}.Error())
 	}
 
+	if displayName == "" {
+		displayName = cc.String()
+	}
+
 	data.Entries = append(data.Entries, SavedConfigEntry{
-		Description: cc.String(),
+		Description: displayName,
 		Connection:  *cc,
 	})
 

configSave.go

@@ -88,6 +88,12 @@ func (f *App) getConnectionManagerContents() (*SavedConfig, error) {
 		return nil, err
 	}
 
+	// Before returning the configuration, sort the entries alphabetically
+	sort.Slice(ret.Entries, func(i, j int) bool {
+		// FIXME there is probably a slightly more efficient way of doing this
+		return strings.ToLower(ret.Entries[i].Description) < strings.ToLower(ret.Entries[j].Description)
+	})
+
 	// Success
 	return &ret, nil
 }
@@ -153,15 +159,7 @@ func (f *App) saveConnectionManagerContents(sc *SavedConfig) error {
 	}
 
 	// Force update the saved version
-	sc.UserAgent = APPNAME // TODO get app's own version
+	sc.UserAgent = APPNAME + `/` + appVersion // e.g. QBolt/v0.0.0-devel
-
-	// When saving, the version that gets saved always has descriptions sorted
-	// alphabetically.
-	// But, you won't know this until you reload the contents.
-	sort.Slice(sc.Entries, func(i, j int) bool {
-		// FIXME there is probably a slightly more efficient way of doing this
-		return strings.ToLower(sc.Entries[i].Description) < strings.ToLower(sc.Entries[j].Description)
-	})
 
 	// Marshal
 

db_badger.go

@@ -21,20 +21,17 @@ func (ld *badgerLoadedDatabase) DriverName() string {
 	return "BadgerDB v4"
 }
 
-func (ld *badgerLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (ld *badgerLoadedDatabase) Properties(bucketPath []string) (string, error) {
-
-	// Load properties
-
 	content := fmt.Sprintf("Table statistics: %#v", ld.db.Tables())
-	f.propertiesBox.SetText(content)
+	return content, nil
+}
+
+func (ld *badgerLoadedDatabase) RenderForNav(f *tableState, bucketPath []string) error {
 
 	// Load data
 	// Badger always uses Key + Value as the columns
 
-	f.contentBox.SetColumnCount(2)
+	f.SetupColumns([]columnType{columnType_popupData, columnType_popupData}, []string{"Key", "Value"})
-	f.contentBox.SetHorizontalHeaderLabels([]string{"Key", "Value"})
-
-	f.contentBox.SetRowCount(0)
 
 	err := ld.db.View(func(txn *badger.Txn) error {
 
@@ -48,11 +45,7 @@ func (ld *badgerLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []strin
 			item := it.Item()
 			k := item.Key()
 			err := item.Value(func(v []byte) error {
-				rpos := f.contentBox.RowCount()
+				f.AddRow_PK_Data(k, k, v)
-				f.contentBox.SetRowCount(rpos + 1)
-				f.contentBox.SetItem(rpos, 0, qt.NewQTableWidgetItem2(formatUtf8(k)))
-				f.contentBox.SetItem(rpos, 0, qt.NewQTableWidgetItem2(formatUtf8(v)))
-
 				return nil
 			})
 			if err != nil {
@@ -66,11 +59,16 @@ func (ld *badgerLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []strin
 	}
 
 	// Valid
-	f.contentBox.ResizeColumnsToContents()
+	f.Ready()
-	f.contentBox.SetEnabled(true)
 	return nil
 }
 
+func (n *badgerLoadedDatabase) ApplyChanges(f *tableState, bucketPath []string) error {
+	return n.db.Update(func(txn *badger.Txn) error {
+		return kvstore_ApplyChanges(f, txn.Set, txn.Delete)
+	})
+}
+
 func (ld *badgerLoadedDatabase) NavChildren(bucketPath []string) ([]string, error) {
 	return []string{}, nil // No children
 }
@@ -84,7 +82,7 @@ func (ld *badgerLoadedDatabase) NavContext(bucketPath []string) ([]contextAction
 }
 
 func (ld *badgerLoadedDatabase) ExportBackup(sender *qt.QTreeWidgetItem, bucketPath []string) error {
-	saveAs := qt.QFileDialog_GetSaveFileName4(sender.TreeWidget().QWidget, "Export backup...", "", "Badger database backups (*.bak);;All files (*.*)")
+	saveAs := qt.QFileDialog_GetSaveFileName4(sender.TreeWidget().QWidget, "Export backup...", "", "Badger database backups (*.bak);;All files (*)")
 	if saveAs == "" {
 		return nil
 	}
@@ -100,7 +98,7 @@ func (ld *badgerLoadedDatabase) ExportBackup(sender *qt.QTreeWidgetItem, bucketP
 }
 
 func (ld *badgerLoadedDatabase) ImportBackup(sender *qt.QTreeWidgetItem, bucketPath []string) error {
-	openPath := qt.QFileDialog_GetOpenFileName4(sender.TreeWidget().QWidget, "Import backup...", "", "Badger database backups (*.bak);;All files (*.*)")
+	openPath := qt.QFileDialog_GetOpenFileName4(sender.TreeWidget().QWidget, "Import backup...", "", "Badger database backups (*.bak);;All files (*)")
 	if openPath == "" {
 		return nil
 	}
@@ -134,19 +132,44 @@ func (ld *badgerLoadedDatabase) Close() {
 	_ = ld.db.Close()
 }
 
-var _ loadedDatabase = &badgerLoadedDatabase{} // interface assertion
+var _ loadedDatabase = &badgerLoadedDatabase{}         // interface assertion
+var _ editableLoadedDatabase = &badgerLoadedDatabase{} // interface assertion
 
 //
 
 type badgerConnection struct {
 	Type autoconfig.OneOf
 	Disk *struct {
-		Directory         autoconfig.ExistingDirectory
+		Directory  autoconfig.ExistingDirectory
-		Readonly          bool
+		Readonly   bool
-		Encryption_Method autoconfig.EnumList `yenum:"None;;Hex (AES-128/192/256);;Passphrase (SHA256 KDF to AES-256)"`
+		Encryption *encryptionKey
-		Encryption_Key    autoconfig.Password
+	} `json:",omitempty"`
+	Memory *struct{} `json:",omitempty"`
+}
+
+type encryptionKey struct {
+	Method autoconfig.EnumList `yenum:"Text;;Hex;;Passphrase (SHA256 KDF to AES-256)"`
+	Key    autoconfig.Password
+}
+
+func (e encryptionKey) Get() ([]byte, error) {
+	switch e.Method {
+	case 0: // Text
+		return []byte(e.Key), nil
+
+	case 1: // Hex
+		// For Badger, the input must be 16/24/32 bytes for AES-128/192/256
+		// The library checks this, we don't need to
+		return hex.DecodeString(string(e.Key))
+
+	case 2: // Passphrase (SHA256 KDF to AES-256)
+		hasher := sha256.New()
+		hasher.Write([]byte(e.Key))
+		return hasher.Sum(nil), nil
+
+	default:
+		return nil, fmt.Errorf("Unsupported encoding method for encryption key")
 	}
-	Memory *struct{}
 }
 
 func (bdc *badgerConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
@@ -155,23 +178,16 @@ func (bdc *badgerConnection) Connect(ctx context.Context) (loadedDatabase, strin
 		opts.ReadOnly = bdc.Disk.Readonly
 		opts.MetricsEnabled = false
 
-		switch bdc.Disk.Encryption_Method {
+		if bdc.Disk.Encryption != nil {
-		case 0: // None
+			ehx, err := bdc.Disk.Encryption.Get()
-		case 1: // Hex (AES-128/192/256) -  must be 16/24/32 bytes
-			ehx, err := hex.DecodeString(string(bdc.Disk.Encryption_Key))
 			if err != nil {
-				return nil, "", err
+				return nil, "", fmt.Errorf("Loading encryption key: %w", err)
 			}
 
 			if !(len(ehx) == 16 || len(ehx) == 24 || len(ehx) == 32) {
-				return nil, "", fmt.Errorf("Hex encryption key must be 16/24/32 bytes long, got %d", len(ehx))
+				return nil, "", fmt.Errorf("Encryption key must be 16/24/32 bytes long, got %d", len(ehx))
 			}
 			opts.EncryptionKey = ehx
-
-		case 2: // Passphrase (SHA256 KDF to AES-256)
-			hasher := sha256.New()
-			hasher.Write([]byte(bdc.Disk.Encryption_Key))
-			opts.EncryptionKey = hasher.Sum(nil)
 		}
 
 		db, err := badger.Open(opts)

db_bitcask.go

@@ -0,0 +1,113 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"path/filepath"
+
+	"github.com/mappu/autoconfig"
+	qt "github.com/mappu/miqt/qt6"
+	"go.mills.io/bitcask/v2"
+)
+
+type bitcaskLdb struct {
+	db *bitcask.Bitcask
+}
+
+func (ld *bitcaskLdb) DriverName() string {
+	return "Bitcask"
+}
+
+func (ld *bitcaskLdb) Properties(bucketPath []string) (string, error) {
+	stats, err := ld.db.Stats()
+	if err != nil {
+		return "", err
+	}
+
+	return fmt.Sprintf("Database: %s\n\nStats:\n%#v\n", ld.db.Path(), stats), nil
+}
+
+func (ld *bitcaskLdb) RenderForNav(f *tableState, bucketPath []string) error {
+
+	// Load data
+	f.SetupColumns([]columnType{columnType_popupData, columnType_popupData}, []string{"Key", "Value"})
+
+	cur := ld.db.Iterator()
+	defer cur.Close()
+
+	for {
+		itm, err := cur.Next()
+		if err != nil {
+			if err == bitcask.ErrStopIteration {
+				break // OK
+			}
+			return err
+		}
+
+		f.AddRow_PK_Data([]byte(itm.Key()), []byte(itm.Key()), []byte(itm.Value()))
+	}
+
+	// Valid
+	f.Ready()
+	return nil
+}
+
+func (n *bitcaskLdb) ApplyChanges(f *tableState, bucketPath []string) error {
+	return kvstore_ApplyChanges(
+		f,
+		func(k, v []byte) error { return n.db.Put(bitcask.Key(k), bitcask.Value(v)) },
+		func(k []byte) error { return n.db.Delete(bitcask.Key(k)) },
+	)
+}
+
+func (ld *bitcaskLdb) NavChildren(bucketPath []string) ([]string, error) {
+	return []string{}, nil // No children
+}
+
+func (ld *bitcaskLdb) actionBackup(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+	backupDir := qt.QFileDialog_GetExistingDirectory3(sender.TreeWidget().QWidget, APPNAME, "Select an output directory to backup to...")
+	if backupDir == "" {
+		return nil // cancelled
+	}
+
+	return ld.db.Backup(backupDir)
+}
+
+func (ld *bitcaskLdb) NavContext(bucketPath []string) ([]contextAction, error) {
+	return []contextAction{
+		{"Backup...", ld.actionBackup},
+	}, nil
+}
+
+func (ld *bitcaskLdb) Close() {
+	_ = ld.db.Close()
+}
+
+var _ loadedDatabase = &bitcaskLdb{}         // interface assertion
+var _ editableLoadedDatabase = &bitcaskLdb{} // interface assertion
+
+//
+
+type bitcaskDBConnection struct {
+	Directory    autoconfig.ExistingDirectory
+	Readonly     bool
+	AutoRecovery bool
+}
+
+func (c *bitcaskDBConnection) Reset() {
+	c.AutoRecovery = true
+}
+
+func (c *bitcaskDBConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
+
+	db, err := bitcask.Open(
+		string(c.Directory),
+		bitcask.WithOpenReadonly(c.Readonly),
+		bitcask.WithAutoRecovery(c.AutoRecovery),
+	)
+	if err != nil {
+		return nil, "", err
+	}
+
+	return &bitcaskLdb{db: db}, filepath.Base(string(c.Directory)), nil
+}

db_bolt.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bytes"
 	"context"
 	"errors"
 	"fmt"
@@ -58,13 +59,15 @@ func (ld *boltLoadedDatabase) DriverName() string {
 	return "Bolt " + version.Version
 }
 
-func (ld *boltLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (ld *boltLoadedDatabase) Properties(bucketPath []string) (string, error) {
+	content := fmt.Sprintf("Selected database: %#v", ld.db.Stats())
+	return content, nil
+}
+
+func (ld *boltLoadedDatabase) RenderForNav(f *tableState, bucketPath []string) error {
 
 	// Load properties
 
-	content := fmt.Sprintf("Selected database: %#v", ld.db.Stats())
-	f.propertiesBox.SetText(content)
-
 	if len(bucketPath) == 0 {
 		return nil // Can't have data outside of the top bucket
 	}
@@ -72,10 +75,7 @@ func (ld *boltLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string)
 	// Load data
 	// Bolt always uses Key + Value as the columns
 
-	f.contentBox.SetColumnCount(2)
+	f.SetupColumns([]columnType{columnType_popupData, columnType_popupData}, []string{"Key", "Value"})
-	f.contentBox.SetHorizontalHeaderLabels([]string{"Key", "Value"})
-
-	f.contentBox.SetRowCount(0)
 
 	err := ld.db.View(func(tx *bbolt.Tx) error {
 		b := boltTargetBucket(tx, bucketPath)
@@ -94,10 +94,7 @@ func (ld *boltLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string)
 				continue
 			}
 
-			rpos := f.contentBox.RowCount()
+			f.AddRow_PK_Data(k, k, v)
-			f.contentBox.SetRowCount(rpos + 1)
-			f.contentBox.SetItem(rpos, 0, qt.NewQTableWidgetItem2(formatUtf8(k)))
-			f.contentBox.SetItem(rpos, 1, qt.NewQTableWidgetItem2(formatUtf8(v)))
 		}
 		return nil
 	})
@@ -106,21 +103,70 @@ func (ld *boltLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string)
 	}
 
 	// Valid
-	f.contentBox.ResizeColumnsToContents()
+	f.Ready()
-	f.contentBox.SetEnabled(true)
 	return nil
 }
 
-func (n *boltLoadedDatabase) ApplyChanges(f *App, bucketPath []string) error {
+// kvstore_ApplyChanges is a helper function to apply edits to K/V stores that
-	if n.db.IsReadOnly() {
+// can use a common abstraction.
-		return errors.New("Database was opened read-only")
+// It always uses the "popupData" type i.e. []byte.
+func kvstore_ApplyChanges(f *tableState, Put func(k, v []byte) error, Delete func(k []byte) error) error {
+
+	// Columns are two binColumn
+	keyCol := f.columns[0].(*binColumn)
+	valCol := f.columns[1].(*binColumn)
+
+	// Edit
+	for rowid, _ /*editcells*/ := range f.updateRows {
+		k_orig := f.primaryKeys[rowid]
+		k_new := keyCol.vals[rowid]
+		v := valCol.vals[rowid]
+
+		if !bytes.Equal(k_orig, k_new) {
+			// Editing the primary key
+			// Delete k_orig and only put in k_new
+			err := Delete(k_orig)
+			if err != nil {
+				return fmt.Errorf("Deleting cell %q: %w", formatUtf8(k_orig), err)
+			}
+		}
+
+		err := Put(k_new, []byte(v))
+		if err != nil {
+			return fmt.Errorf("Updating cell %q: %w", formatUtf8(k_new), err)
+		}
 	}
 
-	// We have rendered row IDs, need to convert back to a bolt primary key
+	// Delete by key (affects rowids after re-render)
-	// TODO stash the real key inside f.contentBox.Objects()
+	for rowid, _ := range f.deleteRows {
-	// FIXME breaks if you try and edit the primary key(!)
+		k := f.primaryKeys[rowid]
-	primaryKeyForRendered := func(rowid int) []byte {
+		err := Delete(k)
-		return []byte(f.ui.contentBox.Item(rowid, 0).Text())
+		if err != nil {
+			return fmt.Errorf("Deleting cell %q: %w", formatUtf8(k), err)
+		}
+	}
+
+	// Insert all new entries
+	for rowid, _ := range f.insertRows {
+		// Newly inserted rows will not have a valid value stashed in the
+		// f.primaryKeys slice
+		// Have to get it from the data content of the cell directly
+
+		k := keyCol.vals[rowid]
+		v := valCol.vals[rowid] // There's only one value cell
+		err := Put(k, v)
+		if err != nil {
+			return fmt.Errorf("Inserting cell %q: %w", formatUtf8(k), err)
+		}
+	}
+
+	// Done
+	return nil
+}
+
+func (n *boltLoadedDatabase) ApplyChanges(f *tableState, bucketPath []string) error {
+	if n.db.IsReadOnly() {
+		return errors.New("Database was opened read-only")
 	}
 
 	return n.db.Update(func(tx *bbolt.Tx) error {
@@ -128,37 +174,7 @@ func (n *boltLoadedDatabase) ApplyChanges(f *App, bucketPath []string) error {
 		// Get current bucket handle
 		b := boltTargetBucket(tx, bucketPath)
 
-		// Edit
+		return kvstore_ApplyChanges(f, b.Put, b.Delete)
-		for rowid, _ /*editcells*/ := range f.updateRows {
-			k := primaryKeyForRendered(rowid)
-			v := f.ui.contentBox.Item(rowid, 1).Text() // There's only one value cell
-			err := b.Put(k, []byte(v))
-			if err != nil {
-				return fmt.Errorf("Updating cell %q: %w", formatUtf8(k), err)
-			}
-		}
-
-		// Delete by key (affects rowids after re-render)
-		for rowid, _ := range f.deleteRows {
-			k := primaryKeyForRendered(rowid)
-			err := b.Delete(k)
-			if err != nil {
-				return fmt.Errorf("Deleting cell %q: %w", formatUtf8(k), err)
-			}
-		}
-
-		// Insert all new entries
-		for rowid, _ := range f.insertRows {
-			k := primaryKeyForRendered(rowid)
-			v := f.ui.contentBox.Item(rowid, 1).Text() // There's only one value cell
-			err := b.Put(k, []byte(v))
-			if err != nil {
-				return fmt.Errorf("Inserting cell %q: %w", formatUtf8(k), err)
-			}
-		}
-
-		// Done
-		return nil
 	})
 }
 
@@ -167,14 +183,30 @@ func (ld *boltLoadedDatabase) NavChildren(bucketPath []string) ([]string, error)
 	return boltChildBucketNames(ld.db, bucketPath)
 }
 
-func (ld *boltLoadedDatabase) NavContext(bucketPath []string) (ret []contextAction, err error) {
+func (ld *boltLoadedDatabase) NavContext(bucketPath []string) ([]contextAction, error) {
-	ret = append(ret, contextAction{"Add bucket...", ld.AddChildBucket})
+	ret := []contextAction{
+		{"Add bucket...", ld.AddChildBucket},
+	}
 
 	if len(bucketPath) > 0 {
 		ret = append(ret, contextAction{"Delete bucket", ld.DeleteBucket})
 	}
 
-	return
+	if len(bucketPath) == 0 {
+		ret = append(ret, contextAction{"Export to .zip...", ld.exportToZip})
+	}
+
+	return ret, nil
+}
+
+func (ld *boltLoadedDatabase) exportToZip(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+	// Popup for output file
+	savePath := qt.QFileDialog_GetSaveFileName4(sender.TreeWidget().QWidget, "Save backup as...", "", "Zip archive (*.zip);;All files (*)")
+	if savePath == "" {
+		return nil // cancelled
+	}
+
+	return ld.exportDatabaseToZip(savePath)
 }
 
 func (ld *boltLoadedDatabase) AddChildBucket(sender *qt.QTreeWidgetItem, bucketPath []string) error {
@@ -201,7 +233,10 @@ func (ld *boltLoadedDatabase) AddChildBucket(sender *qt.QTreeWidgetItem, bucketP
 }
 
 func (ld *boltLoadedDatabase) DeleteBucket(sender *qt.QTreeWidgetItem, bucketPath []string) error {
-	// TODO add confirmation
+
+	if !vcl_confirm_dialog(sender.TreeWidget().QWidget, fmt.Sprintf("Are you sure you want to delete the bucket %q?", bucketPath[0])) {
+		return nil // cancelled
+	}
 
 	err := ld.db.Update(func(tx *bbolt.Tx) error {
 		// Find parent of this bucket.
@@ -229,6 +264,11 @@ var _ editableLoadedDatabase = &boltLoadedDatabase{} // interface assertion
 
 //
 
+// boltTargetBucket resolves the bucketPath to a specific bolt.Bucket.
+// If the path is empty, this function returns <nil> and you must manually access
+// the root bucket.
+// If the bucket does not exist, this function returns <nil>. It does not create
+// the bucket.
 func boltTargetBucket(tx *bbolt.Tx, path []string) *bbolt.Bucket {
 
 	// If we are already deep in buckets, go directly there to find children

db_bolt_zip.go

@@ -0,0 +1,230 @@
+package main
+
+import (
+	"archive/zip"
+	"bytes"
+	"fmt"
+	"io"
+	"io/fs"
+	"os"
+	"path"
+	"strings"
+
+	"github.com/mappu/autoconfig"
+
+	qt "github.com/mappu/miqt/qt6"
+	"go.etcd.io/bbolt"
+)
+
+func (ld *boltLoadedDatabase) exportDatabaseToZip(zippath string) error {
+
+	fh, err := os.OpenFile(zippath, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0644)
+	if err != nil {
+		return fmt.Errorf("Error opening output file: %w", err)
+	}
+	defer fh.Close()
+
+	zw := zip.NewWriter(fh)
+
+	// Filenames in zip files cannot contain `/` characters. Mangle it
+	// TODO undo this transfomation on import(!)
+	safename := func(n string) string {
+		return strings.ReplaceAll(string(n), `/`, `__`)
+	}
+
+	err = ld.db.View(func(tx *bbolt.Tx) error {
+
+		var process func(currentPath []string) error
+		process = func(currentPath []string) error {
+
+			// Create folder-entry for our own bucket
+
+			ourFolderName := path.Join(slice_apply(currentPath, safename)...)
+
+			ourBucket := zip.FileHeader{
+				Name: ourFolderName + `/`, // Trailing slash = directory
+			}
+			ourBucket.SetMode(fs.ModeDir | 0755)
+			_, err := zw.CreateHeader(&ourBucket)
+			if err != nil {
+				return err
+			}
+
+			// Create file entries for all non-bucket children
+
+			b := boltTargetBucket(tx, currentPath)
+			var childBuckets []string
+
+			var c *bbolt.Cursor
+			if b != nil {
+				c = b.Cursor() // in bucket
+			} else {
+				c = tx.Cursor()
+			}
+			for k, v := c.First(); k != nil; k, v = c.Next() {
+				if v == nil {
+					// That's a bucket
+					childBuckets = append(childBuckets, string(k))
+					continue
+				}
+
+				fileItem := zip.FileHeader{
+					Name: path.Join(ourFolderName, safename(string(k))),
+				}
+				fileItem.SetMode(0644)
+				fileW, err := zw.CreateHeader(&fileItem)
+				if err != nil {
+					return err
+				}
+
+				_, err = io.CopyN(fileW, bytes.NewReader(v), int64(len(v)))
+				if err != nil {
+					return err
+				}
+			}
+
+			// Recurse for all bucket-type children
+
+			for _, childBucketName := range childBuckets {
+				process(slice_and(currentPath, childBucketName))
+			}
+
+			// Done
+
+			return nil
+		}
+
+		return process([]string{})
+	})
+	if err != nil {
+		return err
+	}
+
+	err = zw.Flush()
+	if err != nil {
+		return err
+	}
+
+	err = zw.Close()
+	if err != nil {
+		return err
+	}
+
+	return fh.Close()
+}
+
+func (f *App) Bolt_ImportZipToDatabase_OnTriggered() {
+	zippath := qt.QFileDialog_GetOpenFileName4(f.ui.MainWindow.QWidget, "Select a zip archive to import...", "", "Zip archives (*.zip);;All files (*)")
+	if zippath == "" {
+		return // cancelled
+	}
+
+	dbpath := qt.QFileDialog_GetSaveFileName4(f.ui.MainWindow.QWidget, "Select an output file to save as...", "", "Bolt database (*.db);;All files (*)")
+	if dbpath == "" {
+		return // cancelled
+	}
+
+	err := Bolt_ImportZipToDatabase(dbpath, zippath)
+	if err != nil {
+		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, err.Error())
+		return
+	}
+
+	res := qt.QMessageBox_Question2(f.ui.MainWindow.QWidget, APPNAME, "The import was successful. Would you like to open the Bolt database now?", qt.QMessageBox__Yes, qt.QMessageBox__No)
+	if res != int(qt.QMessageBox__Yes) {
+		return
+	}
+
+	config := NewConnectionConfig()
+	config.Type = "Bolt"
+	config.Bolt = &boltConfig{
+		Path:     autoconfig.ExistingFile(dbpath),
+		Readonly: false,
+	}
+
+	f.showConnectDialog(config)
+}
+
+func Bolt_ImportZipToDatabase(dbpath, zippath string) error {
+
+	db, err := bbolt.Open(dbpath, 0644, nil)
+	if err != nil {
+		return fmt.Errorf("Opening target database: %w", err)
+	}
+	defer db.Close()
+
+	fh, err := os.OpenFile(zippath, os.O_RDONLY, 0400)
+	if err != nil {
+		return fmt.Errorf("Opening input archive: %w", err)
+	}
+	defer fh.Close()
+
+	fstat, err := fh.Stat()
+	if err != nil {
+		return err
+	}
+
+	zr, err := zip.NewReader(fh, fstat.Size())
+	if err != nil {
+		return fmt.Errorf("Reading zip file format: %w", err)
+	}
+
+	return db.Update(func(tx *bbolt.Tx) error {
+
+		for _, zf := range zr.File {
+			if strings.HasSuffix(zf.Name, `/`) || (zf.Mode()&fs.ModeDir) != 0 {
+				// Bucket
+
+				if zf.Name == `/` {
+					continue // virtual entry for top-level directory, skip
+				}
+
+				bucketPath := strings.Split(strings.TrimSuffix(zf.Name, `/`), `/`)
+
+				parentBucket := boltTargetBucket(tx, bucketPath[0:len(bucketPath)-1])
+				newBucketName := []byte(bucketPath[len(bucketPath)-1])
+
+				var err error
+				if parentBucket == nil {
+					_, err = tx.CreateBucket(newBucketName) // at top level
+				} else {
+					_, err = parentBucket.CreateBucket(newBucketName) // child bucket
+				}
+				if err != nil {
+					return fmt.Errorf("Creating bucket %q: %w", zf.Name, err)
+				}
+
+			} else {
+				// Object
+				objectPath := strings.Split(zf.Name, `/`)
+
+				rc, err := zf.Open()
+				if err != nil {
+					return err
+				}
+
+				content, err := io.ReadAll(rc)
+				if err != nil {
+					return err
+				}
+
+				parentBucket := boltTargetBucket(tx, objectPath[0:len(objectPath)-1]) // Can't be nil, items always exist within a bucket
+				objectKey := []byte(objectPath[len(objectPath)-1])
+
+				err = parentBucket.Put(objectKey, content)
+				if err != nil {
+					return err
+				}
+
+				err = rc.Close()
+				if err != nil {
+					return err
+				}
+
+			}
+		}
+
+		// Done
+		return nil
+	})
+}

db_bunt.go

@@ -0,0 +1,118 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"path/filepath"
+	"strings"
+
+	"github.com/mappu/autoconfig"
+	qt "github.com/mappu/miqt/qt6"
+	"github.com/tidwall/buntdb"
+)
+
+type buntLdb struct {
+	db *buntdb.DB
+}
+
+func (ld *buntLdb) DriverName() string {
+	return "BuntDB"
+}
+
+func (ld *buntLdb) Properties(bucketPath []string) (string, error) {
+	idxInfo, err := ld.db.Indexes()
+	if err != nil {
+		return "", err
+	}
+
+	return fmt.Sprintf("Indexes (%d):\n%s", len(idxInfo), "-"+strings.Join(idxInfo, "\n- ")+"\n"), nil
+}
+
+func (ld *buntLdb) RenderForNav(f *tableState, bucketPath []string) error {
+
+	// Load data
+	// Interestingly, BuntDB internally uses string data, not []byte data
+	// That would stop us from using kvstore_ApplyChanges that only works with
+	// []byte data, so, fake []byte casts ourselves
+	f.SetupColumns([]columnType{columnType_popupData, columnType_popupData}, []string{"Key", "Value"})
+
+	err := ld.db.View(func(tx *buntdb.Tx) error {
+		return tx.Ascend("", func(k, v string) bool {
+			f.AddRow_PK_Data([]byte(k), []byte(k), []byte(v))
+			return true
+		})
+	})
+	if err != nil {
+		return err
+	}
+
+	// Valid
+	f.Ready()
+	return nil
+}
+
+func (n *buntLdb) ApplyChanges(f *tableState, bucketPath []string) error {
+
+	return n.db.Update(func(tx *buntdb.Tx) error {
+		return kvstore_ApplyChanges(
+			f,
+			func(k, v []byte) error {
+				_, _, err := tx.Set(string(k), string(v), nil)
+				return err
+			},
+			func(k []byte) error {
+				_, err := tx.Delete(string(k))
+				return err
+			},
+		)
+	})
+}
+
+func (ld *buntLdb) doShrink(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+	return ld.db.Shrink()
+}
+
+func (ld *buntLdb) NavChildren(bucketPath []string) ([]string, error) {
+	return []string{}, nil // No children
+}
+
+func (ld *buntLdb) NavContext(bucketPath []string) ([]contextAction, error) {
+	return []contextAction{
+		{"Shrink", ld.doShrink},
+	}, nil
+}
+
+func (ld *buntLdb) Close() {
+	_ = ld.db.Close()
+}
+
+var _ loadedDatabase = &buntLdb{}         // interface assertion
+var _ editableLoadedDatabase = &buntLdb{} // interface assertion
+
+//
+
+type buntDBConnection struct {
+	Type autoconfig.OneOf
+
+	Disk *struct {
+		File autoconfig.ExistingFile
+	} `json:",omitempty"`
+	Memory *struct{} `json:",omitempty"`
+}
+
+func (ldc *buntDBConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
+
+	var path string
+	if ldc.Disk != nil {
+		path = string(ldc.Disk.File)
+	} else {
+		path = `:memory:` // Special string known by driver
+	}
+
+	db, err := buntdb.Open(path)
+	if err != nil {
+		return nil, "", err
+	}
+
+	return &buntLdb{db: db}, filepath.Base(path), nil
+}

db_debconf.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"runtime"
 
-	"yvbolt/debconf"
+	"qbolt/debconf"
 
 	"github.com/mappu/autoconfig"
-	qt "github.com/mappu/miqt/qt6"
 )
 
 type debconfLoadedDatabase struct {
@@ -20,12 +20,12 @@ func (ld *debconfLoadedDatabase) DriverName() string {
 	return "debconf"
 }
 
-func (ld *debconfLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (ld *debconfLoadedDatabase) Properties(bucketPath []string) (string, error) {
-
-	// Load properties
-
 	content := fmt.Sprintf("Applications: %d\nUnique attributes: %d\n", len(ld.db.Entries), len(ld.db.AllColumnNames))
-	f.propertiesBox.SetText(content)
+	return content, nil
+}
+
+func (ld *debconfLoadedDatabase) RenderForNav(f *tableState, bucketPath []string) error {
 
 	// Load data
 
@@ -35,14 +35,8 @@ func (ld *debconfLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []stri
 
 	// Find application entry for bucketPath
 
-	var appInfo *debconf.Application
+	appInfo, ok := ld.db.FindApplicationByName(bucketPath[0])
-
+	if !ok {
-	for idx, app := range ld.db.Entries {
-		if app.Name == bucketPath[0] {
-			appInfo = &ld.db.Entries[idx] // TODO faster lookup?
-		}
-	}
-	if appInfo == nil {
 		return fmt.Errorf("Invalid application %q", bucketPath[0])
 	}
 
@@ -50,8 +44,7 @@ func (ld *debconfLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []stri
 
 	indexes := make(map[string]int)
 
-	f.contentBox.SetColumnCount(len(ld.db.AllColumnNames))
+	f.SetupColumns(slice_repeat(columnType_inlineText, len(ld.db.AllColumnNames)), ld.db.AllColumnNames)
-	f.contentBox.SetHorizontalHeaderLabels(ld.db.AllColumnNames)
 
 	for i, cname := range ld.db.AllColumnNames {
 		indexes[cname] = i
@@ -59,18 +52,16 @@ func (ld *debconfLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []stri
 
 	for _, entry := range appInfo.Entries {
 
-		rpos := f.contentBox.RowCount()
+		rpos := f.AddRow()
-		f.contentBox.SetRowCount(rpos + 1)
+		f.SetCell(rpos, 0, entry.Name)
-		f.contentBox.SetItem(rpos, 0, qt.NewQTableWidgetItem2(entry.Name))
 
 		for _, proppair := range entry.Properties {
-			f.contentBox.SetItem(rpos, indexes[proppair[0]], qt.NewQTableWidgetItem2(proppair[1]))
+			f.SetCell(rpos, indexes[proppair[0]], proppair[1])
 		}
 	}
 
 	// Valid
-	f.contentBox.ResizeColumnsToContents()
+	f.Ready()
-	f.contentBox.SetEnabled(true)
 	return nil
 }
 
@@ -104,6 +95,12 @@ type debconfConnection struct {
 	Database autoconfig.ExistingFile `yfilter:"Debconf database (*.dat);;All files (*)"`
 }
 
+func (dc *debconfConnection) Reset() {
+	if runtime.GOOS == "linux" {
+		dc.Database = "/var/cache/debconf/config.dat" // Prefill default path
+	}
+}
+
 func (dc *debconfConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
 	fh, err := os.OpenFile(string(dc.Database), os.O_RDONLY, 0400)
 	if err != nil {

db_embeddedversions.go

@@ -0,0 +1,61 @@
+package main
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"runtime/debug"
+)
+
+type evLdb struct {
+	mods *debug.BuildInfo
+}
+
+func (ld *evLdb) DriverName() string {
+	return APPNAME + " " + appVersion
+}
+
+func (ld *evLdb) Properties(bucketPath []string) (string, error) {
+	return fmt.Sprintf(
+		"%s %s\n- %d package dependencies\n- Compiler: %s",
+		APPNAME, appVersion, len(ld.mods.Deps), ld.mods.GoVersion,
+	), nil
+}
+
+func (ld *evLdb) RenderForNav(f *tableState, bucketPath []string) error {
+
+	f.SetupColumns([]columnType{columnType_inlineText, columnType_inlineText, columnType_inlineText}, []string{"Library", "Version", "Hash"})
+
+	for _, dep := range ld.mods.Deps {
+		f.AddRowData(dep.Path, dep.Version, dep.Sum)
+	}
+
+	// Valid
+	f.Ready()
+	return nil
+}
+
+func (ld *evLdb) NavChildren(bucketPath []string) ([]string, error) {
+	return []string{}, nil // No further children
+}
+
+func (ld *evLdb) NavContext(bucketPath []string) ([]contextAction, error) {
+	return nil, nil // No special actions are supported
+}
+
+func (ld *evLdb) Close() {}
+
+var _ loadedDatabase = &evLdb{} // interface assertion
+
+//
+
+type evLdbConnection struct{}
+
+func (dc *evLdbConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
+	mods, ok := debug.ReadBuildInfo()
+	if !ok {
+		return nil, "", errors.New("Missing build info")
+	}
+
+	return &evLdb{mods: mods}, APPNAME, nil
+}

db_leveldb.go

@@ -6,7 +6,6 @@ import (
 	"path/filepath"
 
 	"github.com/mappu/autoconfig"
-	qt "github.com/mappu/miqt/qt6"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/opt"
 )
@@ -19,43 +18,55 @@ func (ld *leveldbLoadedDatabase) DriverName() string {
 	return "LevelDB"
 }
 
-func (ld *leveldbLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (ld *leveldbLoadedDatabase) Properties(bucketPath []string) (string, error) {
-
-	// Load properties
 
 	var s leveldb.DBStats
 	err := ld.db.Stats(&s)
 	if err != nil {
-		return fmt.Errorf("Stats: %w", err)
+		return "", fmt.Errorf("Stats: %w", err)
 	}
 
 	content := fmt.Sprintf("LevelDB stats: %#v", s)
-	f.propertiesBox.SetText(content)
+	return content, nil
+}
+
+func (ld *leveldbLoadedDatabase) RenderForNav(f *tableState, bucketPath []string) error {
 
 	// Load data
 	// leveldb always uses Key + Value as the columns
-
+	f.SetupColumns([]columnType{columnType_popupData, columnType_popupData}, []string{"Key", "Value"})
-	f.contentBox.SetColumnCount(2)
-	f.contentBox.SetHorizontalHeaderLabels([]string{"Key", "Value"})
 
 	itn := ld.db.NewIterator(nil, nil)
 	defer itn.Release()
 
 	for itn.Next() {
-
+		f.AddRow_PK_Data(itn.Key(), itn.Key(), itn.Value())
-		rpos := f.contentBox.RowCount()
-		f.contentBox.SetRowCount(rpos + 1)
-
-		f.contentBox.SetItem(rpos, 0, qt.NewQTableWidgetItem2(string(itn.Key())))
-		f.contentBox.SetItem(rpos, 1, qt.NewQTableWidgetItem2(string(itn.Value())))
 	}
 
 	// Valid
-	f.contentBox.ResizeColumnsToContents()
+	f.Ready()
-	f.contentBox.SetEnabled(true)
 	return nil
 }
 
+func (n *leveldbLoadedDatabase) ApplyChanges(f *tableState, bucketPath []string) error {
+	txn, err := n.db.OpenTransaction()
+	if err != nil {
+		return fmt.Errorf("OpenTransaction: %w", err)
+	}
+
+	err = kvstore_ApplyChanges(
+		f,
+		func(k, v []byte) error { return txn.Put(k, v, nil) },
+		func(k []byte) error { return txn.Delete(k, nil) },
+	)
+	if err != nil {
+		txn.Discard()
+		return err
+	}
+
+	return txn.Commit()
+}
+
 func (ld *leveldbLoadedDatabase) NavChildren(bucketPath []string) ([]string, error) {
 	return []string{}, nil // No children
 }
@@ -68,7 +79,8 @@ func (ld *leveldbLoadedDatabase) Close() {
 	_ = ld.db.Close()
 }
 
-var _ loadedDatabase = &leveldbLoadedDatabase{} // interface assertion
+var _ loadedDatabase = &leveldbLoadedDatabase{}         // interface assertion
+var _ editableLoadedDatabase = &leveldbLoadedDatabase{} // interface assertion
 
 //
 

db_lmdb.go

@@ -19,14 +19,17 @@ func (ld *lmdbDatabase) DriverName() string {
 	return lmdb.VersionString() // Already includes "LMDB" prefix
 }
 
-func (ld *lmdbDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (ld *lmdbDatabase) Properties(bucketPath []string) (string, error) {
-
+	info, err := ld.db.Info()
-	// Properties
+	if err != nil {
-
+		return "", err
-	if info, err := ld.db.Info(); err == nil {
-		f.propertiesBox.SetPlainText(fmt.Sprintf("LMDB info: %#v", info))
 	}
 
+	return fmt.Sprintf("LMDB info: %#v", info), nil
+}
+
+func (ld *lmdbDatabase) RenderForNav(f *tableState, bucketPath []string) error {
+
 	// Load data
 
 	if ld.isMulti && len(bucketPath) == 0 {
@@ -38,8 +41,7 @@ func (ld *lmdbDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error
 
 	// LMDB always uses Key + Value as the columns
 
-	f.contentBox.SetColumnCount(2)
+	f.SetupColumns([]columnType{columnType_popupData, columnType_popupData}, []string{"Key", "Value"})
-	f.contentBox.SetHorizontalHeaderLabels([]string{"Key", "Value"})
 
 	err := ld.db.View(func(txn *lmdb.Txn) error {
 		var dbi lmdb.DBI
@@ -76,12 +78,7 @@ func (ld *lmdbDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error
 			}
 
 			op = lmdb.Next
-
+			f.AddRow_PK_Data(key, key, val)
-			rpos := f.contentBox.RowCount()
-			f.contentBox.SetRowCount(rpos + 1)
-
-			f.contentBox.SetItem(rpos, 0, qt.NewQTableWidgetItem2(string(key)))
-			f.contentBox.SetItem(rpos, 1, qt.NewQTableWidgetItem2(string(val)))
 		}
 
 		// Done
@@ -92,12 +89,11 @@ func (ld *lmdbDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error
 	}
 
 	// Valid
-	f.contentBox.ResizeColumnsToContents()
+	f.Ready()
-	f.contentBox.SetEnabled(true)
 	return nil
 }
 
-func (ld *lmdbDatabase) ApplyChanges(f *App, bucketPath []string) error {
+func (ld *lmdbDatabase) ApplyChanges(f *tableState, bucketPath []string) error {
 	return ld.db.Update(func(txn *lmdb.Txn) error {
 		var dbi lmdb.DBI
 		var err error
@@ -111,36 +107,11 @@ func (ld *lmdbDatabase) ApplyChanges(f *App, bucketPath []string) error {
 			return err
 		}
 
-		// Insert
+		return kvstore_ApplyChanges(
-
+			f,
-		for rowid, _ := range f.insertRows {
+			func(k, v []byte) error { return txn.Put(dbi, k, v, 0) },
-			key := f.ui.contentBox.Item(rowid, 0).Text()
+			func(k []byte) error { return txn.Del(dbi, k, nil) },
-			val := f.ui.contentBox.Item(rowid, 1).Text()
+		)
-			err = txn.Put(dbi, []byte(key), []byte(val), 0)
-			if err != nil {
-				return fmt.Errorf("Inserting %q: %w", key, err)
-			}
-		}
-
-		// Edit
-
-		for rowid, _ := range f.updateRows {
-			_ = rowid
-			// FIXME need to support delete+reinsert if the key column is edited
-			// TODO
-		}
-
-		// Delete
-		for rowid, _ := range f.deleteRows {
-			key := f.ui.contentBox.Item(rowid, 0).Text()
-			err = txn.Del(dbi, []byte(key), nil)
-			if err != nil {
-				return fmt.Errorf("Removing %q: %w", key, err)
-			}
-		}
-
-		// Done
-		return nil
 	})
 }
 
@@ -207,15 +178,27 @@ func (ld *lmdbDatabase) createChildDatabase(sender *qt.QTreeWidgetItem, bucketPa
 	})
 }
 
-//func (ld *lmdbDatabase) truncateAllContent(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+func (ld *lmdbDatabase) truncateAllContent(sender *qt.QTreeWidgetItem, bucketPath []string) error {
-// TODO add warning
+
-//}
+	if !vcl_confirm_dialog(sender.TreeWidget().QWidget, fmt.Sprintf("Are you sure you want to empty the child database %q?", bucketPath[0])) {
+		return nil // cancelled
+	}
+
+	return ld.drop(bucketPath[0], true)
+}
 
 func (ld *lmdbDatabase) deleteChildDatabase(sender *qt.QTreeWidgetItem, bucketPath []string) error {
 
-	// TODO add warning
+	if !vcl_confirm_dialog(sender.TreeWidget().QWidget, fmt.Sprintf("Are you sure you want to delete the child database %q?", bucketPath[0])) {
+		return nil // cancelled
+	}
+
+	return ld.drop(bucketPath[0], true)
+}
+
+func (ld *lmdbDatabase) drop(multiDbName string, delet bool) error {
 	return ld.db.Update(func(txn *lmdb.Txn) error {
-		dbi, err := txn.OpenDBI(bucketPath[0], 0)
+		dbi, err := txn.OpenDBI(multiDbName, 0)
 		if err != nil {
 			return err
 		}
@@ -234,6 +217,7 @@ func (ld *lmdbDatabase) NavContext(bucketPath []string) ([]contextAction, error)
 			}, nil
 		} else {
 			return []contextAction{
+				contextAction{"Truncate and remove all contents...", ld.truncateAllContent},
 				contextAction{"Remove child database...", ld.deleteChildDatabase},
 			}, nil
 		}
@@ -246,17 +230,18 @@ func (ld *lmdbDatabase) Close() {
 	_ = ld.db.Close()
 }
 
-var _ loadedDatabase = &lmdbDatabase{} // interface assertion
+var _ loadedDatabase = &lmdbDatabase{}         // interface assertion
+var _ editableLoadedDatabase = &lmdbDatabase{} // interface assertion
 
 //
 
 type lmdbConnection struct {
 	Storage struct {
 		Type      autoconfig.OneOf
-		Directory *autoconfig.ExistingDirectory
+		Directory *autoconfig.ExistingDirectory `json:",omitempty"`
 		File      *struct {
 			Path autoconfig.ExistingFile `yfilter:"LMDB database (*.mdb);;All files (*)"`
-		}
+		} `json:",omitempty"`
 	}
 	MultiDB *struct {
 		Slots int

db_lotusdb.go

@@ -0,0 +1,88 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"path/filepath"
+
+	"github.com/lotusdblabs/lotusdb/v2"
+	"github.com/mappu/autoconfig"
+)
+
+type lotusLdb struct {
+	db *lotusdb.DB
+}
+
+func (ld *lotusLdb) DriverName() string {
+	return "LotusDB"
+}
+
+func (ld *lotusLdb) Properties(bucketPath []string) (string, error) {
+	return "", nil
+}
+
+func (ld *lotusLdb) RenderForNav(f *tableState, bucketPath []string) error {
+
+	// Load data
+	f.SetupColumns([]columnType{columnType_popupData, columnType_popupData}, []string{"Key", "Value"})
+
+	cur, err := ld.db.NewIterator(lotusdb.IteratorOptions{})
+	if err != nil {
+		return fmt.Errorf("NewIterator: %w", err)
+	}
+	defer cur.Close()
+
+	for cur.Valid() {
+		f.AddRow_PK_Data(cur.Key(), cur.Key(), cur.Value())
+		cur.Next()
+	}
+
+	// Valid
+	f.Ready()
+	return nil
+}
+
+func (n *lotusLdb) ApplyChanges(f *tableState, bucketPath []string) error {
+	txn := n.db.NewBatch(lotusdb.DefaultBatchOptions)
+
+	err := kvstore_ApplyChanges(f, txn.Put, txn.Delete)
+	if err != nil {
+		return err
+	}
+
+	return txn.Commit()
+}
+
+func (ld *lotusLdb) NavChildren(bucketPath []string) ([]string, error) {
+	return []string{}, nil // No children
+}
+
+func (ld *lotusLdb) NavContext(bucketPath []string) ([]contextAction, error) {
+	return nil, nil // No special actions are supported
+}
+
+func (ld *lotusLdb) Close() {
+	_ = ld.db.Close()
+}
+
+var _ loadedDatabase = &lotusLdb{}         // interface assertion
+var _ editableLoadedDatabase = &lotusLdb{} // interface assertion
+
+//
+
+type lotusDBConnection struct {
+	Directory autoconfig.ExistingDirectory
+}
+
+func (ldc *lotusDBConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
+
+	opts := lotusdb.DefaultOptions // copy
+	opts.DirPath = string(ldc.Directory)
+
+	db, err := lotusdb.Open(opts)
+	if err != nil {
+		return nil, "", err
+	}
+
+	return &lotusLdb{db: db}, filepath.Base(string(ldc.Directory)), nil
+}

db_mongo.go

@@ -0,0 +1,348 @@
+package main
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"time"
+
+	"golang.org/x/crypto/ssh"
+
+	"github.com/mappu/autoconfig"
+	qt "github.com/mappu/miqt/qt6"
+	"go.mongodb.org/mongo-driver/v2/bson"
+	"go.mongodb.org/mongo-driver/v2/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo/options"
+	"go.mongodb.org/mongo-driver/v2/mongo/readpref"
+	"go.mongodb.org/mongo-driver/v2/version"
+)
+
+// MongoDB support
+// To test: `make test-mongo`
+
+type mongoLdb struct {
+	client *mongo.Client
+	sshc   *ssh.Client
+}
+
+func (ld *mongoLdb) DriverName() string {
+	return "MongoDB " + version.Driver
+}
+
+func (ld *mongoLdb) Properties(bucketPath []string) (string, error) {
+	ctx := context.Background()
+
+	if len(bucketPath) == 0 {
+		return "", nil // no properties
+
+	} else if len(bucketPath) == 1 {
+		// Database is selected
+		db := ld.client.Database(bucketPath[0])
+		return "Database " + db.Name(), nil
+
+	} else if len(bucketPath) == 2 {
+		// Collection is selected
+		db := ld.client.Database(bucketPath[0])
+		coll := db.Collection(bucketPath[1])
+
+		info := "Database " + db.Name() + "\n"
+		info += "Collection " + coll.Name() + "\n"
+
+		// Document count
+		count, err := coll.EstimatedDocumentCount(ctx)
+		if err != nil {
+			return "", fmt.Errorf("Estimating document count: %w", err)
+		}
+		info += fmt.Sprintf("Estimated document count: %d", count) + "\n"
+
+		// Index info
+		allIndexes, err := coll.Indexes().ListSpecifications(ctx)
+		if err != nil {
+			return "", fmt.Errorf("Checking indexes: %w", err)
+		}
+
+		info += fmt.Sprintf("\nIndexes (%d):\n", len(allIndexes))
+		for _, idxInfo := range allIndexes {
+			info += fmt.Sprintf("- %q (namespace=%q, version=%d)\n", idxInfo.Name, idxInfo.Namespace, idxInfo.Version)
+		}
+
+		return info, nil
+
+	} else {
+		return "", errors.New("??")
+	}
+}
+
+func (ld *mongoLdb) RenderForNav(f *tableState, bucketPath []string) error {
+	ctx := context.Background()
+
+	if len(bucketPath) == 0 || len(bucketPath) == 1 {
+		// Leave the table disabled
+		return nil
+
+	} else if len(bucketPath) == 2 {
+
+		f.SetupColumns([]columnType{columnType_inlineText, columnType_bsonDoc}, []string{"_id", "Document"})
+
+		db := ld.client.Database(bucketPath[0])
+		coll := db.Collection(bucketPath[1])
+
+		cur, err := coll.Find(ctx, bson.D{}) // An empty document as filter = find all results
+		if err != nil {
+			return fmt.Errorf("Find: %w", err)
+		}
+
+		defer cur.Close(ctx)
+		return ld.populateRows(ctx, cur, f)
+
+	} else {
+		return errors.New("??")
+
+	}
+}
+
+func (ld *mongoLdb) populateRows(ctx context.Context, cur *mongo.Cursor, f *tableState) error {
+
+	for cur.Next(ctx) {
+		var result bson.D
+		if err := cur.Decode(&result); err != nil {
+			return fmt.Errorf("Decode: %w", err)
+		}
+
+		// The document is always an ordered map[string]any.
+		// MongoDB enforces there is an "_id" key.
+		idValue, ok := bson_find_id(result)
+		if !ok {
+			return errors.New("Surprised to find a document missing an '_id' field")
+		}
+
+		f.AddRow_PK_Data([]byte(idValue), idValue, result)
+	}
+	if err := cur.Err(); err != nil {
+		return fmt.Errorf("Cursor: %w", err)
+	}
+
+	// Done
+	f.Ready()
+	return nil
+}
+
+func (ld *mongoLdb) NavChildren(bucketPath []string) ([]string, error) {
+	ctx := context.Background()
+
+	if len(bucketPath) == 0 {
+		return ld.client.ListDatabaseNames(ctx, bson.D{})
+
+	} else if len(bucketPath) == 1 {
+		db := ld.client.Database(bucketPath[0])
+		return db.ListCollectionNames(ctx, bson.D{})
+
+	}
+
+	return []string{}, nil // No children
+}
+
+func (ld *mongoLdb) actionNewDatabase(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+	ctx := context.Background()
+
+	dbName := qt.QInputDialog_GetText(sender.TreeWidget().QWidget, APPNAME, "Enter a name for the new database:")
+	if dbName == "" {
+		return nil // cancel
+	}
+
+	// MongoDB: databases just start to exist when you write to them
+	newDb := ld.client.Database(dbName)
+	return newDb.CreateCollection(ctx, "my.new.collection")
+}
+
+func (ld *mongoLdb) actionNewCollection(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+	ctx := context.Background()
+
+	collName := qt.QInputDialog_GetText(sender.TreeWidget().QWidget, APPNAME, "Enter a name for the new collection:")
+	if collName == "" {
+		return nil // cancel
+	}
+
+	// MongoDB: databases just start to exist when you write to them
+	newDb := ld.client.Database(bucketPath[0])
+	return newDb.CreateCollection(ctx, collName)
+}
+
+func (ld *mongoLdb) actionDropDatabase(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+	ctx := context.Background()
+
+	if !vcl_confirm_dialog(sender.TreeWidget().QWidget, fmt.Sprintf("Are you sure you want to drop the database %q?", bucketPath[0])) {
+		return nil // cancelled
+	}
+
+	db := ld.client.Database(bucketPath[0])
+	return db.Drop(ctx)
+}
+
+func (ld *mongoLdb) actionDropCollection(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+	ctx := context.Background()
+
+	if !vcl_confirm_dialog(sender.TreeWidget().QWidget, fmt.Sprintf("Are you sure you want to delete the collection %q?", bucketPath[1])) {
+		return nil // cancelled
+	}
+
+	db := ld.client.Database(bucketPath[0])
+	coll := db.Collection(bucketPath[1])
+	return coll.Drop(ctx)
+}
+
+func (ld *mongoLdb) ExecQuery(query string, bucketPath []string, resultArea *tableState) error {
+	ctx := context.Background()
+
+	if len(bucketPath) == 0 {
+		return errors.New("Please select a database first.")
+	}
+
+	db := ld.client.Database(bucketPath[0])
+
+	// The query should be JSON, e.g.
+	//  { "hello": 1 } or
+	//  { "explain": { "count": "system.users" } } or
+	//  { "listDatabases": 1 }
+
+	doc := bson.D{}
+	err := doc.UnmarshalJSON([]byte(query))
+	if err != nil {
+		return fmt.Errorf("Parsing JSON query: %w", err)
+	}
+
+	// FIXME how to tell if the response will have a cursor or a singleResult?
+
+	if false {
+		// Cursor
+		cur, err := db.RunCommandCursor(ctx, doc)
+		if err != nil {
+			return fmt.Errorf("Running command: %w", err)
+		}
+
+		defer cur.Close(ctx)
+		return ld.populateRows(ctx, cur, resultArea)
+
+	} else {
+		// Single result
+
+		res := db.RunCommand(ctx, doc)
+
+		response := bson.D{}
+		err = res.Decode(&response)
+		if err != nil {
+			return fmt.Errorf("Decoding response: %w", err)
+		}
+
+		responseJson, err := response.MarshalJSON()
+		if err != nil {
+			return fmt.Errorf("Decoding response: %w", err)
+		}
+
+		resultArea.SetupColumns([]columnType{columnType_popupData}, []string{"Response"})
+		resultArea.AddRowData(responseJson)
+		resultArea.Ready()
+		return nil
+	}
+}
+
+func (ld *mongoLdb) NavContext(bucketPath []string) ([]contextAction, error) {
+	if len(bucketPath) == 0 {
+		// Top-level connection
+		return []contextAction{
+			{"Create database...", ld.actionNewDatabase},
+		}, nil
+
+	} else if len(bucketPath) == 1 {
+		// Database selected
+		return []contextAction{
+			{"Create collection...", ld.actionNewCollection},
+			{"Drop database...", ld.actionDropDatabase},
+		}, nil
+
+	} else if len(bucketPath) == 2 {
+		// Collection selected
+		return []contextAction{
+			{"Drop collection...", ld.actionDropCollection},
+		}, nil
+
+	} else {
+		return nil, errors.New("???")
+	}
+}
+
+func (ld *mongoLdb) Close() {
+	_ = ld.client.Disconnect(context.Background())
+	if ld.sshc != nil {
+		_ = ld.sshc.Close()
+	}
+}
+
+var _ loadedDatabase = &mongoLdb{}          // interface assertion
+var _ queryableLoadedDatabase = &mongoLdb{} // interface assertion
+
+//
+
+type mongoConnection struct {
+	Conn struct {
+		Mode autoconfig.OneOf
+
+		Connection_String *string `json:",omitempty"`
+	}
+
+	SSH_Tunnel *SSHTunnel
+}
+
+func (moc *mongoConnection) Reset() {
+	moc.Conn.Mode = "Connection_String"
+	moc.Conn.Connection_String = address_of("mongodb://localhost:27017")
+}
+
+func (moc *mongoConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
+
+	ctx, _ = context.WithTimeout(ctx, 5*time.Second) // shadow parent ctx
+
+	opts := options.Client().ApplyURI(string(*moc.Conn.Connection_String))
+
+	// Our used library supports all compressors
+	opts.SetCompressors([]string{"zstd", "snappy", "zlib"})
+
+	ret := mongoLdb{}
+
+	if moc.SSH_Tunnel != nil {
+		sshc, err := moc.SSH_Tunnel.Open(ctx)
+		if err != nil {
+			return nil, "", err
+		}
+
+		opts.Dialer = sshc // interface implements DialContext()
+		ret.sshc = sshc
+
+		// The crypto/ssh library does not support deadlines over tcp tunnels
+		// Go-redis has a workaround for this, but go-mongo does not
+	}
+
+	//
+
+	client, err := mongo.Connect(opts)
+	if err != nil {
+		return nil, "", err
+	}
+	ret.client = client
+
+	// Connect() does not block for server discovery. Check that the server really
+	// is reachable
+
+	err = client.Ping(ctx, readpref.Primary())
+	if err != nil {
+		return nil, "", err
+	}
+
+	// We should be able to ListDatabases - there may be an authentication error
+	_, err = client.ListDatabaseNames(ctx, bson.D{})
+	if err != nil {
+		return nil, "", err
+	}
+
+	return &ret, "MongoDB", nil
+}

db_none.go

@@ -6,8 +6,10 @@ func (n *noLoadedDatabase) DriverName() string {
 	return "No database selected"
 }
 
-func (n *noLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (n *noLoadedDatabase) Properties(bucketPath []string) (string, error) {
-	f.propertiesBox.SetText("Open a database to get started...")
+	return "Open a database to get started...", nil
+}
+func (n *noLoadedDatabase) RenderForNav(f *tableState, bucketPath []string) error {
 	return nil
 }
 

db_pebble.go

@@ -4,61 +4,33 @@ import (
 	"context"
 	"fmt"
 	"path/filepath"
-	"runtime/debug"
-	"sync"
 
 	"github.com/cockroachdb/pebble"
 	"github.com/cockroachdb/pebble/vfs"
 	"github.com/mappu/autoconfig"
-	qt "github.com/mappu/miqt/qt6"
 )
 
 type pebbleLoadedDatabase struct {
 	db *pebble.DB
 }
 
-var (
-	version_Pebble_once sync.Once
-	version_Pebble      string
-)
-
-func pebbleDriverVersion() string {
-	version_Pebble_once.Do(func() {
-		// ReadBuildInfo still works even with `-ldflags '-s -w'`.
-		mm, ok := debug.ReadBuildInfo()
-		if !ok {
-			panic("Missing build info")
-		}
-
-		for _, dep := range mm.Deps {
-			switch dep.Path {
-			case "github.com/cockroachdb/pebble":
-				version_Pebble = dep.Version
-			}
-		}
-	})
-
-	return version_Pebble
-}
-
 func (ld *pebbleLoadedDatabase) DriverName() string {
-	return "Pebble " + pebbleDriverVersion() // Parsed from embedded go.mod copy
+	return "Pebble"
 }
 
-func (ld *pebbleLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (ld *pebbleLoadedDatabase) Properties(bucketPath []string) (string, error) {
+	content := fmt.Sprintf("Pebble metrics: %#v", ld.db.Metrics())
+	return content, nil
+}
+
+func (ld *pebbleLoadedDatabase) RenderForNav(f *tableState, bucketPath []string) error {
 
 	ctx := context.Background()
 
-	// Load properties
-
-	content := fmt.Sprintf("Pebble metrics: %#v", ld.db.Metrics())
-	f.propertiesBox.SetText(content)
-
 	// Load data
 	// pebble always uses Key + Value as the columns
 
-	f.contentBox.SetColumnCount(2)
+	f.SetupColumns([]columnType{columnType_popupData, columnType_popupData}, []string{"Key", "Value"})
-	f.contentBox.SetHorizontalHeaderLabels([]string{"Key", "Value"})
 
 	itr, err := ld.db.NewIterWithContext(ctx, nil)
 	if err != nil {
@@ -73,19 +45,29 @@ func (ld *pebbleLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []strin
 			return fmt.Errorf("Failed to load data for key %q: %w", formatAny(k), err)
 		}
 
-		rpos := f.contentBox.RowCount()
+		f.AddRow_PK_Data(k, k, v)
-		f.contentBox.SetRowCount(rpos + 1)
-
-		f.contentBox.SetItem(rpos, 0, qt.NewQTableWidgetItem2(formatUtf8(k)))
-		f.contentBox.SetItem(rpos, 1, qt.NewQTableWidgetItem2(formatUtf8(v)))
 	}
 
 	// Valid
-	f.contentBox.ResizeColumnsToContents()
+	f.Ready()
-	f.contentBox.SetEnabled(true)
 	return nil
 }
 
+func (n *pebbleLoadedDatabase) ApplyChanges(f *tableState, bucketPath []string) error {
+
+	txn := n.db.NewBatch()
+
+	err := kvstore_ApplyChanges(
+		f,
+		func(k, v []byte) error { return txn.Set(k, v, nil) },
+		func(k []byte) error { return txn.Delete(k, nil) },
+	)
+	if err != nil {
+		return err
+	}
+	return txn.Commit(nil)
+}
+
 func (ld *pebbleLoadedDatabase) NavChildren(bucketPath []string) ([]string, error) {
 	return []string{}, nil // No children
 }
@@ -98,7 +80,8 @@ func (ld *pebbleLoadedDatabase) Close() {
 	_ = ld.db.Close()
 }
 
-var _ loadedDatabase = &pebbleLoadedDatabase{} // interface assertion
+var _ loadedDatabase = &pebbleLoadedDatabase{}         // interface assertion
+var _ editableLoadedDatabase = &pebbleLoadedDatabase{} // interface assertion
 
 //
 
@@ -108,8 +91,8 @@ type pebbleConnection struct {
 	Disk *struct {
 		Directory autoconfig.ExistingDirectory
 		Readonly  bool
-	}
+	} `json:",omitempty"`
-	Memory *struct{}
+	Memory *struct{} `json:",omitempty"`
 }
 
 func (pdc *pebbleConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {

db_redis.go

@@ -5,10 +5,9 @@ import (
 	"fmt"
 	"strconv"
 
-	"yvbolt/lexer"
+	"qbolt/lexer"
 
 	"github.com/mappu/autoconfig"
-	qt "github.com/mappu/miqt/qt6"
 	"github.com/redis/go-redis/v9"
 	"golang.org/x/crypto/ssh"
 )
@@ -20,6 +19,10 @@ type redisConnectionOptions struct {
 	SSH_Tunnel *SSHTunnel
 }
 
+func (config *redisConnectionOptions) Reset() {
+	config.Address.Port = 6379
+}
+
 func (config *redisConnectionOptions) Connect(ctx context.Context) (loadedDatabase, string, error) {
 
 	ld := &redisLoadedDatabase{
@@ -99,18 +102,27 @@ func (ld *redisLoadedDatabase) DriverName() string {
 	return "Redis " + ld.serverVersion
 }
 
-func (ld *redisLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (ld *redisLoadedDatabase) Properties(bucketPath []string) (string, error) {
 	ctx := context.Background()
 
 	if len(bucketPath) == 0 {
 		// Top-level: Show info() on main Properties tab
 		infostr, err := ld.db.Info(ctx).Result()
 		if err != nil {
-			return fmt.Errorf("Retreiving database info: %w", err)
+			return "", fmt.Errorf("Retreiving database info: %w", err)
 		}
 
-		f.propertiesBox.SetText(infostr)
+		return infostr, nil
 
+	} else {
+		return "Database " + bucketPath[0], nil
+	}
+}
+
+func (ld *redisLoadedDatabase) RenderForNav(f *tableState, bucketPath []string) error {
+	ctx := context.Background()
+
+	if len(bucketPath) == 0 {
 		// Leave data tab disabled (default behaviour)
 		return nil
 
@@ -127,12 +139,12 @@ func (ld *redisLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string
 			return fmt.Errorf("Listing keys in database %q: %w", bucketPath[0], err)
 		}
 
-		f.propertiesBox.SetText(fmt.Sprintf("Database %s\nTotal keys: %d\n", bucketPath[0], len(allKeys)))
+		// Redis always uses Key string, Type string, Value []byte as the columns
 
-		// Redis always uses Key + Value as the columns
+		f.SetupColumns(
-
+			[]columnType{columnType_popupData, columnType_inlineText, columnType_popupData},
-		f.contentBox.SetColumnCount(3)
+			[]string{"Key", "Type", "Value"},
-		f.contentBox.SetHorizontalHeaderLabels([]string{"Key", "Type", "Value"})
+		)
 
 		for _, key := range allKeys {
 			typeName, err := ld.db.Type(ctx, key).Result()
@@ -140,10 +152,9 @@ func (ld *redisLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string
 				return fmt.Errorf("Loading %q/%q: %w", bucketPath[0], key, err)
 			}
 
-			rpos := f.contentBox.RowCount()
+			rpos := f.AddRow()
-			f.contentBox.SetRowCount(rpos + 1)
+			f.SetCell(rpos, 0, key)
-			f.contentBox.SetItem(rpos, 0, qt.NewQTableWidgetItem2(formatUtf8([]byte(key))))
+			f.SetCell(rpos, 1, typeName)
-			f.contentBox.SetItem(rpos, 1, qt.NewQTableWidgetItem2(typeName))
 
 			switch typeName {
 			case "string":
@@ -151,7 +162,8 @@ func (ld *redisLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string
 				if err != nil {
 					return fmt.Errorf("Loading %q/%q: %w", bucketPath[0], key, err)
 				}
-				f.contentBox.SetItem(rpos, 2, qt.NewQTableWidgetItem2(val))
+
+				f.SetCell(rpos, 2, []byte(val))
 
 			case "hash":
 				val, err := ld.db.HGetAll(ctx, key).Result()
@@ -159,7 +171,7 @@ func (ld *redisLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string
 					return fmt.Errorf("Loading %q/%q: %w", bucketPath[0], key, err)
 				}
 				// It's a map[string]string
-				f.contentBox.SetItem(rpos, 2, qt.NewQTableWidgetItem2(formatAny(val)))
+				f.SetCell(rpos, 2, []byte(formatAny(val)))
 
 			case "lists":
 				fallthrough
@@ -171,14 +183,13 @@ func (ld *redisLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string
 				fallthrough
 
 			default:
-				f.contentBox.SetItem(rpos, 2, qt.NewQTableWidgetItem2("<<<other object type>>>"))
+				f.SetCell(rpos, 2, []byte("<<<other object type>>>"))
 			}
 
 		}
 
 		// Valid
-		f.contentBox.ResizeColumnsToContents()
+		f.Ready()
-		f.contentBox.SetEnabled(true)
 		return nil
 
 	} else {
@@ -213,7 +224,7 @@ func (ld *redisLoadedDatabase) NavContext(bucketPath []string) ([]contextAction,
 	return nil, nil // No special actions are supported
 }
 
-func (ld *redisLoadedDatabase) ExecQuery(query string, resultArea *qt.QTableWidget) error {
+func (ld *redisLoadedDatabase) ExecQuery(query string, _ []string, resultArea *tableState) error {
 	ctx := context.Background()
 
 	// Need to parse the query into separate string+args fields for the protocol
@@ -229,32 +240,23 @@ func (ld *redisLoadedDatabase) ExecQuery(query string, resultArea *qt.QTableWidg
 		return fmt.Errorf("The redis query returned an error: %w", err)
 	}
 
-	vcl_clear_grid(resultArea)
+	resultArea.SetupColumns([]columnType{columnType_inlineText}, []string{"Result"})
-	resultArea.SetColumnCount(1)
-	resultArea.SetHorizontalHeaderLabels([]string{"Result"})
 
 	// The result is probably a single value or a string slice
 	switch ret := ret.(type) {
 	case []string:
 		// Multiple values
 		for _, single := range ret {
-
+			resultArea.AddRowData(single)
-			rpos := resultArea.RowCount()
-			resultArea.SetRowCount(rpos + 1)
-			resultArea.SetItem(rpos, 0, qt.NewQTableWidgetItem2(formatUtf8([]byte(single))))
 		}
 
 	default:
 		// Single value
-		rpos := resultArea.RowCount()
+		// Unknown object type
-		resultArea.SetRowCount(rpos + 1)
+		resultArea.AddRowData(formatAny(ret)) // formatUtf8
-		resultArea.SetItem(rpos, 0, qt.NewQTableWidgetItem2(formatAny(ret))) // formatUtf8
-
 	}
 
-	resultArea.ResizeColumnsToContents()
+	resultArea.Ready()
-	resultArea.SetEnabled(true)
-
 	return nil
 }
 

db_rosedb.go

@@ -0,0 +1,74 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"path/filepath"
+
+	"github.com/mappu/autoconfig"
+	"github.com/rosedblabs/rosedb/v2"
+)
+
+type roseLdb struct {
+	db *rosedb.DB
+}
+
+func (ld *roseLdb) DriverName() string {
+	return "RoseDB"
+}
+
+func (ld *roseLdb) Properties(bucketPath []string) (string, error) {
+	stats := ld.db.Stat()
+	return fmt.Sprintf("Statistics: %#v\n", stats), nil
+}
+
+func (ld *roseLdb) RenderForNav(f *tableState, bucketPath []string) error {
+
+	// Load data
+	f.SetupColumns([]columnType{columnType_popupData, columnType_popupData}, []string{"Key", "Value"})
+
+	ld.db.Ascend(func(k, v []byte) (bool, error) {
+		f.AddRow_PK_Data(k, k, v)
+		return true, nil
+	})
+
+	f.Ready()
+	return nil
+}
+
+func (n *roseLdb) ApplyChanges(f *tableState, bucketPath []string) error {
+	return kvstore_ApplyChanges(f, n.db.Put, n.db.Delete)
+}
+
+func (ld *roseLdb) NavChildren(bucketPath []string) ([]string, error) {
+	return []string{}, nil // No children
+}
+
+func (ld *roseLdb) NavContext(bucketPath []string) ([]contextAction, error) {
+	return nil, nil // No supported actions
+}
+
+func (ld *roseLdb) Close() {
+	_ = ld.db.Close()
+}
+
+var _ loadedDatabase = &roseLdb{}         // interface assertion
+var _ editableLoadedDatabase = &roseLdb{} // interface assertion
+
+//
+
+type roseDBConn struct {
+	Directory autoconfig.ExistingDirectory
+}
+
+func (c *roseDBConn) Connect(ctx context.Context) (loadedDatabase, string, error) {
+	options := rosedb.DefaultOptions // copy
+	options.DirPath = string(c.Directory)
+
+	db, err := rosedb.Open(options)
+	if err != nil {
+		return nil, "", err
+	}
+
+	return &roseLdb{db: db}, filepath.Base(string(c.Directory)), nil
+}

db_secretsvc_linux.go

@@ -20,7 +20,11 @@ func (ld *secretServiceDb) DriverName() string {
 	return "FreeDesktop.org Secret Service"
 }
 
-func (ld *secretServiceDb) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (ld *secretServiceDb) Properties(bucketPath []string) (string, error) {
+	return "", nil // No properties
+}
+
+func (ld *secretServiceDb) RenderForNav(f *tableState, bucketPath []string) error {
 
 	const (
 		collectionBasePath = "/org/freedesktop/secrets/collection/"
@@ -28,16 +32,14 @@ func (ld *secretServiceDb) RenderForNav(f *MainWindowUi, bucketPath []string) er
 		serviceName        = "org.freedesktop.secrets"
 	)
 
-	// No properties
-
-	// No data
-
 	if len(bucketPath) == 0 {
 		// No data
 	} else if len(bucketPath) == 1 {
 
-		f.contentBox.SetColumnCount(6)
+		f.SetupColumns(
-		f.contentBox.SetHorizontalHeaderLabels([]string{"ID", "Label", "Attributes", "ContentType", "Parameters", "Value"})
+			[]columnType{columnType_inlineText, columnType_inlineText, columnType_inlineText, columnType_inlineText, columnType_inlineText, columnType_popupData},
+			[]string{"ID", "Label", "Attributes", "ContentType", "Parameters", "Value"},
+		)
 
 		// Collection is selected
 		collection := ld.svc.GetCollection(bucketPath[0])
@@ -71,20 +73,18 @@ func (ld *secretServiceDb) RenderForNav(f *MainWindowUi, bucketPath []string) er
 				return fmt.Errorf("Reading secret %q: %w", item, err)
 			}
 
-			rpos := f.contentBox.RowCount()
+			f.AddRowData(
-			f.contentBox.SetRowCount(rpos + 1)
+				string(item),            // ID
-
+				label.Value().(string),  // Label
-			f.contentBox.SetItem(rpos, 0, qt.NewQTableWidgetItem2(string(item)))            // ID
+				attrs.String(),          // Attributes (JSON)
-			f.contentBox.SetItem(rpos, 1, qt.NewQTableWidgetItem2(label.Value().(string)))  // Label
+				secr.ContentType,        // ContentType
-			f.contentBox.SetItem(rpos, 2, qt.NewQTableWidgetItem2(attrs.String()))          // Attributes (JSON)
+				string(secr.Parameters), // Parameters
-			f.contentBox.SetItem(rpos, 3, qt.NewQTableWidgetItem2(secr.ContentType))        // ContentType
+				secr.Value,              // Value - []byte
-			f.contentBox.SetItem(rpos, 4, qt.NewQTableWidgetItem2(string(secr.Parameters))) // Parameters
+			)
-			f.contentBox.SetItem(rpos, 5, qt.NewQTableWidgetItem2(string(secr.Value)))      // Value
 		}
 
 		// Valid
-		f.contentBox.ResizeColumnsToContents()
+		f.Ready()
-		f.contentBox.SetEnabled(true)
 	}
 
 	return nil

db_sqlite.go

@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"yvbolt/sqliteclidriver"
+	"qbolt/sqliteclidriver"
 
 	"github.com/mappu/autoconfig"
 	qt "github.com/mappu/miqt/qt6"
@@ -32,22 +32,12 @@ func (ld *sqliteLoadedDatabase) DriverName() string {
 	return "SQLite " + ver1
 }
 
-func (ld *sqliteLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (ld *sqliteLoadedDatabase) Properties(bucketPath []string) (string, error) {
+	if len(bucketPath) == 0 || len(bucketPath) == 1 {
+		return "Please select...", nil // No properties
 
-	ctx := context.TODO()
+	} else {
 
-	if len(bucketPath) == 0 {
-		// Top-level
-		f.propertiesBox.SetText("Please select...")
-		return nil
-
-	} else if len(bucketPath) == 1 {
-		// Category (tables, ...)
-		f.propertiesBox.SetText("Please select...")
-		return nil
-
-	} else if len(bucketPath) == 2 && bucketPath[0] == sqliteTablesCaption {
-		// Render for specific table
 		tableName := bucketPath[1]
 
 		// Get some basic properties
@@ -59,7 +49,24 @@ func (ld *sqliteLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []strin
 		}
 
 		// Display table properties
-		f.propertiesBox.SetText(fmt.Sprintf("Selected table %q\n\nSchema:\n\n%s", tableName, schemaStmt))
+		return fmt.Sprintf("Selected table %q\n\nSchema:\n\n%s", tableName, schemaStmt), nil
+	}
+}
+
+func (ld *sqliteLoadedDatabase) RenderForNav(f *tableState, bucketPath []string) error {
+
+	ctx := context.TODO()
+
+	if len(bucketPath) == 0 {
+		return nil
+
+	} else if len(bucketPath) == 1 {
+		// Category (tables, ...)
+		return nil
+
+	} else if len(bucketPath) == 2 && bucketPath[0] == sqliteTablesCaption {
+		// Render for specific table
+		tableName := bucketPath[1]
 
 		// Load column details
 		// Use SELECT form instead of common PRAGMA table_info so we can just get names
@@ -70,7 +77,7 @@ func (ld *sqliteLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []strin
 			return fmt.Errorf("Failed to load columns for table %q: %w", tableName, err)
 		}
 
-		populateColumns(columnNames, f.contentBox)
+		populateColumns(columnNames, f)
 
 		// Find primary key, if any
 		var primaryKeyIdx int = -1
@@ -89,11 +96,14 @@ func (ld *sqliteLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []strin
 			return fmt.Errorf("Failed to load data for table %q: %w", tableName, err)
 		}
 		defer datar.Close()
-		populateRows(datar, f.contentBox, primaryKeyIdx)
+
+		err = populateRows(datar, f, primaryKeyIdx)
+		if err != nil {
+			return err
+		}
 
 		// We successfully populated the data grid
-		f.contentBox.ResizeColumnsToContents()
+		f.Ready()
-		f.contentBox.SetEnabled(true)
 		return nil
 
 	} else {
@@ -130,14 +140,14 @@ func (ld *sqliteLoadedDatabase) sqliteGetColumnNamesForTable(tableName string) (
 	return ret, nil
 }
 
-func populateColumns(names []string, dest *qt.QTableWidget) {
+func populateColumns(names []string, dest *tableState) {
-	dest.SetColumnCount(len(names))
+	// FIXME better column types?
-	dest.SetHorizontalHeaderLabels(names)
+	dest.SetupColumns(slice_repeat(columnType_inlineText, len(names)), names)
 }
 
-func populateRows(rr *sql.Rows, dest *qt.QTableWidget, pk_index int) {
+func populateRows(rr *sql.Rows, dest *tableState, pk_index int) error {
 
-	numColumns := int(dest.ColumnCount())
+	numColumns := len(dest.columns)
 
 	for rr.Next() {
 		fields := make([]interface{}, numColumns)
@@ -148,34 +158,23 @@ func populateRows(rr *sql.Rows, dest *qt.QTableWidget, pk_index int) {
 
 		err := rr.Scan(pfields...)
 		if err != nil {
-			qt.QMessageBox_Warning(dest.QWidget, APPNAME, fmt.Sprintf("Failed to load data: %s", err.Error()))
+			return fmt.Errorf("Scan: %w", err)
-			return
 		}
 
-		rpos := dest.RowCount()
+		rpos := dest.AddRow()
-		dest.SetRowCount(rpos + 1)
 		for i := 0; i < len(fields); i += 1 {
+			dest.SetCell(rpos, i, formatAny(fields[i])) // FIXME stop doing string conversion here
+		}
 
-			cellItem := qt.NewQTableWidgetItem2(formatAny(fields[i]))
+		if pk_index >= 0 {
-			if i == pk_index {
+			dest.SetRowPrimaryKey(rpos, []byte(formatAny(fields[pk_index]))) // FIXME stop doing string conversion here
-				cellItem.SetData(DataPrimaryKeyRole, qt.NewQVariant11(formatAny(fields[i]))) // FIXME stop doing string conversion here
-			} else if pk_index < 0 {
-				// We do not have a primary key for this table
-				// Therefore - disable editing
-				cellItem.SetFlags(cellItem.Flags() & ^qt.ItemIsEditable)
-			}
-
-			dest.SetItem(rpos, i, cellItem)
 		}
 
 	}
-	if rr.Err() != nil {
+	return rr.Err()
-		qt.QMessageBox_Warning(dest.QWidget, APPNAME, fmt.Sprintf("Failed to load data: %s", rr.Err().Error()))
-		return
-	}
 }
 
-func (ld *sqliteLoadedDatabase) ExecQuery(query string, resultArea *qt.QTableWidget) error {
+func (ld *sqliteLoadedDatabase) ExecQuery(query string, _ []string, resultArea *tableState) error {
 	rr, err := ld.db.Query(query)
 	if err != nil {
 		return err
@@ -183,8 +182,6 @@ func (ld *sqliteLoadedDatabase) ExecQuery(query string, resultArea *qt.QTableWid
 
 	defer rr.Close()
 
-	vcl_clear_grid(resultArea)
-
 	columns, err := rr.Columns()
 	if err != nil {
 		return err
@@ -192,11 +189,12 @@ func (ld *sqliteLoadedDatabase) ExecQuery(query string, resultArea *qt.QTableWid
 
 	populateColumns(columns, resultArea)
 
-	populateRows(rr, resultArea, -1)
+	err = populateRows(rr, resultArea, -1)
+	if err != nil {
+		return err
+	}
 
-	resultArea.ResizeColumnsToContents()
+	resultArea.Ready()
-	resultArea.SetEnabled(true)
-	resultArea.EditTriggers()
 	return nil
 }
 
@@ -210,17 +208,13 @@ func (n *sqliteLoadedDatabase) getPrimaryKeyForTable(ctx context.Context, tx Row
 	return primaryColumnName, err
 }
 
-func (n *sqliteLoadedDatabase) ApplyChanges(f *App, bucketPath []string) (retErr error) {
+func (n *sqliteLoadedDatabase) ApplyChanges(f *tableState, bucketPath []string) (retErr error) {
 
 	if len(bucketPath) != 2 {
 		return errors.New("invalid selection")
 	}
 	tableName := bucketPath[1]
 
-	// We have rendered row IDs, need to convert back to an SQLite primary key
-	// TODO stash the real key inside f.ui.contentBox.Objects()
-	// FIXME breaks if you try and edit the primary key(!) because the previous
-
 	ctx := context.Background()
 
 	tx, err := n.db.BeginTx(ctx, nil)
@@ -238,24 +232,12 @@ func (n *sqliteLoadedDatabase) ApplyChanges(f *App, bucketPath []string) (retErr
 		}
 	}()
 
-	// Data grid properties
-	var columnNames []string
-	for i := 0; i < f.ui.contentBox.ColumnCount(); i++ {
-		columnNames = append(columnNames, f.ui.contentBox.HorizontalHeaderItem(i).Text())
-	}
-
 	// Query sqlite table metadata to determine which of these is the PRIMARY KEY
 	primaryColumnName, err := n.getPrimaryKeyForTable(ctx, tx, tableName)
 	if err != nil {
 		return fmt.Errorf("Finding primary key for update: %w", err)
 	}
 
-	// Convert it to an index
-	primaryColumnIdx, ok := slice_find(columnNames, primaryColumnName)
-	if !ok {
-		return fmt.Errorf("Primary key %q missing from available columns", primaryColumnName)
-	}
-
 	// SQLite can only LIMIT 1 on update/delete if it was compiled with
 	// SQLITE_ENABLE_UPDATE_DELETE_LIMIT, which isn't the case for the mattn
 	// cgo library
@@ -263,22 +245,20 @@ func (n *sqliteLoadedDatabase) ApplyChanges(f *App, bucketPath []string) (retErr
 
 	// Edit
 	for rowid, editcells := range f.updateRows {
-		stmt := `UPDATE "` + tableName + `" SET `
+		stmt := `UPDATE [` + tableName + `] SET `
 		params := []interface{}{} // FIXME reinstate types for the driver (although SQLite doesn't mind)
 
 		for ct, cell := range editcells {
 			if ct > 0 {
 				stmt += `, `
 			}
-			stmt += `"` + columnNames[cell] + `" = ?`
+			stmt += `[` + f.columnLabels[cell] + `] = ?`
-			params = append(params, f.ui.contentBox.Item(rowid, cell).Text())
+			params = append(params, (f.columns[cell].(*stringColumn)).vals[rowid]) // FIXME stop doing string conversion
 		}
-		stmt += ` WHERE "` + primaryColumnName + `" = ?`
+		stmt += ` WHERE [` + primaryColumnName + `] = ?`
 
-		// The primary key was stashed in DataPrimaryKeyRole, on the pk_idx'th
+		// Update by primary key (stored separately)
-		// column, as a QString qvariant
+		pkVal := string(f.primaryKeys[rowid]) // FIXME avoid string marshalling
-		// FIXME avoid string marshalling
-		pkVal := f.ui.contentBox.Item(rowid, primaryColumnIdx).Data(DataPrimaryKeyRole).ToString()
 		params = append(params, pkVal)
 
 		_, err = tx.ExecContext(ctx, stmt, params...)
@@ -289,9 +269,9 @@ func (n *sqliteLoadedDatabase) ApplyChanges(f *App, bucketPath []string) (retErr
 
 	// Delete by key (affects rowids after re-render)
 	for rowid, _ := range f.deleteRows {
-		pkVal := f.ui.contentBox.Item(rowid, primaryColumnIdx).Text()
+		pkVal := string(f.primaryKeys[rowid]) // FIXME avoid string marshalling
 
-		stmt := `DELETE FROM "` + tableName + `" WHERE "` + primaryColumnName + `" = ?`
+		stmt := `DELETE FROM [` + tableName + `] WHERE [` + primaryColumnName + `] = ?`
 
 		_, err = tx.ExecContext(ctx, stmt, pkVal)
 		if err != nil {
@@ -301,15 +281,15 @@ func (n *sqliteLoadedDatabase) ApplyChanges(f *App, bucketPath []string) (retErr
 
 	// Insert all new entries
 	for rowid, _ := range f.insertRows {
-		stmt := `INSERT INTO "` + tableName + `" (` + strings.Join(columnNames, `, `) + `) VALUES (`
+		stmt := `INSERT INTO [` + tableName + `] ([` + strings.Join(f.columnLabels, `], [`) + `]) VALUES (`
 		params := []interface{}{} // FIXME reinstate types for the driver (although SQLite doesn't mind)
 
-		for colid := 0; colid < len(columnNames); colid++ {
+		for colid := 0; colid < len(f.columnLabels); colid++ {
 			if colid > 0 {
 				stmt += `, `
 			}
 			stmt += "?"
-			params = append(params, f.ui.contentBox.Item(rowid, colid).Text())
+			params = append(params, (f.columns[colid].(*stringColumn)).vals[rowid]) // FIXME stop doing string conversion
 		}
 		stmt += `)`
 
@@ -385,7 +365,7 @@ func (ld *sqliteLoadedDatabase) CompactDatabase(sender *qt.QTreeWidgetItem, buck
 
 func (ld *sqliteLoadedDatabase) ExportBackup(sender *qt.QTreeWidgetItem, bucketPath []string) error {
 	// Popup for output file
-	savePath := qt.QFileDialog_GetSaveFileName4(sender.TreeWidget().QWidget, "Save backup as...", "", "SQLite database (*.db *.db3 *.sqlite *.sqlite3);;All files (*.*)")
+	savePath := qt.QFileDialog_GetSaveFileName4(sender.TreeWidget().QWidget, "Save backup as...", "", "SQLite database (*.db *.db3 *.sqlite *.sqlite3);;All files (*)")
 	if savePath == "" {
 		return nil // cancelled
 	}
@@ -403,7 +383,7 @@ func (ld *sqliteLoadedDatabase) DropTable(sender *qt.QTreeWidgetItem, bucketPath
 
 	tableName := bucketPath[1]
 
-	if !vcl_confirm_dialog(sender.TreeWidget().QWidget, "Drop table", fmt.Sprintf("Are you sure you want to drop the table %q?", tableName)) {
+	if !vcl_confirm_dialog(sender.TreeWidget().QWidget, fmt.Sprintf("Are you sure you want to drop the table %q?", tableName)) {
 		return nil // cancelled
 	}
 
@@ -426,8 +406,12 @@ type sqliteConnection struct {
 	Disk *struct {
 		Database  autoconfig.ExistingFile `yfilter:"SQLite database (*.db *.db3 *.sqlite *.sqlite3);;All files (*)"`
 		CliDriver bool                    `ylabel:"Use experimental CLI driver"`
-	}
+	} `json:",omitempty"`
-	Memory *struct{}
+	Memory *struct{} `json:",omitempty"`
+	SSH    *struct {
+		SSHServer *SSHTunnel
+		Database  string
+	} `json:",omitempty"`
 }
 
 func (sc *sqliteConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
@@ -444,12 +428,29 @@ func (sc *sqliteConnection) Connect(ctx context.Context) (loadedDatabase, string
 
 		return &sqliteLoadedDatabase{db: db}, filepath.Base(string(sc.Disk.Database)), nil
 
-	} else { // memory
+	} else if sc.Memory != nil { // memory
 		db, err := sql.Open("sqlite3", ":memory:")
 		if err != nil {
 			return nil, "", err
 		}
 
 		return &sqliteLoadedDatabase{db: db}, ":memory:", nil
+
+	} else if sc.SSH != nil {
+		if sc.SSH.SSHServer == nil {
+			return nil, "", errors.New("Invalid configuration")
+		}
+
+		cl, err := sc.SSH.SSHServer.Open(ctx)
+		if err != nil {
+			return nil, "", err
+		}
+
+		db := sqliteclidriver.OpenSSH(cl, sc.SSH.Database)
+
+		return &sqliteLoadedDatabase{db: db}, "SSH[" + filepath.Base(string(sc.SSH.Database)) + "]", nil
+
+	} else {
+		return nil, "", errors.New("Invalid configuration")
 	}
 }

db_sshagent.go

@@ -0,0 +1,179 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"net/netip"
+	"os"
+
+	"github.com/mappu/autoconfig"
+	qt "github.com/mappu/miqt/qt6"
+	"golang.org/x/crypto/ssh/agent"
+)
+
+type sshAgentLdb struct {
+	conn agent.ExtendedAgent
+}
+
+func (ld *sshAgentLdb) DriverName() string {
+	return "ssh-agent"
+}
+
+func (ld *sshAgentLdb) Properties(bucketPath []string) (string, error) {
+	return "", nil
+}
+
+func (ld *sshAgentLdb) RenderForNav(f *tableState, bucketPath []string) error {
+
+	keys, err := ld.conn.List()
+	if err != nil {
+		return err
+	}
+
+	f.SetupColumns([]columnType{columnType_inlineText, columnType_inlineText, columnType_popupData}, []string{"Comment", "Type", "Public Key"})
+
+	for _, key := range keys {
+		// The publicKey blob is the effective primary-key for DB manipulation
+		f.AddRow_PK_Data(key.Blob, key.Comment, key.Format, key.Blob)
+	}
+
+	f.Ready()
+	return nil
+}
+
+func (ld *sshAgentLdb) NavChildren(bucketPath []string) ([]string, error) {
+	return []string{}, nil // No children
+}
+
+func (ld *sshAgentLdb) lockPrompt(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+	parent := sender.TreeWidget().QWidget
+	props := encryptionKey{}
+	autoconfig.OpenDialog(&props, parent, "Enter lock password...", func() {
+
+		key, err := props.Get()
+		if err != nil {
+			qt.QMessageBox_Warning(parent, APPNAME, err.Error())
+			return
+		}
+
+		if len(key) == 0 {
+			// Cancelled
+			return
+		}
+
+		err = ld.conn.Lock(key)
+		if err != nil {
+			qt.QMessageBox_Warning(parent, APPNAME, "Locking SSH agent: "+err.Error())
+			return
+		}
+	})
+
+	return nil // n.b. refreshes now
+}
+
+func (ld *sshAgentLdb) unlockPrompt(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+	parent := sender.TreeWidget().QWidget
+	props := encryptionKey{}
+	autoconfig.OpenDialog(&props, parent, "Enter unlock password...", func() {
+
+		key, err := props.Get()
+		if err != nil {
+			qt.QMessageBox_Warning(parent, APPNAME, err.Error())
+			return
+		}
+
+		if len(key) == 0 {
+			// Cancelled
+			return
+		}
+
+		err = ld.conn.Unlock(key)
+		if err != nil {
+			qt.QMessageBox_Warning(parent, APPNAME, "Unlocking SSH agent: "+err.Error())
+			return
+		}
+
+		// Trigger a refresh
+	})
+
+	return nil // n.b. refreshes now, which may cause double-error if we are still locked
+}
+
+func (ld *sshAgentLdb) NavContext(bucketPath []string) ([]contextAction, error) {
+	return []contextAction{
+		{"Lock agent...", ld.lockPrompt},
+		{"Unlock agent...", ld.unlockPrompt},
+	}, nil
+}
+
+func (ld *sshAgentLdb) Close() {
+	// noop
+}
+
+var _ loadedDatabase = &sshAgentLdb{} // interface assertion
+
+//
+
+type sshAgentConn struct {
+	Type autoconfig.OneOf
+	Unix *autoconfig.ExistingFile `json:",omitempty"`
+	TCP  *autoconfig.AddressPort  `json:",omitempty"`
+}
+
+func (c *sshAgentConn) Reset() {
+
+	if sshAuthSock := os.Getenv("SSH_AUTH_SOCK"); sshAuthSock != "" {
+		if _, err := os.Stat(sshAuthSock); err == nil {
+			// File
+			c.Type = "Unix"
+			val := autoconfig.ExistingFile(sshAuthSock)
+			c.Unix = &val
+
+		} else if props, err := netip.ParseAddrPort(sshAuthSock); err == nil {
+			// IP:Port
+			c.Type = "TCP"
+			val := autoconfig.AddressPort{
+				Address: props.Addr().String(),
+				Port:    int(props.Port()),
+			}
+			c.TCP = &val
+
+		} else {
+			// Can't parse env var
+		}
+	}
+}
+
+func (c *sshAgentConn) getAgent() (agent.ExtendedAgent, error) {
+
+	if c.Unix != nil {
+		conn, err := net.Dial("unix", string(*c.Unix))
+		if err != nil {
+			return nil, fmt.Errorf("Connecting to SSH agent %q: %w", c.Unix, err)
+		}
+
+		return agent.NewClient(conn), nil
+
+	} else if c.TCP != nil {
+		conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", c.TCP.Address, c.TCP.Port))
+		if err != nil {
+			return nil, fmt.Errorf("Connecting to SSH agent %q: %w", c.TCP.String(), err)
+		}
+
+		return agent.NewClient(conn), nil
+
+	} else {
+		return nil, fmt.Errorf("No connection details specified")
+
+	}
+}
+
+func (c *sshAgentConn) Connect(ctx context.Context) (loadedDatabase, string, error) {
+	agent, err := c.getAgent()
+	if err != nil {
+		return nil, "", err
+	}
+
+	return &sshAgentLdb{conn: agent}, "SSH Agent", nil
+}

db_starskey.go

@@ -6,7 +6,6 @@ import (
 	"path/filepath"
 
 	"github.com/mappu/autoconfig"
-	qt "github.com/mappu/miqt/qt6"
 	"github.com/starskey-io/starskey"
 )
 
@@ -18,26 +17,27 @@ func (ld *starskeyLdb) DriverName() string {
 	return "Starskey"
 }
 
-func (ld *starskeyLdb) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (ld *starskeyLdb) Properties(bucketPath []string) (string, error) {
+	return "", nil // No properties
+}
 
-	// No properties
+func (ld *starskeyLdb) RenderForNav(f *tableState, bucketPath []string) error {
 
 	// Load data
 	// Starskey always uses Key + Value as the columns
 
-	f.contentBox.SetColumnCount(2)
+	f.SetupColumns([]columnType{columnType_popupData, columnType_popupData}, []string{"Key", "Value"})
-	f.contentBox.SetHorizontalHeaderLabels([]string{"Key", "Value"})
 
 	// It's possible to create a transaction in Starskey, but you can't enumerate keys
 	// within the transaction - doesn't really help us
 
-	// We have to supply valid bounds that work for bytes.Compare
+	var allKeys [][]byte
-	// FIXME any better way to find all keys?
+	_, err := ld.db.FilterKeys(func(key []byte) bool {
-	earliestPossibleKey := []byte{0x00}
+		allKeys = append(allKeys, slice_dup(key))
-	lastPossibleKey := []byte{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}
+		return false // don't get value in here
-	allKeys, err := ld.db.Range(earliestPossibleKey, lastPossibleKey)
+	})
 	if err != nil {
-		return err
+		return fmt.Errorf("FilterKeys: %w", err)
 	}
 
 	for _, key := range allKeys {
@@ -46,20 +46,25 @@ func (ld *starskeyLdb) RenderForNav(f *MainWindowUi, bucketPath []string) error
 			// We get <nil, nil> if not found, so any error is a real error
 			return fmt.Errorf("Reading key %q: %w", string(key), err)
 		}
+		if val == nil {
+			// Key not found
+			// The hack to use FilterKeys() means this can happen if the key is
+			// pointing to a tombstone
+			continue
+		}
 
-		rpos := f.contentBox.RowCount()
+		f.AddRow_PK_Data(key, key, val)
-		f.contentBox.SetRowCount(rpos + 1)
-
-		f.contentBox.SetItem(rpos, 0, qt.NewQTableWidgetItem2(string(key)))
-		f.contentBox.SetItem(rpos, 1, qt.NewQTableWidgetItem2(string(val)))
 	}
 
 	// Valid
-	f.contentBox.ResizeColumnsToContents()
+	f.Ready()
-	f.contentBox.SetEnabled(true)
 	return nil
 }
 
+func (n *starskeyLdb) ApplyChanges(f *tableState, bucketPath []string) error {
+	return kvstore_ApplyChanges(f, n.db.Put, n.db.Delete)
+}
+
 func (ld *starskeyLdb) NavChildren(bucketPath []string) ([]string, error) {
 	return []string{}, nil // No children
 }
@@ -72,7 +77,8 @@ func (ld *starskeyLdb) Close() {
 	_ = ld.db.Close()
 }
 
-var _ loadedDatabase = &starskeyLdb{} // interface assertion
+var _ loadedDatabase = &starskeyLdb{}         // interface assertion
+var _ editableLoadedDatabase = &starskeyLdb{} // interface assertion
 
 //
 

debconf/debconf.go

@@ -28,6 +28,16 @@ type Database struct {
 	AllColumnNames []string
 }
 
+func (d *Database) FindApplicationByName(search string) (*Application, bool) {
+	for idx, app := range d.Entries {
+		if app.Name == search {
+			return &d.Entries[idx], true // TODO faster lookup?
+		}
+	}
+
+	return nil, false
+}
+
 func Parse(r io.Reader) (*Database, error) {
 	sc := bufio.NewScanner(r)
 

embed.qrc

@@ -1,21 +1,23 @@
 <RCC>
   <qresource prefix="/">
-    <file>assets/vendor_qt.png</file>
-    <file>assets/connect.png</file>
-    <file>assets/disconnect.png</file>
-    <file>assets/database_key.png</file>
-    <file>assets/help.png</file>
     <file>assets/add.png</file>
     <file>assets/arrow_refresh.png</file>
     <file>assets/chart_bar.png</file>
+    <file>assets/compress.png</file>
+    <file>assets/connect.png</file>
     <file>assets/database.png</file>
     <file>assets/database_add.png</file>
     <file>assets/database_delete.png</file>
+    <file>assets/database_key.png</file>
     <file>assets/database_lightning.png</file>
     <file>assets/database_save.png</file>
     <file>assets/delete.png</file>
+    <file>assets/disconnect.png</file>
+    <file>assets/help.png</file>
+    <file>assets/key.png</file>
     <file>assets/lightning.png</file>
     <file>assets/lightning_go.png</file>
+    <file>assets/page_key.png</file>
     <file>assets/pencil.png</file>
     <file>assets/pencil_add.png</file>
     <file>assets/pencil_delete.png</file>
@@ -25,6 +27,7 @@
     <file>assets/table_add.png</file>
     <file>assets/table_delete.png</file>
     <file>assets/table_save.png</file>
+    <file>assets/vendor_buntdb.png</file>
     <file>assets/vendor_cockroach.png</file>
     <file>assets/vendor_debian.png</file>
     <file>assets/vendor_dgraph.png</file>
@@ -32,9 +35,15 @@
     <file>assets/vendor_github.png</file>
     <file>assets/vendor_leveldb.png</file>
     <file>assets/vendor_lmdb.png</file>
+    <file>assets/vendor_lotus.png</file>
+    <file>assets/vendor_mongodb.png</file>
     <file>assets/vendor_mysql.png</file>
+    <file>assets/vendor_qt.png</file>
     <file>assets/vendor_redis.png</file>
+    <file>assets/vendor_riak.png</file>
+    <file>assets/vendor_rosedb.png</file>
     <file>assets/vendor_sqlite.png</file>
+    <file>assets/vendor_ssh.png</file>
     <file>assets/vendor_starskey.png</file>
   </qresource>
 </RCC>

go.mod

@@ -1,4 +1,4 @@
-module yvbolt
+module qbolt
 
 go 1.24.0
 
@@ -7,65 +7,95 @@ toolchain go1.24.4
 require (
 	github.com/cockroachdb/pebble v1.1.5
 	github.com/dgraph-io/badger/v4 v4.8.0
+	github.com/godbus/dbus/v5 v5.2.0
 	github.com/google/uuid v1.6.0
-	github.com/mappu/autoconfig v0.3.1-0.20251126064959-64718706eb2a
+	github.com/ledgerwatch/lmdb-go v1.18.2
+	github.com/lotusdblabs/lotusdb/v2 v2.1.0
+	github.com/mappu/autoconfig v0.4.1
 	github.com/mappu/miqt v0.12.1-0.20251106063543-466b60e47edf
 	github.com/mattn/go-sqlite3 v1.14.32
-	github.com/redis/go-redis/v9 v9.16.0
+	github.com/redis/go-redis/v9 v9.17.2
+	github.com/rosedblabs/rosedb/v2 v2.3.6
+	github.com/starskey-io/starskey v0.1.9
 	github.com/stretchr/testify v1.11.1
 	github.com/syndtr/goleveldb v1.0.0
+	github.com/zalando/go-keyring v0.2.6
 	go.etcd.io/bbolt v1.4.3
-	golang.org/x/crypto v0.44.0
+	go.mills.io/bitcask/v2 v2.1.5
+	go.mongodb.org/mongo-driver/v2 v2.4.1
+	golang.org/x/crypto v0.46.0
 )
 
 require (
-	al.essio.dev/pkg/shellescape v1.5.1 // indirect
+	al.essio.dev/pkg/shellescape v1.6.0 // indirect
 	github.com/DataDog/zstd v1.5.7 // indirect
+	github.com/abcum/lcp v0.0.0-20201209214815-7a3f3840be81 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bwmarrin/snowflake v0.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cockroachdb/errors v1.12.0 // indirect
 	github.com/cockroachdb/fifo v0.0.0-20240816210425-c5d0cb0b6fc0 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 // indirect
 	github.com/cockroachdb/redact v1.1.6 // indirect
 	github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb // indirect
-	github.com/danieljoos/wincred v1.2.2 // indirect
+	github.com/danieljoos/wincred v1.2.3 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dgraph-io/ristretto/v2 v2.3.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/getsentry/sentry-go v0.36.2 // indirect
+	github.com/getsentry/sentry-go v0.40.0 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/godbus/dbus/v5 v5.1.0 // indirect
+	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/snappy v1.0.0 // indirect
+	github.com/google/btree v1.1.2 // indirect
 	github.com/google/flatbuffers v25.9.23+incompatible // indirect
-	github.com/klauspost/compress v1.18.1 // indirect
+	github.com/hashicorp/go-immutable-radix/v2 v2.0.0 // indirect
-	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
+	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
+	github.com/klauspost/compress v1.18.2 // indirect
+	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/ledgerwatch/lmdb-go v1.18.2 // indirect
+	github.com/mattetti/filebuffer v1.0.1 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_golang v1.23.2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.67.2 // indirect
+	github.com/prometheus/common v0.67.4 // indirect
 	github.com/prometheus/procfs v0.19.2 // indirect
+	github.com/robfig/cron/v3 v3.0.0 // indirect
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
-	github.com/starskey-io/starskey v0.1.9 // indirect
+	github.com/rosedblabs/diskhash v0.0.0-20230910084041-289755737e2a // indirect
-	github.com/zalando/go-keyring v0.2.6 // indirect
+	github.com/rosedblabs/wal v1.3.6 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/spaolacci/murmur3 v1.1.0 // indirect
+	github.com/tidwall/btree v1.7.0 // indirect
+	github.com/tidwall/buntdb v1.3.2 // indirect
+	github.com/tidwall/gjson v1.14.3 // indirect
+	github.com/tidwall/grect v0.1.4 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.0 // indirect
+	github.com/tidwall/rtred v0.1.2 // indirect
+	github.com/tidwall/tinyqueue v0.1.1 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
+	github.com/xdg-go/scram v1.2.0 // indirect
+	github.com/xdg-go/stringprep v1.0.4 // indirect
+	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
 	github.com/zeebo/xxh3 v1.0.2 // indirect
-	go.mongodb.org/mongo-driver v1.17.2 // indirect
+	go.mongodb.org/mongo-driver v1.17.6 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/otel v1.38.0 // indirect
+	go.opentelemetry.io/otel v1.39.0 // indirect
-	go.opentelemetry.io/otel/metric v1.38.0 // indirect
+	go.opentelemetry.io/otel/metric v1.39.0 // indirect
-	go.opentelemetry.io/otel/trace v1.38.0 // indirect
+	go.opentelemetry.io/otel/trace v1.39.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
-	golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
+	golang.org/x/exp v0.0.0-20251209150349-8475f28825e9 // indirect
-	golang.org/x/net v0.46.0 // indirect
+	golang.org/x/net v0.48.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
+	golang.org/x/sync v0.19.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/sys v0.39.0 // indirect
+	golang.org/x/text v0.32.0 // indirect
 	google.golang.org/protobuf v1.36.10 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,13 +1,17 @@
-al.essio.dev/pkg/shellescape v1.5.1 h1:86HrALUujYS/h+GtqoB26SBEdkWfmMI6FubjXlsXyho=
+al.essio.dev/pkg/shellescape v1.6.0 h1:NxFcEqzFSEVCGN2yq7Huv/9hyCEGVa/TncnOOBBeXHA=
-al.essio.dev/pkg/shellescape v1.5.1/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890=
+al.essio.dev/pkg/shellescape v1.6.0/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890=
 github.com/DataDog/zstd v1.5.7 h1:ybO8RBeh29qrxIhCA9E8gKY6xfONU9T6G6aP9DTKfLE=
 github.com/DataDog/zstd v1.5.7/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
+github.com/abcum/lcp v0.0.0-20201209214815-7a3f3840be81 h1:uHogIJ9bXH75ZYrXnVShHIyywFiUZ7OOabwd9Sfd8rw=
+github.com/abcum/lcp v0.0.0-20201209214815-7a3f3840be81/go.mod h1:6ZvnjTZX1LNo1oLpfaJK8h+MXqHxcBFBIwkgsv+xlv0=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
 github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
+github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
+github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4=
@@ -25,10 +29,12 @@ github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ
 github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb h1:3bCgBvB8PbJVMX1ouCcSIxvsqKPYM7gs72o0zC76n9g=
 github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/danieljoos/wincred v1.2.2 h1:774zMFJrqaeYCK2W57BgAem/MLi6mtSE47MB6BOJ0i0=
+github.com/danieljoos/wincred v1.2.3 h1:v7dZC2x32Ut3nEfRH+vhoZGvN72+dQ/snVXo/vMFLdQ=
-github.com/danieljoos/wincred v1.2.2/go.mod h1:w7w4Utbrz8lqeMbDAK0lkNJUv5sAOkFi7nd/ogr0Uh8=
+github.com/danieljoos/wincred v1.2.3/go.mod h1:6qqX0WNrS4RzPZ1tnroDzq9kY3fu1KwE7MRLQK4X0bs=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgraph-io/badger/v4 v4.8.0 h1:JYph1ChBijCw8SLeybvPINizbDKWZ5n/GYbz2yhN/bs=
 github.com/dgraph-io/badger/v4 v4.8.0/go.mod h1:U6on6e8k/RTbUWxqKR0MvugJuVmkxSNc79ap4917h4w=
 github.com/dgraph-io/ristretto/v2 v2.3.0 h1:qTQ38m7oIyd4GAed/QkUZyPFNMnvVWyazGXRwvOt5zk=
@@ -40,8 +46,8 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cu
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/getsentry/sentry-go v0.36.2 h1:uhuxRPTrUy0dnSzTd0LrYXlBYygLkKY0hhlG5LXarzM=
+github.com/getsentry/sentry-go v0.40.0 h1:VTJMN9zbTvqDqPwheRVLcp0qcUcM+8eFivvGocAaSbo=
-github.com/getsentry/sentry-go v0.36.2/go.mod h1:p5Im24mJBeruET8Q4bbcMfCQ+F+Iadc4L48tB1apo2c=
+github.com/getsentry/sentry-go v0.40.0/go.mod h1:eRXCoh3uvmjQLY6qu63BjUZnaBu5L5WhMV1RwYO8W5s=
 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
 github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -49,44 +55,59 @@ github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
 github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
+github.com/godbus/dbus/v5 v5.2.0 h1:3WexO+U+yg9T70v9FdHr9kCxYlazaAXUhx2VMkbfax8=
-github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/godbus/dbus/v5 v5.2.0/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
+github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
+github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
 github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
+github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
 github.com/google/flatbuffers v25.9.23+incompatible h1:rGZKv+wOb6QPzIdkM2KxhBZCDrA0DeN6DNmRDrqIsQU=
 github.com/google/flatbuffers v25.9.23+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0=
+github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/hashicorp/go-immutable-radix/v2 v2.0.0 h1:nq9lQ5I71Heg2lRb2/+szuIWKY3Y73d8YKyXyN91WzU=
+github.com/hashicorp/go-immutable-radix/v2 v2.0.0/go.mod h1:hgdqLXA4f6NIjRVisM1TJ9aOJVNRqKZj+xDGF6m7PBw=
+github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
+github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
+github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.18.1 h1:bcSGx7UbpBqMChDtsF28Lw6v/G94LPrrbMbdC3JH2co=
+github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk=
-github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0=
+github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
-github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4=
+github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
-github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/ledgerwatch/lmdb-go v1.18.2 h1:6YKp/KYcqGunNRHKZBBhiYADcIcWKzvu5QZv89RhnFQ=
 github.com/ledgerwatch/lmdb-go v1.18.2/go.mod h1:NKRpCxksoTQPyxsUcBiVOe0135uqnJsnf6cElxmOL0o=
-github.com/mappu/autoconfig v0.1.0 h1:T740iW7/rkqi+pxJIlP+WB433h34jNRjqqG9ABTSScs=
+github.com/lotusdblabs/lotusdb/v2 v2.1.0 h1:rCBrwED8Po12FzrxxX4zppxoHb2O+sCtddyW4kyDiCQ=
-github.com/mappu/autoconfig v0.1.0/go.mod h1:kca6kaYjqOwkZnY9z5YKo0oI/7Bxe2fMIHhYzXwGHEE=
+github.com/lotusdblabs/lotusdb/v2 v2.1.0/go.mod h1:MyOEvqL3Hxm3HiBOYZ4BlZBnqCIcc2QQkF34VBD76fk=
-github.com/mappu/autoconfig v0.2.0 h1:5auhryqiubVBFq9CdY+VHU36bysG70tRGPpyT+M4ycs=
+github.com/mappu/autoconfig v0.4.1 h1:ekO7mzN+beFu7VhNfJxNlL/5wkYcP9PAl9VTG4EDxYs=
-github.com/mappu/autoconfig v0.2.0/go.mod h1:kca6kaYjqOwkZnY9z5YKo0oI/7Bxe2fMIHhYzXwGHEE=
+github.com/mappu/autoconfig v0.4.1/go.mod h1:kca6kaYjqOwkZnY9z5YKo0oI/7Bxe2fMIHhYzXwGHEE=
-github.com/mappu/autoconfig v0.3.1-0.20251126064959-64718706eb2a h1:3vhzzO7RLT9qx3kWaPrHTS52pt7ENCRNbeJlkyWfEzw=
-github.com/mappu/autoconfig v0.3.1-0.20251126064959-64718706eb2a/go.mod h1:kca6kaYjqOwkZnY9z5YKo0oI/7Bxe2fMIHhYzXwGHEE=
-github.com/mappu/miqt v0.12.0 h1:bBMBDeACmV8TbdLfoN51la7kF6QT3sNAcG+ZdRDgmxU=
-github.com/mappu/miqt v0.12.0/go.mod h1:xFg7ADaO1QSkmXPsPODoKe/bydJpRG9fgCYyIDl/h1U=
 github.com/mappu/miqt v0.12.1-0.20251106063543-466b60e47edf h1:SmBzNUevLUzu1msJ5xzWH/Kot+GtOtoz0u9la42dRU4=
 github.com/mappu/miqt v0.12.1-0.20251106063543-466b60e47edf/go.mod h1:xFg7ADaO1QSkmXPsPODoKe/bydJpRG9fgCYyIDl/h1U=
+github.com/mattetti/filebuffer v1.0.1 h1:gG7pyfnSIZCxdoKq+cPa8T0hhYtD9NxCdI4D7PTjRLM=
+github.com/mattetti/filebuffer v1.0.1/go.mod h1:YdMURNDOttIiruleeVr6f56OrMc+MydEnTcXwtkxNVs=
 github.com/mattn/go-sqlite3 v1.14.32 h1:JD12Ag3oLy1zQA+BNn74xRgaBbdhbNIDYvQUEuuErjs=
 github.com/mattn/go-sqlite3 v1.14.32/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
@@ -101,45 +122,101 @@ github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTw
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
 github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
 github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
 github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
-github.com/prometheus/common v0.67.2 h1:PcBAckGFTIHt2+L3I33uNRTlKTplNzFctXcWhPyAEN8=
+github.com/prometheus/common v0.67.4 h1:yR3NqWO1/UyO1w2PhUvXlGQs/PtFmoveVO0KZ4+Lvsc=
-github.com/prometheus/common v0.67.2/go.mod h1:63W3KZb1JOKgcjlIr64WW/LvFGAqKPj0atm+knVGEko=
+github.com/prometheus/common v0.67.4/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI=
 github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws=
 github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw=
-github.com/redis/go-redis/v9 v9.16.0 h1:OotgqgLSRCmzfqChbQyG1PHC3tLNR89DG4jdOERSEP4=
+github.com/redis/go-redis/v9 v9.17.2 h1:P2EGsA4qVIM3Pp+aPocCJ7DguDHhqrXNhVcEp4ViluI=
-github.com/redis/go-redis/v9 v9.16.0/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370=
+github.com/redis/go-redis/v9 v9.17.2/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370=
+github.com/robfig/cron/v3 v3.0.0 h1:kQ6Cb7aHOHTSzNVNEhmp8EcWKLb4CbiMW9h9VyIhO4E=
+github.com/robfig/cron/v3 v3.0.0/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/rosedblabs/diskhash v0.0.0-20230910084041-289755737e2a h1:BNp46nsknQivr3Gxzc6ytzG7xtBscBnLYZIkr0UfCko=
+github.com/rosedblabs/diskhash v0.0.0-20230910084041-289755737e2a/go.mod h1:3xvIg+7iOFUL/vMCE/6DwE6Yecb0okVYJBEfpdC/E+8=
+github.com/rosedblabs/rosedb/v2 v2.3.6 h1:o8vVOp61hFdORrz/PTosqU21/Z2Bug5I7cy1D3MZh2M=
+github.com/rosedblabs/rosedb/v2 v2.3.6/go.mod h1:/de9n2CoYaAGBDxZTJC5Jb0LCQOtoA3GOom+9QD9Z98=
+github.com/rosedblabs/wal v1.3.6 h1:oxZYTPX/u4JuGDW98wQ1YamWqerlrlSUFKhgP6Gd/Ao=
+github.com/rosedblabs/wal v1.3.6/go.mod h1:wdq54KJUyVTOv1uddMc6Cdh2d/YCIo8yjcwJAb1RCEM=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs=
+github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
+github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/starskey-io/starskey v0.1.9 h1:lABmD5KQgkpJZTCwSt+BHSOPXe82B9smbuScRL6T8Zk=
 github.com/starskey-io/starskey v0.1.9/go.mod h1:qly4ec2C/4Y45jhpL+q4m+Uxzg3mjj0t7RjpJslB3ao=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
+github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI=
+github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
+github.com/tidwall/buntdb v1.3.2 h1:qd+IpdEGs0pZci37G4jF51+fSKlkuUTMXuHhXL1AkKg=
+github.com/tidwall/buntdb v1.3.2/go.mod h1:lZZrZUWzlyDJKlLQ6DKAy53LnG7m5kHyrEHvvcDmBpU=
+github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw=
+github.com/tidwall/gjson v1.14.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/grect v0.1.4 h1:dA3oIgNgWdSspFzn1kS4S/RDpZFLrIxAZOdJKjYapOg=
+github.com/tidwall/grect v0.1.4/go.mod h1:9FBsaYRaR0Tcy4UwefBX/UDcDcDy9V5jUcxHzv2jd5Q=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tidwall/rtred v0.1.2 h1:exmoQtOLvDoO8ud++6LwVsAMTu0KPzLTUrMln8u1yu8=
+github.com/tidwall/rtred v0.1.2/go.mod h1:hd69WNXQ5RP9vHd7dqekAz+RIdtfBogmglkZSRxCHFQ=
+github.com/tidwall/tinyqueue v0.1.1 h1:SpNEvEggbpyN5DIReaJ2/1ndroY8iyEGxPYxoSaymYE=
+github.com/tidwall/tinyqueue v0.1.1/go.mod h1:O/QNHwrnjqr6IHItYrzoHAKYhBkLI67Q096fQP5zMYw=
+github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
+github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
+github.com/xdg-go/scram v1.2.0 h1:bYKF2AEwG5rqd1BumT4gAnvwU/M9nBp2pTSxeZw7Wvs=
+github.com/xdg-go/scram v1.2.0/go.mod h1:3dlrS0iBaWKYVt2ZfA4cj48umJZ+cAEbR6/SjLA88I8=
+github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
+github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
+github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
+github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/zalando/go-keyring v0.2.6 h1:r7Yc3+H+Ux0+M72zacZoItR3UDxeWfKTcabvkI8ua9s=
 github.com/zalando/go-keyring v0.2.6/go.mod h1:2TCrxYrbUNYfNS/Kgy/LSrkSQzZ5UPVH85RwfczwvcI=
+github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
+github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
 github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
 github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
 go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo=
 go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E=
-go.mongodb.org/mongo-driver v1.17.2 h1:gvZyk8352qSfzyZ2UMWcpDpMSGEr1eqE4T793SqyhzM=
+go.mills.io/bitcask/v2 v2.1.5 h1:SKPa0TPasJJZ8rNbLDvV3+lRXvdyQ0mwBobm2RH7J7w=
-go.mongodb.org/mongo-driver v1.17.2/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
+go.mills.io/bitcask/v2 v2.1.5/go.mod h1:ZQFykoTTCvMwy24lBstZhSRQuleYIB4EzWKSOgEv6+k=
+go.mongodb.org/mongo-driver v1.17.6 h1:87JUG1wZfWsr6rIz3ZmpH90rL5tea7O3IHuSwHUpsss=
+go.mongodb.org/mongo-driver v1.17.6/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
+go.mongodb.org/mongo-driver/v2 v2.4.1 h1:hGDMngUao03OVQ6sgV5csk+RWOIkF+CuLsTPobNMGNI=
+go.mongodb.org/mongo-driver/v2 v2.4.1/go.mod h1:jHeEDJHJq7tm6ZF45Issun9dbogjfnPySb1vXA7EeAI=
 go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
+go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
-go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
+go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
-go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
+go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
-go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
+go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
-go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
+go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
-go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
+go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
@@ -147,41 +224,58 @@ go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.44.0 h1:A97SsFvM3AIwEEmTBiaxPPTYpDC47w720rdiiUvgoAU=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc=
+golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
-golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 h1:mgKeJMpvi0yx/sU5GsxQ7p6s2wtOnGAHZWCHUM4KGzY=
+golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
-golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
+golang.org/x/exp v0.0.0-20251209150349-8475f28825e9 h1:MDfG8Cvcqlt9XXrmEiD4epKn7VJHZO84hejP9Jmp0MM=
+golang.org/x/exp v0.0.0-20251209150349-8475f28825e9/go.mod h1:EPRbTFwzwjXj9NpYyyrvenVh9Y+GFeEvMNh7Xuz7xgU=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
+golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
+golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
+golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
+golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -197,5 +291,6 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

loadedDatabase.go

@@ -16,16 +16,17 @@ type contextAction struct {
 // loadedDatabase is a DB-agnostic interface for each loaded database.
 type loadedDatabase interface {
 	DriverName() string
-	RenderForNav(f *MainWindowUi, bucketPath []string) error
+	Properties(bucketPath []string) (string, error)
+	RenderForNav(f *tableState, bucketPath []string) error
 	NavChildren(bucketPath []string) ([]string, error)
 	NavContext(bucketPath []string) ([]contextAction, error)
 	Close()
 }
 
 type queryableLoadedDatabase interface {
-	ExecQuery(query string, resultArea *qt.QTableWidget) error
+	ExecQuery(query string, bucketPath []string, resultArea *tableState) error
 }
 
 type editableLoadedDatabase interface {
-	ApplyChanges(f *App, bucketPath []string) error
+	ApplyChanges(f *tableState, bucketPath []string) error
 }

main.go

@@ -1,38 +1,32 @@
 package main
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"os"
-	"runtime"
-	"runtime/debug"
 	"strings"
 
+	"github.com/mappu/miqt/qt6/mainthread"
+
 	qt "github.com/mappu/miqt/qt6"
 )
 
 const (
-	APPNAME      = "yvbolt"
+	APPNAME      = "QBolt"
-	HOMEPAGE_URL = "https://code.ivysaur.me/yvbolt"
+	HOMEPAGE_URL = "https://code.ivysaur.me/qbolt"
-
-	CO_INSERT        = qt.Yellow
-	CO_EDIT_IMPLICIT = qt.Green
-	CO_EDIT_EXPLICIT = qt.DarkGreen
-	CO_DELETE        = qt.Red
 )
 
 type App struct {
 	ui *MainWindowUi
 
+	contentTbl *tableState
+	resultsTbl *tableState
+
 	none *noLoadedDatabase
 
 	dbs_next int
 	dbs      map[int]loadedDatabase
-
-	isEditing  bool
-	updateRows map[int][]int // row => []column
-	insertRows map[int]struct{}
-	deleteRows map[int]struct{}
 }
 
 func newApp() *App {
@@ -42,12 +36,8 @@ func newApp() *App {
 	a.dbs_next = 0
 	a.dbs = make(map[int]loadedDatabase, 0)
 
-	a.isEditing = false
-	a.updateRows = make(map[int][]int, 0)
-	a.insertRows = make(map[int]struct{}, 0)
-	a.deleteRows = make(map[int]struct{}, 0)
-
 	a.ui = NewMainWindowUi()
+	a.ui.MainWindow.SetWindowTitle(APPNAME + " " + appVersion)
 
 	// Using stylesheet works better than picking a palette colour across all
 	// different QStyles
@@ -65,6 +55,8 @@ func newApp() *App {
 	a.ui.mnuDriverVersions.OnTriggered(a.OnMenuHelpVersion)
 	a.ui.mnuHelpAbout.OnTriggered(a.OnMnuHelpHomepage)
 
+	a.ui.actionCreate_Bolt_database_from_zip.OnTriggered(a.Bolt_ImportZipToDatabase_OnTriggered)
+
 	//
 
 	a.ui.Buckets.OnCurrentItemChanged(a.OnNavChange)
@@ -86,36 +78,33 @@ func newApp() *App {
 	//
 
 	a.ui.actionRefresh.OnTriggered(a.RefreshCurrentItem)
-	a.ui.actionAddRow.OnTriggered(a.OnDataInsertClick)
-	a.ui.actionDelete_row.OnTriggered(a.OnDataDeleteRowClick)
-	a.ui.actionApply_changes.OnTriggered(a.OnDataCommitClick)
 
 	a.ui.actionAbout_Qt.OnTriggered(func() {
 		qt.QMessageBox_AboutQt2(a.ui.MainWindow.QWidget, APPNAME)
 	})
 
-	// contentBox: set editable
+	a.contentTbl = NewTableState(a.ui.contentBox)
-	vcl_clear_grid(a.ui.contentBox)
+	a.contentTbl.OnEdited = func() {
-	a.ui.contentBox.SetHorizontalScrollMode(qt.QAbstractItemView__ScrollPerPixel)
+		a.ui.actionApply_changes.SetEnabled(a.contentTbl.AnyChanges())
-	a.ui.contentBox.SetVerticalScrollMode(qt.QAbstractItemView__ScrollPerPixel)
+	}
-	a.ui.contentBox.OnCellChanged(a.OnDataCellEdited)
+	a.ui.actionDelete_row.OnTriggered(func() {
+		a.contentTbl.DeleteSelectedRows()
+	})
+	a.ui.actionAddRow.OnTriggered(func() {
+		a.contentTbl.InsertNewRow()
+	})
+	a.ui.actionApply_changes.OnTriggered(a.OnDataCommitClick)
 
 	// a.ui.queryInput.OnTextChanged(a.OnQueryTextChanged) // apply syntax highlighting
 
 	a.ui.mnuExecute.OnTriggered(a.OnQueryExecute)
 
-	if runtime.GOOS == "windows" {
+	a.ui.queryInput.SetFont(vcl_monospace())
-		a.ui.queryInput.SetFontFamily("Consolas")
-	} else {
-		a.ui.queryInput.SetFontFamily("monospace")
-	}
 
-	vcl_clear_grid(a.ui.queryResult)
+	a.resultsTbl = NewTableState(a.ui.queryResult)
-	a.ui.queryResult.SetHorizontalScrollMode(qt.QAbstractItemView__ScrollPerPixel)
-	a.ui.queryResult.SetVerticalScrollMode(qt.QAbstractItemView__ScrollPerPixel)
 
 	a.none = &noLoadedDatabase{}
-	a.OnNavChange(nil, nil) // calls f.none.RenderForNav and sets up status bar content
+	a.refreshContent(nil) // calls f.none.RenderForNav and sets up status bar content
 
 	return a
 }
@@ -147,28 +136,15 @@ func (f *App) OnMnuHelpHomepage() {
 }
 
 func (f *App) OnMenuHelpVersion() {
+	connector := evLdbConnection{}
 
-	bi, ok := debug.ReadBuildInfo()
+	ld, name, err := connector.Connect(context.Background())
-	if !ok {
+	if err != nil {
+		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, err.Error())
 		return
 	}
 
-	info := "This version of " + APPNAME + " was compiled with:\n\n"
+	f.addTopLevelDatabaseConnection(ld, name)
-	for _, dep := range bi.Deps {
-
-		// Filter to only interesting things
-		switch dep.Path {
-		case `github.com/cockroachdb/pebble`,
-			`github.com/dgraph-io/badger/v4`,
-			`github.com/mattn/go-sqlite3`,
-			`github.com/redis/go-redis/v9`,
-			`go.etcd.io/bbolt`,
-			`modernc.org/sqlite`:
-			info += fmt.Sprintf("- %s %s\n", dep.Path, dep.Version)
-		}
-	}
-
-	qt.QMessageBox_About(f.ui.MainWindow.QWidget, APPNAME, info)
 }
 
 func (f *App) OnNavContextPopup(pos *qt.QPoint) {
@@ -236,18 +212,8 @@ func (f *App) RefreshCurrentItem() {
 		return // nothing to do
 	}
 
-	// If there were any edited rows, refreshing will lose them
-	// Prompt for confirmation first
-	// FIXME this should also trigger when changing selection on LHS nav??
-	if len(f.deleteRows) > 0 || len(f.updateRows) > 0 || len(f.deleteRows) > 0 {
-		ok := qt.QMessageBox_Warning2(f.ui.MainWindow.QWidget, APPNAME, "Your modifications have not been applied. Continue without applying?", qt.QMessageBox__Ok, qt.QMessageBox__Cancel)
-		if ok != int(qt.QMessageBox__Ok) {
-			return
-		}
-	}
-
 	f.OnNavContextRefresh(curItem)  // Refresh LHS pane/children
-	f.OnNavChange(curItem, curItem) // Refresh RHS pane/data content
+	f.OnNavChange(curItem, curItem) // Refresh RHS pane/data content and warn if unsaved changes
 }
 
 func (f *App) OnNavContextRefresh(item *qt.QTreeWidgetItem) {
@@ -272,101 +238,17 @@ func (f *App) OnNavContextRefresh(item *qt.QTreeWidgetItem) {
 	item.SetExpanded(isExpanded)
 }
 
-func (f *App) OnDataCellEdited(aRow, aCol int) {
-
-	if !f.isEditing {
-		return // current in full table refresh, this signal is not a true edit
-	}
-
-	// If this is an insert row, no need to patch updateRows
-	if _, ok := f.insertRows[aRow]; ok {
-		return // nothing to do
-	}
-
-	if chk, ok := f.updateRows[aRow]; ok {
-		if slice_contains(chk, aCol) {
-			return // nothing to do
-		} else {
-			chk = append(chk, aCol)
-			f.updateRows[aRow] = chk
-		}
-	} else {
-		f.updateRows[aRow] = []int{aCol}
-	}
-
-	// If this row was marked for deletion, this new edit takes priority
-	delete(f.deleteRows, aRow)
-
-	// Recolour the row
-
-	vcl_grid_set_row_colour(f.ui.contentBox, aRow, qt.NewQBrush4(CO_EDIT_IMPLICIT))
-
-	explicitColour := qt.NewQBrush4(CO_EDIT_EXPLICIT)
-	for _, explicitCol := range f.updateRows[aRow] {
-
-		// NOTICE: This triggers a cellChanged event because we are changing
-		// the cell's background colour. However the recursion is blocked by
-		// the above "nothing to do" check
-
-		cell := f.ui.contentBox.Item(aRow, explicitCol)
-		cell.SetBackground(explicitColour)
-	}
-
-	f.ui.actionApply_changes.SetEnabled(true) // There are currently some edits again
-}
-
-func (f *App) OnDataInsertClick() {
-	if !f.ui.contentBox.IsEnabled() {
-		return // Not an active data view
-	}
-
-	rpos := f.ui.contentBox.RowCount()
-	f.ui.contentBox.SetRowCount(rpos + 1)
-
-	f.insertRows[rpos] = struct{}{}
-
-	// Create the cells, so they're not nil when we try and set the bgcolor
-	colCt := f.ui.contentBox.ColumnCount()
-	for i := 0; i < colCt; i++ {
-		f.ui.contentBox.SetItem(rpos, i, qt.NewQTableWidgetItem())
-	}
-
-	// Repaint cells
-	vcl_grid_set_row_colour(f.ui.contentBox, rpos, qt.NewQBrush4(CO_INSERT))
-
-	// Scroll to bottom
-	f.ui.contentBox.ScrollToBottom()
-
-	f.ui.actionApply_changes.SetEnabled(true) // There are currently some edits again
-}
-
-func (f *App) OnDataDeleteRowClick() {
-	if !f.ui.contentBox.IsEnabled() {
-		return // Not an active data view
-	}
-
-	f.isEditing = false
-	defer func() {
-		f.isEditing = true
-	}()
-
-	rpos := f.ui.contentBox.CurrentRow()
-	f.deleteRows[rpos] = struct{}{}
-
-	// If this row was marked for edit, this takes priority
-	delete(f.updateRows, rpos)
-
-	// Repaint cells
-	vcl_grid_set_row_colour(f.ui.contentBox, rpos, qt.NewQBrush4(CO_DELETE))
-
-	f.ui.actionApply_changes.SetEnabled(true) // There are currently some edits again
-}
-
 func (f *App) OnDataCommitClick() {
 	if !f.ui.contentBox.IsEnabled() {
+		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, "Can't apply changes: editing is disabled")
 		return // Not an active data view
 	}
 
+	if !f.contentTbl.allowEdit {
+		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, "Can't apply changes: database is not editable")
+		return // ??? Shouldn't be able to reach this point
+	}
+
 	node := f.ui.Buckets.CurrentItem()
 	if node == nil {
 		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, "No database selected")
@@ -386,18 +268,19 @@ func (f *App) OnDataCommitClick() {
 		return
 	}
 
-	err = editableLd.ApplyChanges(f, bucketPath)
+	err = editableLd.ApplyChanges(f.contentTbl, bucketPath)
 	if err != nil {
 		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, err.Error())
+		// fallthrough to refresh
 	}
 
 	// Refresh content
-	f.OnNavChange(node, node) // Refresh RHS pane/data content
+	// This disables the 'apply changes' button again as there are no remaining edits
-
+	// Don't call onNavChange here because we don't want to warn about changes
-	f.ui.actionApply_changes.SetEnabled(false) // There are currently no edits again
+	f.refreshContent(node) // Refresh RHS pane/data content
 
 	// Preserve scroll position
-	// TODO
+	// (Happens automatically with QTableView)
 }
 
 func (f *App) OnNavContextClose() {
@@ -488,20 +371,71 @@ func (f *App) OnQueryExecute() {
 
 	ld := f.getLoadedDatabaseFor(node)
 
+	// bucketPath is only used for some databases, not for others
+	bucketPath, err := f.getBucketPathFor(node)
+	if err != nil {
+		panic(err) // shouldn't happen
+	}
+
 	queryableLd, ok := ld.(queryableLoadedDatabase)
 	if !ok {
 		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, "Unsupported action for this database")
 		return
 	}
 
-	err := queryableLd.ExecQuery(queryString, f.ui.queryResult)
+	f.resultsTbl.Wipeout()
+	err = queryableLd.ExecQuery(queryString, bucketPath, f.resultsTbl)
 	if err != nil {
 		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, err.Error())
 		return
 	}
 }
 
-func (f *App) OnNavChange(node *qt.QTreeWidgetItem, _ *qt.QTreeWidgetItem) {
+func (f *App) OnNavChange(node *qt.QTreeWidgetItem, prev *qt.QTreeWidgetItem) {
+
+	// If there are unsaved changes, we may want to block this change / switch
+	// back to the previous selection
+	// Prompt for confirmation first
+	if f.contentTbl.AnyChanges() {
+		ok := qt.QMessageBox_Warning2(f.ui.MainWindow.QWidget, APPNAME, "Your changes have not been saved.", qt.QMessageBox__Ok, qt.QMessageBox__Discard)
+		if ok != int(qt.QMessageBox__Discard) {
+
+			// We want to stop this change
+			if prev == nil {
+				return // that's enough
+			}
+
+			// We need to block recursive triggering
+			// First time, to update , but doesn't update selection stat
+			f.ui.Buckets.BlockSignals(true)
+			f.ui.Buckets.SetCurrentItem(prev) // Also sets selection
+			f.ui.Buckets.BlockSignals(false)
+
+			f.ui.Buckets.SetEnabled(false)
+
+			// On next event loop tick:
+			mainthread.Start(func() {
+
+				// Second time
+				// Since it's already set, won't trigger onNavChange
+				f.ui.Buckets.SetCurrentItem(prev)
+				f.ui.Buckets.SetEnabled(true)
+			})
+			return
+		}
+	}
+
+	if node != prev {
+		// Changing tables (not just refreshing the current table)
+		// Reset scroll position to top
+		f.ui.contentBox.ScrollToTop()
+	}
+
+	// OK, continue with change
+	f.refreshContent(node)
+}
+
+func (f *App) refreshContent(node *qt.QTreeWidgetItem) {
 
 	var ld loadedDatabase = f.none
 	var bucketPath []string = nil
@@ -515,15 +449,17 @@ func (f *App) OnNavChange(node *qt.QTreeWidgetItem, _ *qt.QTreeWidgetItem) {
 		}
 	}
 
-	// Reset some controls that the render function is expected to populate
-	f.insertRows = make(map[int]struct{})
-	f.updateRows = make(map[int][]int)
-	f.deleteRows = make(map[int]struct{})
-	f.isEditing = false
 	f.ui.propertiesBox.Clear()
-	vcl_clear_grid(f.ui.contentBox)
+	propertiesText, err := ld.Properties(bucketPath)
+	if err != nil {
+		f.ui.propertiesBox.SetPlainText("Error loading properties: " + err.Error())
+	} else {
+		f.ui.propertiesBox.SetPlainText(propertiesText)
+	}
 
-	err := ld.RenderForNav(f.ui, bucketPath) // Handover to the database type's own renderer function
+	// Load database content
+	f.contentTbl.Wipeout()
+	err = ld.RenderForNav(f.contentTbl, bucketPath) // Handover to the database type's own renderer function
 	if err != nil {
 		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, fmt.Sprintf("Loading contents of bucket %v: %s", bucketPath, err.Error()))
 
@@ -532,17 +468,19 @@ func (f *App) OnNavChange(node *qt.QTreeWidgetItem, _ *qt.QTreeWidgetItem) {
 	}
 
 	// Toggle the Edit functionality
-	_, ok := ld.(editableLoadedDatabase)
+	// Do this *after* RenderForNav as it disables editing by default.
-	f.ui.actionApply_changes.SetEnabled(false) // will be enabled after add/delete/edit
+	_, editable := ld.(editableLoadedDatabase)
-	f.ui.actionDelete_row.SetEnabled(ok)
+	editable = editable && f.contentTbl.IsReady() // if there was a failure loading, don't allow edit
-	f.ui.actionAddRow.SetEnabled(ok)
+	f.ui.actionApply_changes.SetEnabled(false)    // will be enabled after add/delete/edit
-	f.isEditing = ok
+	f.ui.actionDelete_row.SetEnabled(editable)
+	f.ui.actionAddRow.SetEnabled(editable)
+	f.contentTbl.SetAllowEditing(editable)
 
 	// Toggle the Query functionality
-	_, ok = ld.(queryableLoadedDatabase)
+	_, queryable := ld.(queryableLoadedDatabase)
-	f.ui.queryInput.SetEnabled(ok)
+	f.ui.queryInput.SetEnabled(queryable)
-	f.ui.queryResult.SetEnabled(ok)
+	f.ui.queryResult.SetEnabled(queryable)
-	f.ui.mnuExecute.SetEnabled(ok)
+	f.ui.mnuExecute.SetEnabled(queryable)
 
 	// We're in charge of common status bar text updates
 	// Find database displayname

mainwindow.go

@@ -10,41 +10,43 @@ import (
 )
 
 type MainWindowUi struct {
-	MainWindow              *qt.QMainWindow
+	MainWindow                          *qt.QMainWindow
-	centralwidget           *qt.QWidget
+	centralwidget                       *qt.QWidget
-	gridLayout              *qt.QGridLayout
+	gridLayout                          *qt.QGridLayout
-	splitter                *qt.QSplitter
+	splitter                            *qt.QSplitter
-	Buckets                 *qt.QTreeWidget
+	Buckets                             *qt.QTreeWidget
-	tabWidget               *qt.QTabWidget
+	tabWidget                           *qt.QTabWidget
-	tabProperties           *qt.QWidget
+	tabProperties                       *qt.QWidget
-	gridLayout_2            *qt.QGridLayout
+	gridLayout_2                        *qt.QGridLayout
-	propertiesBox           *qt.QTextEdit
+	propertiesBox                       *qt.QTextEdit
-	tabData                 *qt.QWidget
+	tabData                             *qt.QWidget
-	verticalLayout          *qt.QVBoxLayout
+	verticalLayout                      *qt.QVBoxLayout
-	contentBox              *qt.QTableWidget
+	contentBox                          *qt.QTableView
-	tabQuery                *qt.QWidget
+	tabQuery                            *qt.QWidget
-	verticalLayout_2        *qt.QVBoxLayout
+	verticalLayout_2                    *qt.QVBoxLayout
-	splitter_2              *qt.QSplitter
+	splitter_2                          *qt.QSplitter
-	queryInput              *qt.QTextEdit
+	queryInput                          *qt.QPlainTextEdit
-	queryResult             *qt.QTableWidget
+	queryResult                         *qt.QTableView
-	menubar                 *qt.QMenuBar
+	menubar                             *qt.QMenuBar
-	menu_File               *qt.QMenu
+	menu_File                           *qt.QMenu
-	menu_Query              *qt.QMenu
+	menu_Query                          *qt.QMenu
-	menu_Help               *qt.QMenu
+	menu_Help                           *qt.QMenu
-	menu_Data               *qt.QMenu
+	menu_Data                           *qt.QMenu
-	statusbar               *qt.QStatusBar
+	menu_Tools                          *qt.QMenu
-	toolBar                 *qt.QToolBar
+	statusbar                           *qt.QStatusBar
-	actionE_xit             *qt.QAction
+	toolBar                             *qt.QToolBar
-	mnuExecute              *qt.QAction
+	actionE_xit                         *qt.QAction
-	mnuDriverVersions       *qt.QAction
+	mnuExecute                          *qt.QAction
-	mnuHelpAbout            *qt.QAction
+	mnuDriverVersions                   *qt.QAction
-	actionConnect           *qt.QAction
+	mnuHelpAbout                        *qt.QAction
-	actionRefresh           *qt.QAction
+	actionConnect                       *qt.QAction
-	actionAbout_Qt          *qt.QAction
+	actionRefresh                       *qt.QAction
-	actionAddRow            *qt.QAction
+	actionAbout_Qt                      *qt.QAction
-	actionDelete_row        *qt.QAction
+	actionAddRow                        *qt.QAction
-	actionApply_changes     *qt.QAction
+	actionDelete_row                    *qt.QAction
-	actionConnectionManager *qt.QAction
+	actionApply_changes                 *qt.QAction
+	actionConnectionManager             *qt.QAction
+	actionCreate_Bolt_database_from_zip *qt.QAction
 }
 
 // NewMainWindowUi creates all Qt widget classes for MainWindow.
@@ -137,6 +139,13 @@ func NewMainWindowUi() *MainWindowUi {
 	icon9.AddFile4(":/assets/database_key.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
 	ui.actionConnectionManager.SetIcon(icon9)
 	/* miqt-uic: no handler for QAction property 'menuRole' */
+	ui.actionCreate_Bolt_database_from_zip = qt.NewQAction()
+	actionCreate_Bolt_database_from_zip__objectName := qt.NewQAnyStringView3("actionCreate_Bolt_database_from_zip")
+	ui.actionCreate_Bolt_database_from_zip.SetObjectName(*actionCreate_Bolt_database_from_zip__objectName)
+	actionCreate_Bolt_database_from_zip__objectName.Delete() // setter copied value
+	icon10 := qt.NewQIcon()
+	icon10.AddFile4(":/assets/compress.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	ui.actionCreate_Bolt_database_from_zip.SetIcon(icon10)
 	ui.centralwidget = qt.NewQWidget(ui.MainWindow.QWidget)
 	centralwidget__objectName := qt.NewQAnyStringView3("centralwidget")
 	ui.centralwidget.SetObjectName(*centralwidget__objectName)
@@ -192,9 +201,9 @@ func NewMainWindowUi() *MainWindowUi {
 	ui.propertiesBox.SetReadOnly(true)
 
 	ui.gridLayout_2.AddWidget2(ui.propertiesBox.QWidget, 0, 0)
-	icon10 := qt.NewQIcon()
+	icon11 := qt.NewQIcon()
-	icon10.AddFile4(":/assets/chart_bar.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	icon11.AddFile4(":/assets/chart_bar.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.tabWidget.AddTab2(ui.tabProperties, icon10, "")
+	ui.tabWidget.AddTab2(ui.tabProperties, icon11, "")
 	ui.tabData = qt.NewQWidget(ui.tabWidget.QWidget)
 	tabData__objectName := qt.NewQAnyStringView3("tabData")
 	ui.tabData.SetObjectName(*tabData__objectName)
@@ -205,7 +214,7 @@ func NewMainWindowUi() *MainWindowUi {
 	verticalLayout__objectName.Delete() // setter copied value
 	ui.verticalLayout.SetContentsMargins(11, 11, 11, 11)
 	ui.verticalLayout.SetSpacing(6)
-	ui.contentBox = qt.NewQTableWidget(ui.tabData)
+	ui.contentBox = qt.NewQTableView(ui.tabData)
 	contentBox__objectName := qt.NewQAnyStringView3("contentBox")
 	ui.contentBox.SetObjectName(*contentBox__objectName)
 	contentBox__objectName.Delete() // setter copied value
@@ -213,9 +222,9 @@ func NewMainWindowUi() *MainWindowUi {
 	ui.contentBox.SetHorizontalScrollMode(qt.QAbstractItemView__ScrollPerPixel)
 
 	ui.verticalLayout.AddWidget(ui.contentBox.QWidget)
-	icon11 := qt.NewQIcon()
+	icon12 := qt.NewQIcon()
-	icon11.AddFile4(":/assets/table.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	icon12.AddFile4(":/assets/table.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.tabWidget.AddTab2(ui.tabData, icon11, "")
+	ui.tabWidget.AddTab2(ui.tabData, icon12, "")
 	ui.tabQuery = qt.NewQWidget(ui.tabWidget.QWidget)
 	tabQuery__objectName := qt.NewQAnyStringView3("tabQuery")
 	ui.tabQuery.SetObjectName(*tabQuery__objectName)
@@ -232,13 +241,13 @@ func NewMainWindowUi() *MainWindowUi {
 	splitter_2__objectName.Delete() // setter copied value
 	ui.splitter_2.SetOrientation(qt.Vertical)
 	ui.splitter_2.SetChildrenCollapsible(false)
-	ui.queryInput = qt.NewQTextEdit(ui.splitter_2.QWidget)
+	ui.queryInput = qt.NewQPlainTextEdit(ui.splitter_2.QWidget)
 	queryInput__objectName := qt.NewQAnyStringView3("queryInput")
 	ui.queryInput.SetObjectName(*queryInput__objectName)
 	queryInput__objectName.Delete() // setter copied value
 	/* miqt-uic: no handler for queryInput property 'font' */
 	ui.splitter_2.AddWidget(ui.queryInput.QWidget)
-	ui.queryResult = qt.NewQTableWidget(ui.splitter_2.QWidget)
+	ui.queryResult = qt.NewQTableView(ui.splitter_2.QWidget)
 	queryResult__objectName := qt.NewQAnyStringView3("queryResult")
 	ui.queryResult.SetObjectName(*queryResult__objectName)
 	queryResult__objectName.Delete() // setter copied value
@@ -247,9 +256,9 @@ func NewMainWindowUi() *MainWindowUi {
 	ui.splitter_2.AddWidget(ui.queryResult.QWidget)
 
 	ui.verticalLayout_2.AddWidget(ui.splitter_2.QWidget)
-	icon12 := qt.NewQIcon()
+	icon13 := qt.NewQIcon()
-	icon12.AddFile4(":/assets/lightning.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	icon13.AddFile4(":/assets/lightning.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.tabWidget.AddTab2(ui.tabQuery, icon12, "")
+	ui.tabWidget.AddTab2(ui.tabQuery, icon13, "")
 	ui.splitter.AddWidget(ui.tabWidget.QWidget)
 
 	ui.gridLayout.AddWidget2(ui.splitter.QWidget, 0, 0)
@@ -289,9 +298,15 @@ func NewMainWindowUi() *MainWindowUi {
 	ui.menu_Data.QWidget.AddAction(ui.actionAddRow)
 	ui.menu_Data.QWidget.AddAction(ui.actionDelete_row)
 	ui.menu_Data.QWidget.AddAction(ui.actionApply_changes)
+	ui.menu_Tools = qt.NewQMenu(ui.menubar.QWidget)
+	menu_Tools__objectName := qt.NewQAnyStringView3("menu_Tools")
+	ui.menu_Tools.SetObjectName(*menu_Tools__objectName)
+	menu_Tools__objectName.Delete() // setter copied value
+	ui.menu_Tools.QWidget.AddAction(ui.actionCreate_Bolt_database_from_zip)
 	ui.menubar.AddMenu(ui.menu_File)
 	ui.menubar.AddMenu(ui.menu_Data)
 	ui.menubar.AddMenu(ui.menu_Query)
+	ui.menubar.AddMenu(ui.menu_Tools)
 	ui.menubar.AddMenu(ui.menu_Help)
 	ui.MainWindow.SetMenuBar(ui.menubar)
 	ui.statusbar = qt.NewQStatusBar(ui.MainWindow.QWidget)
@@ -326,12 +341,13 @@ func NewMainWindowUi() *MainWindowUi {
 
 // Retranslate reapplies all text translations.
 func (ui *MainWindowUi) Retranslate() {
-	ui.MainWindow.SetWindowTitle(qt.QCoreApplication_Tr("yvbolt"))
+	ui.MainWindow.SetWindowTitle(qt.QCoreApplication_Tr("QBolt"))
 	ui.actionE_xit.SetText(qt.QMainWindow_Tr("E&xit"))
 	ui.mnuExecute.SetText(qt.QMainWindow_Tr("E&xecute"))
 	ui.mnuExecute.SetShortcut(qt.NewQKeySequence2(qt.QMainWindow_Tr("F9")))
 	ui.mnuDriverVersions.SetText(qt.QMainWindow_Tr("Driver versions..."))
-	ui.mnuHelpAbout.SetText(qt.QMainWindow_Tr("&About yvbolt"))
+	ui.mnuHelpAbout.SetText(qt.QMainWindow_Tr("&About QBolt"))
+	ui.mnuHelpAbout.SetToolTip(qt.QMainWindow_Tr("About QBolt"))
 	ui.mnuHelpAbout.SetShortcut(qt.NewQKeySequence2(qt.QMainWindow_Tr("F1")))
 	ui.actionConnect.SetText(qt.QMainWindow_Tr("Connect..."))
 	ui.actionConnect.SetShortcut(qt.NewQKeySequence2(qt.QMainWindow_Tr("Ctrl+O")))
@@ -344,6 +360,7 @@ func (ui *MainWindowUi) Retranslate() {
 	ui.actionApply_changes.SetText(qt.QMainWindow_Tr("Apply changes"))
 	ui.actionConnectionManager.SetText(qt.QMainWindow_Tr("Connection Manager"))
 	ui.actionConnectionManager.SetToolTip(qt.QMainWindow_Tr("Connection Manager"))
+	ui.actionCreate_Bolt_database_from_zip.SetText(qt.QMainWindow_Tr("Create Bolt database from zip"))
 	ui.tabWidget.SetTabText(ui.tabWidget.IndexOf(ui.tabProperties), qt.QTabWidget_Tr("Properties"))
 	ui.tabWidget.SetTabText(ui.tabWidget.IndexOf(ui.tabData), qt.QTabWidget_Tr("Data"))
 	ui.tabWidget.SetTabText(ui.tabWidget.IndexOf(ui.tabQuery), qt.QTabWidget_Tr("Query"))
@@ -351,5 +368,6 @@ func (ui *MainWindowUi) Retranslate() {
 	ui.menu_Query.SetTitle(qt.QMenuBar_Tr("&Query"))
 	ui.menu_Help.SetTitle(qt.QMenuBar_Tr("&Help"))
 	ui.menu_Data.SetTitle(qt.QMenuBar_Tr("&Data"))
+	ui.menu_Tools.SetTitle(qt.QMenuBar_Tr("&Tools"))
 	ui.toolBar.SetWindowTitle(qt.QMainWindow_Tr("toolBar"))
 }

mainwindow.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>yvbolt</string>
+   <string>QBolt</string>
   </property>
   <property name="windowIcon">
    <iconset resource="embed.qrc">
@@ -84,7 +84,7 @@
         </attribute>
         <layout class="QVBoxLayout" name="verticalLayout">
          <item>
-          <widget class="QTableWidget" name="contentBox">
+          <widget class="QTableView" name="contentBox">
            <property name="verticalScrollMode">
             <enum>QAbstractItemView::ScrollMode::ScrollPerPixel</enum>
            </property>
@@ -112,14 +112,14 @@
            <property name="childrenCollapsible">
             <bool>false</bool>
            </property>
-           <widget class="QTextEdit" name="queryInput">
+           <widget class="QPlainTextEdit" name="queryInput">
             <property name="font">
              <font>
               <family>Monospace</family>
              </font>
             </property>
            </widget>
-           <widget class="QTableWidget" name="queryResult">
+           <widget class="QTableView" name="queryResult">
             <property name="verticalScrollMode">
              <enum>QAbstractItemView::ScrollMode::ScrollPerPixel</enum>
             </property>
@@ -179,9 +179,16 @@
     <addaction name="actionDelete_row"/>
     <addaction name="actionApply_changes"/>
    </widget>
+   <widget class="QMenu" name="menu_Tools">
+    <property name="title">
+     <string>&amp;Tools</string>
+    </property>
+    <addaction name="actionCreate_Bolt_database_from_zip"/>
+   </widget>
    <addaction name="menu_File"/>
    <addaction name="menu_Data"/>
    <addaction name="menu_Query"/>
+   <addaction name="menu_Tools"/>
    <addaction name="menu_Help"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
@@ -245,7 +252,10 @@
      <normaloff>:/assets/help.png</normaloff>:/assets/help.png</iconset>
    </property>
    <property name="text">
-    <string>&amp;About yvbolt</string>
+    <string>&amp;About QBolt</string>
+   </property>
+   <property name="toolTip">
+    <string>About QBolt</string>
    </property>
    <property name="shortcut">
     <string>F1</string>
@@ -347,6 +357,15 @@
     <enum>QAction::MenuRole::NoRole</enum>
    </property>
   </action>
+  <action name="actionCreate_Bolt_database_from_zip">
+   <property name="icon">
+    <iconset resource="embed.qrc">
+     <normaloff>:/assets/compress.png</normaloff>:/assets/compress.png</iconset>
+   </property>
+   <property name="text">
+    <string>Create Bolt database from zip</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="embed.qrc"/>

sqliteclidriver/event.go

@@ -0,0 +1,94 @@
+package sqliteclidriver
+
+import (
+	"io"
+	"sync"
+)
+
+const (
+	evtypeStdout int = iota
+	evtypeStderr
+	evtypeExit
+)
+
+type processEvent struct {
+	evtype int
+	data   []byte
+	err    error
+}
+
+func (pe processEvent) Error() string {
+	if pe.err != nil {
+		return pe.err.Error()
+	}
+
+	if pe.evtype == evtypeStderr {
+		return string(pe.data)
+	}
+
+	return "<no error>"
+}
+
+func (pe processEvent) Unwrap() error {
+	return pe.err
+}
+
+//
+
+func handleEvents(pw io.WriteCloser, pr, pe io.Reader, waiter func() error) (<-chan processEvent, io.WriteCloser, error) {
+
+	chEvents := make(chan processEvent, 0)
+
+	var wg sync.WaitGroup
+
+	go func() {
+		defer wg.Done()
+		processEventWorker(pr, evtypeStdout, chEvents)
+	}()
+
+	go func() {
+		defer wg.Done()
+		processEventWorker(pe, evtypeStderr, chEvents)
+	}()
+	wg.Add(2)
+
+	go func() {
+		// Only call cmd.Wait() after pipes are closed
+		wg.Wait()
+
+		err := waiter()
+		chEvents <- processEvent{
+			evtype: evtypeExit,
+			err:    err,
+		}
+
+		close(chEvents)
+	}()
+
+	return chEvents, pw, nil
+}
+
+func processEventWorker(p io.Reader, evtype int, dest chan<- processEvent) {
+	for {
+		buf := make([]byte, 1024)
+		n, err := p.Read(buf)
+
+		if n > 0 {
+			dest <- processEvent{
+				evtype: evtype,
+				data:   buf[0:n],
+			}
+		}
+
+		if err != nil {
+			dest <- processEvent{
+				evtype: evtype,
+				err:    err,
+			}
+
+			// Assume all errors are permanent
+			// Ordering can produce either io.EOF, ErrClosedPipe, or PathError{"file already closed"}
+			return
+		}
+	}
+}

sqliteclidriver/eventcmd.go

@@ -3,40 +3,15 @@ package sqliteclidriver
 import (
 	"io"
 	"os/exec"
-	"sync"
 )
 
-const (
+func LocalBinEvents(databasePath string) (<-chan processEvent, io.WriteCloser, error) {
-	evtypeStdout int = iota
+	// TODO find a way to strictly separate parameters and paths (`--` is not supported here)
-	evtypeStderr
+	cmd := exec.Command(`/usr/bin/sqlite3`, `-noheader`, `-json`, databasePath)
-	evtypeExit
+	return execEvents(cmd)
-)
-
-type processEvent struct {
-	evtype int
-	data   []byte
-	err    error
 }
 
-func (pe processEvent) Error() string {
+func execEvents(cmd *exec.Cmd) (<-chan processEvent, io.WriteCloser, error) {
-	if pe.err != nil {
-		return pe.err.Error()
-	}
-
-	if pe.evtype == evtypeStderr {
-		return string(pe.data)
-	}
-
-	return "<no error>"
-}
-
-func (pe processEvent) Unwrap() error {
-	return pe.err
-}
-
-//
-
-func ExecEvents(cmd *exec.Cmd) (<-chan processEvent, io.WriteCloser, error) {
 
 	pw, err := cmd.StdinPipe()
 	if err != nil {
@@ -58,58 +33,5 @@ func ExecEvents(cmd *exec.Cmd) (<-chan processEvent, io.WriteCloser, error) {
 		return nil, nil, err
 	}
 
-	chEvents := make(chan processEvent, 0)
+	return handleEvents(pw, pr, pe, cmd.Wait)
-
-	var wg sync.WaitGroup
-
-	go func() {
-		defer wg.Done()
-		processEventWorker(pr, evtypeStdout, chEvents)
-	}()
-
-	go func() {
-		defer wg.Done()
-		processEventWorker(pe, evtypeStderr, chEvents)
-	}()
-	wg.Add(2)
-
-	go func() {
-		// Only call cmd.Wait() after pipes are closed
-		wg.Wait()
-
-		err = cmd.Wait()
-		chEvents <- processEvent{
-			evtype: evtypeExit,
-			err:    err,
-		}
-
-		close(chEvents)
-	}()
-
-	return chEvents, pw, nil
-}
-
-func processEventWorker(p io.Reader, evtype int, dest chan<- processEvent) {
-	for {
-		buf := make([]byte, 1024)
-		n, err := p.Read(buf)
-
-		if n > 0 {
-			dest <- processEvent{
-				evtype: evtype,
-				data:   buf[0:n],
-			}
-		}
-
-		if err != nil {
-			dest <- processEvent{
-				evtype: evtype,
-				err:    err,
-			}
-
-			// Assume all errors are permanent
-			// Ordering can produce either io.EOF, ErrClosedPipe, or PathError{"file already closed"}
-			return
-		}
-	}
 }

sqliteclidriver/eventcmd_test.go

@@ -13,7 +13,7 @@ import (
 func TestEventCmd(t *testing.T) {
 	cmd := exec.Command("/bin/bash", "-c", `echo "hello world"`)
 
-	ch, _, err := ExecEvents(cmd)
+	ch, _, err := execEvents(cmd)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -36,7 +36,7 @@ func TestEventCmd(t *testing.T) {
 func TestEventCmdStdin(t *testing.T) {
 	cmd := exec.Command("/usr/bin/tr", "a-z", "A-Z")
 
-	ch, pw, err := ExecEvents(cmd)
+	ch, pw, err := execEvents(cmd)
 	if err != nil {
 		t.Fatal(err)
 	}

sqliteclidriver/eventssh.go

@@ -0,0 +1,94 @@
+package sqliteclidriver
+
+import (
+	"context"
+	"database/sql"
+	"database/sql/driver"
+	"fmt"
+	"io"
+	"strconv"
+
+	"golang.org/x/crypto/ssh"
+)
+
+func SSHEvents(cl *ssh.Client, databasePath string) (<-chan processEvent, io.WriteCloser, error) {
+	// Client must have already been Dial()'ed
+
+	ses, err := cl.NewSession()
+	if err != nil {
+		return nil, nil, fmt.Errorf("NewSession: %w", err)
+	}
+
+	pw, err := ses.StdinPipe()
+	if err != nil {
+		return nil, nil, fmt.Errorf("StdinPipe: %w", err)
+	}
+
+	pr, err := ses.StdoutPipe()
+	if err != nil {
+		return nil, nil, fmt.Errorf("StdoutPipe: %w", err)
+	}
+
+	pe, err := ses.StderrPipe()
+	if err != nil {
+		return nil, nil, fmt.Errorf("StderrPipe: %w", err)
+	}
+
+	// FIXME use accurate Bash escaping
+	// TODO find a way to strictly separate parameters and paths (`--` is not supported here)
+	ses.Start(`/usr/bin/sqlite3 -noheader -json "` + strconv.Quote(databasePath) + `"`)
+
+	return handleEvents(pw, pr, pe, ses.Wait)
+}
+
+//
+
+type sshDriver struct {
+	cl *ssh.Client
+}
+
+func (d *sshDriver) Open(connectionString string) (driver.Conn, error) {
+	// TODO support custom binpath from our connection string
+	chEvents, pw, err := SSHEvents(d.cl, connectionString)
+	if err != nil {
+		return nil, err
+	}
+
+	return &SCConn{
+		listen: chEvents,
+		w:      pw,
+	}, nil
+}
+
+var _ driver.Driver = &sshDriver{} // interface assertion
+
+//
+
+type sshConnector struct {
+	connectionString string
+	driver           *sshDriver
+}
+
+func (c *sshConnector) Connect(context.Context) (driver.Conn, error) {
+	// FIXME support context
+	return c.driver.Open(c.connectionString)
+}
+
+func (c *sshConnector) Driver() driver.Driver {
+	return c.driver
+}
+
+var _ driver.Connector = &sshConnector{} // interface assertion
+
+//
+
+// OpenSSH opens an sql.DB connection over SSH using the supplied ssh.Client
+// object.
+func OpenSSH(cl *ssh.Client, databasePath string) *sql.DB {
+	return sql.OpenDB(&sshConnector{
+		connectionString: databasePath,
+		driver: &sshDriver{
+			cl: cl,
+		},
+	})
+}

sqliteclidriver/sqliteclidriver.go

@@ -21,25 +21,25 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"os/exec"
 
-	"yvbolt/lexer"
+	"qbolt/lexer"
 
 	"github.com/google/uuid"
 )
 
+const DriverName = `sqliteclidriver`
+
 var ErrNotSupported = errors.New("Not supported")
 
 //
 
+// SCDriver is a thing that can open connections to the database for a given
+// connection string. It has no particular state.
 type SCDriver struct{}
 
 func (d *SCDriver) Open(connectionString string) (driver.Conn, error) {
 	// TODO support custom binpath from our connection string
-
+	chEvents, pw, err := LocalBinEvents(connectionString)
-	cmd := exec.Command(`/usr/bin/sqlite3`, `-noheader`, `-json`, connectionString) // n.b. doesn't support `--`
-
-	chEvents, pw, err := ExecEvents(cmd)
 	if err != nil {
 		return nil, err
 	}
@@ -53,17 +53,21 @@ func (d *SCDriver) Open(connectionString string) (driver.Conn, error) {
 var _ driver.Driver = &SCDriver{} // interface assertion
 
 func init() {
-	sql.Register("sqliteclidriver", &SCDriver{})
+	sql.Register(DriverName, &SCDriver{})
 }
 
 //
 
+// SCConnector is a container holding a driver and connection string together.
+// It is the result of parsing a sql.Open(driverName, connectionString) call
+// and has not parsed anything.
 type SCConnector struct {
 	connectionString string
 	driver           *SCDriver
 }
 
 func (c *SCConnector) Connect(context.Context) (driver.Conn, error) {
+	// FIXME support context
 	return c.driver.Open(c.connectionString)
 }
 
@@ -75,6 +79,7 @@ var _ driver.Connector = &SCConnector{} // interface assertion
 
 //
 
+// SCConn represents a single, active, open, connection to the database.
 type SCConn struct {
 	listen <-chan processEvent
 	w      io.WriteCloser
@@ -136,7 +141,7 @@ func (s *SCStmt) buildQuery(args []driver.Value) ([]byte, error) {
 
 	// Embed query params
 	// WARNING: Not secure against injection? That's not a security boundary
-	// for the purposes of yvbolt, but maybe for other package users
+	// for the purposes of qbolt, but maybe for other package users
 
 	var querybuilder bytes.Buffer
 

sshTunnel.go

@@ -5,10 +5,12 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"path/filepath"
 
 	"github.com/mappu/autoconfig"
 	qt "github.com/mappu/miqt/qt6"
 	"golang.org/x/crypto/ssh"
+	"golang.org/x/crypto/ssh/knownhosts"
 )
 
 type SSHTunnel struct {
@@ -19,20 +21,49 @@ type SSHTunnel struct {
 		Type     autoconfig.OneOf
 		Password *struct {
 			Password autoconfig.Password
-		}
+		} `yicon:":/assets/key.png" json:",omitempty"`
 		PrivateKeyExternal *struct {
 			PrivateKeyFile         autoconfig.ExistingFile `ylabel:"Private Key"`
 			PrivateKeyFilePassword autoconfig.Password     `ylabel:"Password (optional)"`
-		} `ylabel:"Private key (External)"`
+		} `ylabel:"Private key (External)" yicon:":/assets/page_key.png" json:",omitempty"`
 		PrivateKeyInternal *struct {
 			PrivateKeyContent         autoconfig.MultiLineString `ylabel:"Private Key"`
 			PrivateKeyContentPassword autoconfig.Password        `ylabel:"Password (optional)"`
-		} `ylabel:"Private key (Internal)"`
+		} `ylabel:"Private key (Internal)" yicon:":/assets/page_key.png" json:",omitempty"`
+		SSHAgent *sshAgentConn `ylabel:"SSH Agent" yicon:":/assets/vendor_ssh.png" json:",omitempty"`
+	}
+	H2               autoconfig.Header `ylabel:"Server host key:" json:",omitempty"`
+	HostVerification struct {
+		Type                   autoconfig.OneOf
+		InsecureSkipVerify     *struct{} `json:",omitempty"`
+		ExternalKnownHostsFile *struct {
+			Path autoconfig.ExistingFile
+		} `json:",omitempty"`
 	}
 }
 
 func (s *SSHTunnel) Reset() { // Used by autoconfig package when creating a new value
 	s.Server.Port = 22
+
+	if sshAuthSock := os.Getenv("SSH_AUTH_SOCK"); sshAuthSock != "" {
+		s.Auth.Type = "SSHAgent"
+		s.Auth.SSHAgent = &sshAgentConn{}
+		s.Auth.SSHAgent.Reset()
+	}
+
+	if homeDir, err := os.UserHomeDir(); err == nil {
+		defaultKnownHostsFile := filepath.Join(homeDir, `.ssh`, `known_hosts`)
+		if _, err := os.Stat(defaultKnownHostsFile); err == nil {
+			s.HostVerification.Type = "ExternalKnownHostsFile"
+			alloc_inplace(&s.HostVerification.ExternalKnownHostsFile)
+			s.HostVerification.ExternalKnownHostsFile.Path = autoconfig.ExistingFile(defaultKnownHostsFile)
+		}
+	}
+
+	if s.HostVerification.Type == "" {
+		s.HostVerification.Type = "InsecureSkipVerify"
+		alloc_inplace(&s.HostVerification.InsecureSkipVerify)
+	}
 }
 
 func (s *SSHTunnel) String() string {
@@ -56,8 +87,7 @@ func (s SSHTunnel) Open(ctx context.Context) (*ssh.Client, error) {
 
 			return nil
 		},
-		HostKeyCallback: ssh.InsecureIgnoreHostKey(), // FIXME
+		User: s.Username,
-		User:            s.Username,
 	}
 
 	if s.Auth.Password != nil {
@@ -86,8 +116,40 @@ func (s SSHTunnel) Open(ctx context.Context) (*ssh.Client, error) {
 			return nil, fmt.Errorf("Parsing private key: %w", err)
 		}
 		cfg.Auth = append(cfg.Auth, ssh.PublicKeys(signer))
+
+	} else if s.Auth.SSHAgent != nil {
+		sa, err := s.Auth.SSHAgent.getAgent()
+		if err != nil {
+			return nil, fmt.Errorf("Connecting to SSH agent: %w", err)
+		}
+
+		cfg.Auth = append(cfg.Auth, ssh.PublicKeysCallback(sa.Signers))
+
+	} else {
+		return nil, fmt.Errorf("Unsupported value %q for Auth", s.Auth.Type)
+
 	}
 
+	//
+
+	if s.HostVerification.Type == "" || s.HostVerification.InsecureSkipVerify != nil {
+		cfg.HostKeyCallback = ssh.InsecureIgnoreHostKey()
+
+	} else if s.HostVerification.ExternalKnownHostsFile != nil {
+		cb, err := knownhosts.New(string(s.HostVerification.ExternalKnownHostsFile.Path))
+		if err != nil {
+			return nil, fmt.Errorf("Parsing known_hosts file %q: %w")
+		}
+
+		cfg.HostKeyCallback = cb
+
+	} else {
+		return nil, fmt.Errorf("Unsupported value %q for HostVerification", s.HostVerification.Type)
+
+	}
+
+	//
+
 	// TODO DialContext
 	// Use wrapper from https://github.com/golang/go/issues/20288
 	return ssh.Dial("tcp", fmt.Sprintf("%s:%d", s.Server.Address, s.Server.Port), &cfg)

table.go

@@ -0,0 +1,425 @@
+package main
+
+import (
+	qt "github.com/mappu/miqt/qt6"
+)
+
+type TableColumn interface {
+	SetRowCount(newlen int)
+	SetCell(aRow int, data any)
+	Display(aRow int) *qt.QVariant
+	Inspect(parent *qt.QWidget, aRow int)
+	ApplySimpleChange(aRow int, data *qt.QVariant)
+	SimpleEditData(aRow int) *qt.QVariant
+	IndicateBlue() bool
+}
+
+const (
+	CO_INSERT        = qt.Yellow
+	CO_EDIT_IMPLICIT = qt.Green
+	CO_EDIT_EXPLICIT = qt.DarkGreen
+	CO_DELETE        = qt.Red
+	CO_OBJECT        = qt.Blue
+)
+
+type columnType int
+
+const (
+	columnType_invalid columnType = iota
+	columnType_inlineText
+	columnType_bsonDoc
+	columnType_popupData
+	// TODO add a column type for map[string]string that can show content in a mini popup?? (Useful for redis + secretsvc)
+)
+
+type tableState struct {
+	rowCount     int
+	columns      []TableColumn
+	columnLabels []string
+
+	primaryKeys [][]byte
+
+	allowEdit  bool
+	updateRows map[int][]int // row => []column
+	insertRows map[int]struct{}
+	deleteRows map[int]struct{}
+	OnEdited   func()
+
+	model *qt.QAbstractTableModel
+	tbl   *qt.QTableView
+
+	dg_normal, dg_bson, dg_binary *qt.QAbstractItemDelegate
+}
+
+// SetupColumns resets the table's content.
+// It preserves the OnEdited callback
+func (ts *tableState) SetupColumns(columns []columnType, labels []string) {
+
+	if ts.tbl.IsEnabled() {
+		ts.tbl.SetEnabled(false)
+		ts.model.BeginResetModel()
+	}
+
+	ts.columns = make([]TableColumn, len(columns))
+	ts.columnLabels = labels
+
+	ts.SetAllowEditing(false)
+	ts.updateRows = make(map[int][]int, 0)
+	ts.insertRows = make(map[int]struct{}, 0)
+	ts.deleteRows = make(map[int]struct{}, 0)
+	ts.primaryKeys = nil
+
+	for aCol, ctype := range columns {
+		switch ctype {
+		case columnType_inlineText:
+
+			ts.columns[aCol] = &stringColumn{}
+
+			// Reset renderer to something like the default Qt one
+			// Persist the delegate for the lifetime of this tableState - the
+			// QTableView does not take ownership of a supplied delegate(??)
+			// TODO is that true? Then why are we passing in the parent?
+			if ts.dg_normal == nil {
+				ts.dg_normal = qt.NewQStyledItemDelegate2(ts.tbl.QObject).QAbstractItemDelegate
+			}
+			ts.tbl.SetItemDelegateForColumn(aCol, ts.dg_normal)
+
+		case columnType_popupData:
+			ts.columns[aCol] = &binColumn{}
+
+			if ts.dg_binary == nil {
+				ts.dg_binary = table_makeBinaryItemDelegate(ts, ts.tbl.QObject)
+			}
+			ts.tbl.SetItemDelegateForColumn(aCol, ts.dg_binary)
+
+		case columnType_bsonDoc:
+			ts.columns[aCol] = &bsonColumn{}
+
+			if ts.dg_bson == nil {
+				ts.dg_bson = table_makeBsonItemDelegate(ts, ts.tbl.QObject)
+			}
+			ts.tbl.SetItemDelegateForColumn(aCol, ts.dg_bson)
+
+		default:
+			panic("bad columnType")
+		}
+	}
+
+	ts.SetRowCount(0) // populate slices
+
+}
+
+func (ts *tableState) SetAllowEditing(allow bool) {
+	ts.allowEdit = allow
+	if allow {
+		ts.tbl.SetEditTriggers(qt.QAbstractItemView__DoubleClicked | qt.QAbstractItemView__EditKeyPressed)
+	} else {
+		ts.tbl.SetEditTriggers(qt.QAbstractItemView__NoEditTriggers)
+	}
+}
+
+func (ts *tableState) AnyChanges() bool {
+	return len(ts.insertRows) > 0 || len(ts.updateRows) > 0 || len(ts.deleteRows) > 0
+}
+
+// AddRow inserts a new row.
+// It's assumed to be initial data. For user-modified data, use InsertNewRow.
+func (ts *tableState) AddRow() int {
+	newRowId := ts.rowCount
+	ts.SetRowCount(ts.rowCount + 1)
+	return newRowId
+}
+
+// AddRowData inserts a new row.
+// It's assumed to be initial data. For user-modified data, use InsertNewRow.
+func (ts *tableState) AddRowData(cells ...any) {
+	aRow := ts.AddRow()
+	for aCol, cellData := range cells {
+		ts.SetCell(aRow, aCol, cellData)
+	}
+}
+
+func (ts *tableState) AddRow_PK_Data(pk []byte, cells ...any) {
+	aRow := ts.AddRow()
+
+	ts.SetRowPrimaryKey(aRow, pk)
+
+	for aCol, cellData := range cells {
+		ts.SetCell(aRow, aCol, cellData)
+	}
+}
+
+func (ts *tableState) SetRowCount(newlen int) {
+	if ts.rowCount == newlen {
+		return // no change
+	}
+	ts.rowCount = newlen
+
+	for _, colIfac := range ts.columns {
+		colIfac.SetRowCount(newlen)
+	}
+
+	// We don't know if editing will be enabled until after the whole RenderForNav
+	// has completed. Set up primary key support regardless.
+	ts.primaryKeys = slice_set_len(ts.primaryKeys, newlen)
+}
+
+func (ts *tableState) SetCell(aRow, aCol int, data any) {
+	if aRow >= ts.rowCount {
+		panic("SetCell with too large row")
+	}
+
+	ts.columns[aCol].SetCell(aRow, data)
+}
+
+// SetRowPrimaryKey
+// The slice data will be copied.
+func (ts *tableState) SetRowPrimaryKey(aRow int, data []byte) {
+	if len(ts.primaryKeys) != ts.rowCount {
+		panic("messed up")
+	}
+	if aRow >= ts.rowCount {
+		panic("SetRowPrimaryKey with too large row")
+	}
+
+	ts.primaryKeys[aRow] = slice_dup(data)
+}
+
+func (ts *tableState) Wipeout() {
+	ts.SetupColumns(
+		[]columnType{
+			columnType_inlineText,
+			columnType_popupData,
+		},
+		[]string{"Key", "Value"},
+	)
+}
+
+func (ts *tableState) Ready() {
+	ts.model.EndResetModel()
+
+	ts.tbl.ResizeColumnsToContents()
+	ts.tbl.SetEnabled(true)
+}
+
+func (ts *tableState) IsReady() bool {
+	return ts.tbl.IsEnabled()
+}
+
+// DeleteSelectedRows marks the selected rows for deletion.
+func (ts *tableState) DeleteSelectedRows() {
+	rows := ts.tbl.SelectionModel().SelectedRows()
+	// n.b. if the selection model for the table allows single-cell selection,
+	// this won't find all rows, just fully-selected rows from clicking on the
+	// vertical header bar
+
+	for _, row := range rows {
+		row_ := row.Row() // your boat
+
+		// Mark for deletion
+		ts.deleteRows[row_] = struct{}{}
+
+		// This supersedes any updates in the row
+		if _, ok := ts.updateRows[row_]; ok {
+			delete(ts.updateRows, row_)
+		}
+
+		// Refresh background colour
+		ts.model.DataChanged(&row, &row)
+	}
+
+	if len(rows) > 0 {
+		ts.OnEdited()
+	}
+}
+
+// InsertNewRow is the user action of inserting a new row at the bottom of the
+// table.
+func (ts *tableState) InsertNewRow() {
+	rowId := ts.rowCount
+
+	ts.model.BeginInsertRows(qt.NewQModelIndex(), rowId, rowId)
+
+	ts.AddRow()
+	ts.insertRows[rowId] = struct{}{}
+
+	ts.model.EndInsertRows()
+
+	// Scroll to bottom (only works after EndInsertRows has caused the view to
+	// refresh)
+	ts.tbl.ScrollToBottom()
+
+	// There are currently some edits again
+	ts.OnEdited()
+}
+
+func NewTableState(tbl *qt.QTableView) *tableState {
+
+	// Stylistic changes
+	tbl.SetHorizontalScrollMode(qt.QAbstractItemView__ScrollPerPixel)
+	tbl.SetVerticalScrollMode(qt.QAbstractItemView__ScrollPerPixel)
+	tbl.VerticalHeader().Hide() // Table row IDs do not match data IDs
+	tbl.SetSelectionBehavior(qt.QAbstractItemView__SelectRows)
+
+	// @ref https://doc.qt.io/qt-6/qabstracttablemodel.html#subclassing
+	model := qt.NewQAbstractTableModel2(tbl.QObject)
+
+	var ts tableState
+	ts.model = model
+	ts.tbl = tbl
+	ts.OnEdited = func() {} // no-op
+	ts.Wipeout()
+
+	model.OnRowCount(func(parent *qt.QModelIndex) int {
+		return ts.rowCount
+	})
+
+	model.OnColumnCount(func(parent *qt.QModelIndex) int {
+		return len(ts.columns)
+	})
+
+	model.OnHeaderData(func(super func(section int, orientation qt.Orientation, role int) *qt.QVariant, section int, orientation qt.Orientation, role int) *qt.QVariant {
+		if role == int(qt.DisplayRole) && orientation == qt.Horizontal {
+			if section >= len(ts.columnLabels) {
+				return qt.NewQVariant() // invalid request
+			}
+
+			return qt.NewQVariant11(ts.columnLabels[section])
+		}
+
+		return super(section, orientation, role)
+	})
+
+	model.OnFlags(func(super func(index *qt.QModelIndex) qt.ItemFlag, index *qt.QModelIndex) qt.ItemFlag {
+		ret := super(index)
+		if ts.allowEdit {
+			ret |= qt.ItemIsEditable
+		}
+		return ret
+	})
+
+	model.OnData(func(index *qt.QModelIndex, role int) *qt.QVariant {
+		if !index.IsValid() {
+			return qt.NewQVariant() // invalid
+		}
+
+		aCol := index.Column()
+		aRow := index.Row()
+
+		switch role {
+		case int(qt.DisplayRole):
+
+			// Formatting for display, return a QVariant of plain string type
+			return ts.columns[aCol].Display(aRow)
+
+		case int(qt.ForegroundRole):
+			if ts.columns[aCol].IndicateBlue() {
+				return qt.NewQColor2(CO_OBJECT).ToQVariant()
+			}
+
+			return qt.NewQVariant() // just default
+
+		case int(qt.EditRole):
+
+			// Supplying to the editor, return a QVariant of raw editing type
+			return ts.columns[aCol].SimpleEditData(aRow)
+
+		case int(qt.BackgroundRole):
+
+			if _, ok := ts.deleteRows[aRow]; ok {
+				return qt.NewQColor2(CO_DELETE).ToQVariant()
+			}
+
+			if _, ok := ts.insertRows[aRow]; ok {
+				return qt.NewQColor2(CO_INSERT).ToQVariant()
+			}
+
+			if cells, ok := ts.updateRows[aRow]; ok {
+				if slice_contains(cells, aCol) {
+					return qt.NewQColor2(CO_EDIT_EXPLICIT).ToQVariant()
+				} else {
+					return qt.NewQColor2(CO_EDIT_IMPLICIT).ToQVariant()
+				}
+			}
+
+			// Row is not modified
+			return qt.NewQVariant() // trigger default behaviour
+
+		default:
+			return qt.NewQVariant() // invalid
+		}
+	})
+
+	model.OnSetData(func(super func(index *qt.QModelIndex, value *qt.QVariant, role int) bool, index *qt.QModelIndex, value *qt.QVariant, role int) bool {
+
+		if !index.IsValid() {
+			return super(index, value, role) // invalid
+		}
+
+		aCol, aRow := index.Column(), index.Row()
+
+		switch role {
+		case int(qt.EditRole):
+			// Update content
+			ts.columns[aCol].ApplySimpleChange(aRow, value)
+
+			// If this is an insert row, no need to patch updateRows
+			if _, ok := ts.insertRows[aRow]; ok {
+				// nothing to do
+
+			} else {
+
+				// If this row was marked for deletion, this new edit takes priority
+				delete(ts.deleteRows, aRow)
+
+				// Set background colour
+				cells, ok := ts.updateRows[aRow]
+				if !ok {
+					cells = make([]int, 0, 1)
+				}
+				if slice_contains(cells, aCol) {
+					// already ok
+				} else {
+					cells = append(cells, aCol)
+				}
+				ts.updateRows[aRow] = cells
+			}
+
+			// Emit signal
+			// TODO ideally this would run after this function returned?
+			ts.OnEdited()
+
+			// Done
+			return true
+
+		default:
+			return super(index, value, role)
+		}
+
+	})
+
+	// Table cell double-click
+
+	tbl.OnDoubleClicked(func(idx *qt.QModelIndex) {
+		if !idx.IsValid() {
+			return
+		}
+
+		aCol, aRow := idx.Column(), idx.Row()
+
+		if !ts.allowEdit {
+			// If editing is enabled, double-clicking a cell should have been
+			// one of the edit-triggers
+			// So only show the custom inspector if editing is disabled
+			//
+			// Most column-types do not define an inspector and this is a no-op anyway
+			ts.columns[aCol].Inspect(tbl.QWidget, aRow)
+		}
+	})
+
+	// Set target QTableView's model
+
+	tbl.SetModel(model.QAbstractItemModel)
+
+	return &ts
+}

table_binary.go

@@ -0,0 +1,176 @@
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"unicode/utf8"
+
+	"github.com/mappu/autoconfig"
+	qt "github.com/mappu/miqt/qt6"
+)
+
+type binColumn struct {
+	vals [][]byte
+}
+
+func (bc *binColumn) SetRowCount(newlen int) {
+	bc.vals = slice_set_len(bc.vals, newlen)
+}
+
+func (bc *binColumn) SetCell(aRow int, data any) {
+	str, ok := data.([]byte)
+	if !ok {
+		panic("bad data type")
+	}
+
+	bc.vals[aRow] = str
+}
+
+func (bc *binColumn) Display(aRow int) *qt.QVariant {
+	return qt.NewQVariant11(formatUtf8(bc.vals[aRow]))
+}
+
+func (bc *binColumn) Inspect(parent *qt.QWidget, aRow int) {
+	// do nothing
+	// TODO support hexview for noneditable columns
+}
+
+func (bc *binColumn) SimpleEditData(aRow int) *qt.QVariant {
+	// Theoretically don't need to return anything here for simple-edits since
+	// the popup editor works directly with the column-store
+	return qt.NewQVariant12(bc.vals[aRow])
+}
+
+func (bc *binColumn) ApplySimpleChange(aRow int, data *qt.QVariant) {
+	// Do nothing - the editor delegate has already directly updated
+	// the value directly in the column store
+	// (And - somehow value.ToByteArray() has the "Editing..." string)
+}
+
+func (bc *binColumn) IndicateBlue() bool {
+	return false
+}
+
+var _ TableColumn = &binColumn{}
+
+func table_makeBinaryItemDelegate(ts *tableState, parent *qt.QObject) *qt.QAbstractItemDelegate {
+
+	const (
+		ActionMode__invalid      int = iota
+		ActionMode_Text_Readonly     // Always a popup, otherwise you would just look at it
+		ActionMode_Text_Editable_Popup
+		//ActionMode_Text_Editable_Inline // TODO
+		ActionMode_Hex_Readonly
+	)
+
+	const ActionModeProperty string = `x-am`
+
+	zombie := qt.NewQStyledItemDelegate2(parent)
+
+	zombie.OnCreateEditor(func(super func(parent *qt.QWidget, option *qt.QStyleOptionViewItem, index *qt.QModelIndex) *qt.QWidget, parent *qt.QWidget, option *qt.QStyleOptionViewItem, index *qt.QModelIndex) *qt.QWidget {
+		// return a custom editor widget
+
+		aCol, aRow := index.Column(), index.Row()
+
+		self := ts.columns[aCol].(*binColumn)
+
+		bslice := self.vals[aRow]
+
+		// Check if this contains valid UTF-8 data.
+		// If so, show in a multiline text editor + allow editing if this tableState allowed editing
+		// If not, use the hexview popup
+
+		isText := utf8.Valid(bslice)
+
+		// The widget here is rendered stacked on top of the cell's existing DisplayRole
+		// It doesn't replace it
+		editor := qt.NewQLabel(parent)
+		editor.SetAutoFillBackground(true) // Hide parent
+
+		if isText && !ts.allowEdit {
+
+			editor.SetProperty(ActionModeProperty, qt.NewQVariant4(ActionMode_Text_Readonly))
+			editor.SetText("Viewing...")
+
+			// TODO
+
+		} else if isText && ts.allowEdit {
+
+			editor.SetProperty(ActionModeProperty, qt.NewQVariant4(ActionMode_Text_Editable_Popup))
+			editor.SetText("Editing...")
+
+			var textEdit autoconfig.MultiLineString
+			textEdit = autoconfig.MultiLineString(string(bslice))
+
+			autoconfig.OpenDialog(&textEdit, editor.QWidget, APPNAME, func() {
+				// Store change directly back into column store
+				self.vals[aRow] = []byte(string(textEdit))
+
+				// Signal success/finished editing
+				zombie.CommitData(editor.QWidget)
+				zombie.CloseEditor2(editor.QWidget, qt.QAbstractItemDelegate__NoHint)
+			})
+
+		} else {
+			// Binary data
+			// Popup hexview
+			editor.SetProperty(ActionModeProperty, qt.NewQVariant4(ActionMode_Hex_Readonly))
+			editor.SetText("Viewing...")
+
+			dlg := qt.NewQDialog(parent)
+			dlg.SetModal(true)
+			dlg.SetWindowTitle(fmt.Sprintf("%s - Hex view (%d bytes)", APPNAME, len(bslice)))
+			dlg.SetContentsMargins(0, 0, 0, 0)
+			layout := qt.NewQGridLayout(dlg.QWidget)
+			layout.SetContentsMargins(0, 0, 0, 0)
+			dlg.SetLayout(layout.QLayout)
+
+			hxvw := vcl_hexview(nil, bytes.NewReader(bslice), int64(len(bslice)))
+			layout.AddWidget2(hxvw, 0, 0)
+
+			// Dialog should be, by default, big enough to show the whole table at once
+			// Slightly overshoots on Breeze theme with default fonts
+			// TODO figure out the real width accurately
+			dlg.SetMinimumWidth(700)
+
+			dlg.Show()
+			dlg.OnFinished(func(_ int) {
+				// close editor, without, signalling commitData (this was readonly)
+				//zombie.CommitData(editor.QWidget)
+				zombie.CloseEditor2(editor.QWidget, qt.QAbstractItemDelegate__NoHint)
+			})
+
+		}
+		return editor.QWidget
+	})
+
+	zombie.OnSetEditorData(func(super func(editor *qt.QWidget, index *qt.QModelIndex), editor *qt.QWidget, index *qt.QModelIndex) {
+		actionType := editor.Property("x-am").ToInt()
+		switch actionType {
+		case ActionMode_Text_Readonly:
+		// TODO
+		case ActionMode_Text_Editable_Popup:
+			super(editor, index) // Save
+		case ActionMode_Hex_Readonly:
+			// do nothing
+		default:
+			panic("bad actionMode in editor delegate widget")
+		}
+	})
+
+	zombie.OnSetModelData(func(super func(editor *qt.QWidget, model *qt.QAbstractItemModel, index *qt.QModelIndex), editor *qt.QWidget, model *qt.QAbstractItemModel, index *qt.QModelIndex) {
+		actionType := editor.Property("x-am").ToInt()
+		switch actionType {
+		case ActionMode_Text_Readonly:
+		// TODO
+		case ActionMode_Text_Editable_Popup:
+			super(editor, model, index) // Save
+		case ActionMode_Hex_Readonly:
+			// do nothing
+		default:
+			panic("bad actionMode in editor delegate widget")
+		}
+	})
+
+	return zombie.QAbstractItemDelegate
+}

table_bson.go

@@ -0,0 +1,142 @@
+package main
+
+import (
+	"bytes"
+	"fmt"
+
+	"github.com/mappu/autoconfig"
+	qt "github.com/mappu/miqt/qt6"
+	"go.mongodb.org/mongo-driver/v2/bson"
+)
+
+type bsonColumn struct {
+	vals []bson.D
+}
+
+func (bc *bsonColumn) SetRowCount(newlen int) {
+	bc.vals = slice_set_len(bc.vals, newlen)
+}
+
+func (bc *bsonColumn) SetCell(aRow int, data any) {
+	obj, ok := data.(bson.D)
+	if !ok {
+		panic("bad data type")
+	}
+
+	bc.vals[aRow] = obj
+}
+
+func (bc *bsonColumn) Display(aRow int) *qt.QVariant {
+	return qt.NewQVariant11(fmt.Sprintf("BSON (%d keys)", len(bc.vals[aRow])))
+}
+
+func (bc *bsonColumn) Inspect(parent *qt.QWidget, aRow int) {
+	// Double-click on BSON column
+	// We aren't loading the editor
+	data := bc.vals[aRow] // shallow copy
+
+	// Deep-copy so that we can ensure no modification takes place
+	jb_before, err := data.MarshalJSON()
+	if err != nil {
+		qt.QMessageBox_Warning(parent, APPNAME, err.Error())
+		return // not reachable
+	}
+
+	autoconfig.OpenDialog(&data, parent, APPNAME, func() {
+		jb_after, err := data.MarshalJSON()
+		if err != nil {
+			qt.QMessageBox_Warning(parent, APPNAME, err.Error())
+			return // not reachable
+		}
+
+		if !bytes.Equal(jb_before, jb_after) {
+			// Show warning message
+			qt.QMessageBox_Warning(parent, APPNAME, "The data is read-only. Your changes will not be saved.")
+
+			// Restore data from previous JSON
+			err = data.UnmarshalJSON(jb_before)
+			if err != nil {
+				qt.QMessageBox_Warning(parent, APPNAME, err.Error())
+				return // not reachable
+			}
+			bc.vals[aRow] = data
+		}
+	})
+}
+
+func (bc *bsonColumn) SimpleEditData(aRow int) *qt.QVariant {
+	// Don't need to return anything here for simple-edits since
+	// the popup editor works directly with the column-store
+	return qt.NewQVariant()
+}
+
+func (bc *bsonColumn) ApplySimpleChange(aRow int, data *qt.QVariant) {
+	// Do nothing - the editor delegate has already directly updated
+	// the value directly in the column store
+}
+
+func (bc *bsonColumn) IndicateBlue() bool {
+	return true
+}
+
+var _ TableColumn = &bsonColumn{}
+
+func table_makeBsonItemDelegate(ts *tableState, parent *qt.QObject) *qt.QAbstractItemDelegate {
+	zombie := qt.NewQStyledItemDelegate2(parent)
+
+	zombie.OnCreateEditor(func(super func(parent *qt.QWidget, option *qt.QStyleOptionViewItem, index *qt.QModelIndex) *qt.QWidget, parent *qt.QWidget, option *qt.QStyleOptionViewItem, index *qt.QModelIndex) *qt.QWidget {
+		// return a custom editor widget
+
+		aCol, aRow := index.Column(), index.Row()
+
+		self := ts.columns[aCol].(*bsonColumn)
+		ptr_bData := &self.vals[aRow]
+
+		// The widget here is rendered stacked on top of the cell's existing DisplayRole
+		// It doesn't replace it
+
+		foo := qt.NewQLabel(parent)
+		foo.SetAutoFillBackground(true) // Hide parent
+		foo.SetText("Editing...")
+
+		autoconfig.OpenDialog(ptr_bData, foo.QWidget, APPNAME, func() {
+			// onFinished
+			// We're already working with the data in-pointer, nothing to do here
+			// However - signal to the model that it's finished,
+
+			zombie.CommitData(foo.QWidget)
+			zombie.CloseEditor2(foo.QWidget, qt.QAbstractItemDelegate__NoHint)
+		})
+
+		return foo.QWidget
+
+		// return the default editor widget
+		//return super(parent, option, index)
+	})
+
+	zombie.OnSetEditorData(func(super func(editor *qt.QWidget, index *qt.QModelIndex), editor *qt.QWidget, index *qt.QModelIndex) {
+		// populate the custom editor with the table's current data
+		// DO NOTHING HERE - we have already set the data internally
+
+		// This calls onSetData
+		super(editor, index)
+	})
+
+	zombie.OnSetModelData(func(super func(editor *qt.QWidget, model *qt.QAbstractItemModel, index *qt.QModelIndex), editor *qt.QWidget, model *qt.QAbstractItemModel, index *qt.QModelIndex) {
+		// the table has requested to save data from the editor back into the model
+		// DO NOTHING HERE - autoconfig{} has already updated the data internally -
+		// However we do need to trigger model.OnSetData so that the green colour shows?
+		// FIXME
+
+		super(editor, model, index)
+	})
+
+	zombie.OnUpdateEditorGeometry(func(super func(editor *qt.QWidget, option *qt.QStyleOptionViewItem, index *qt.QModelIndex), editor *qt.QWidget, option *qt.QStyleOptionViewItem, index *qt.QModelIndex) {
+		// after having created our custom editor, set the widget's size as per the table column
+		editor.SetGeometryWithGeometry(option.Rect())
+
+		// super(editor, option, index)
+	})
+
+	return zombie.QAbstractItemDelegate
+}

table_string.go

@@ -0,0 +1,46 @@
+package main
+
+import (
+	qt "github.com/mappu/miqt/qt6"
+)
+
+type stringColumn struct {
+	vals []string
+}
+
+func (sc *stringColumn) SetRowCount(newlen int) {
+	sc.vals = slice_set_len(sc.vals, newlen)
+}
+
+func (sc *stringColumn) SetCell(aRow int, data any) {
+	str, ok := data.(string)
+	if !ok {
+		panic("bad data type")
+	}
+
+	sc.vals[aRow] = str
+}
+
+func (sc *stringColumn) Display(aRow int) *qt.QVariant {
+	return qt.NewQVariant11(sc.vals[aRow])
+}
+
+func (sc *stringColumn) Inspect(parent *qt.QWidget, aRow int) {
+	// do nothing
+}
+
+func (sc *stringColumn) SimpleEditData(aRow int) *qt.QVariant {
+	// Theoretically don't need to return anything here for simple-edits since
+	// the popup editor works directly with the column-store
+	return qt.NewQVariant11(sc.vals[aRow])
+}
+
+func (sc *stringColumn) ApplySimpleChange(aRow int, data *qt.QVariant) {
+	sc.vals[aRow] = data.ToString()
+}
+
+func (sc *stringColumn) IndicateBlue() bool {
+	return false
+}
+
+var _ TableColumn = &stringColumn{}

util_types.go

@@ -3,6 +3,8 @@ package main
 import (
 	"bytes"
 	"encoding/gob"
+
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 // box_interface creates a slice where all elements of the input slice are boxed
@@ -15,6 +17,24 @@ func box_interface[T any](input []T) []interface{} {
 	return ret
 }
 
+func slice_repeat[T any](value T, count int) []T {
+	ret := make([]T, count)
+	for i := 0; i < count; i++ {
+		ret[i] = value
+	}
+	return ret
+}
+
+func address_of[T any](value T) *T {
+	return &value
+}
+
+func slice_dup[T any](src []T) []T {
+	ret := make([]T, len(src))
+	copy(ret, src)
+	return ret
+}
+
 func slice_contains[T comparable](haystack []T, needle T) bool {
 	_, ok := slice_find(haystack, needle)
 	return ok
@@ -34,6 +54,37 @@ func slice_remove_index[T comparable](slice []T, s int) []T {
 	return append(slice[:s], slice[s+1:]...)
 }
 
+// slice_and copies a slice and adds one more thing on the end.
+func slice_and[T comparable](base []T, and T) []T {
+	ret := make([]T, len(base)+1)
+	copy(ret, base)
+	ret[len(ret)-1] = and
+
+	return ret
+}
+
+// slice_apply creates a new slice where every element of the input arr is transformed.
+func slice_apply[T comparable](arr []T, transform func(T) T) []T {
+	ret := make([]T, len(arr))
+	for i := 0; i < len(arr); i++ {
+		ret[i] = transform(arr[i])
+	}
+	return ret
+}
+
+// slice_set_len sets the length of the slice. Use it like append -
+// x = slice_set_len(x, 10)
+func slice_set_len[T any](slice []T, newlen int) []T {
+
+	if newlen > len(slice) {
+		// Extending length
+		return append(slice, make([]T, newlen-len(slice))...)
+	}
+
+	// Truncating
+	return slice[0:newlen]
+}
+
 func pathlist_encode(bp []string) ([]byte, error) {
 	buff := bytes.Buffer{}
 	enc := gob.NewEncoder(&buff)
@@ -51,3 +102,18 @@ func pathlist_decode(input []byte) ([]string, error) {
 	err := dec.Decode(&ret)
 	return ret, err
 }
+
+func bson_find_id(doc bson.D) (string, bool) {
+	for _, pair := range doc {
+		if pair.Key == "_id" {
+			return pair.Value.(string), true
+		}
+	}
+
+	return "", false
+}
+
+func alloc_inplace[T any](target **T) {
+	var newObj T
+	*target = &newObj
+}

util_vcl.go

@@ -1,37 +1,124 @@
 package main
 
 import (
+	"fmt"
+	"io"
+	"log"
+	"runtime"
+
 	qt "github.com/mappu/miqt/qt6"
 )
 
-func vcl_clear_grid(grid *qt.QTableWidget) {
+func vcl_confirm_dialog(parent *qt.QWidget, message string) bool {
-	grid.Clear()           // clears header labels
-	grid.SetColumnCount(0) // clears content
-	grid.SetRowCount(0)    // clears content
-	grid.SetEnabled(false)
-}
 
-func vcl_confirm_dialog(parent *qt.QWidget, title string, message string) bool {
+	ret := qt.QMessageBox_Question2(parent, APPNAME, message,
-
-	ret := qt.QMessageBox_Question2(parent, title, message,
 		qt.QMessageBox__Apply,
 		qt.QMessageBox__Cancel)
 
 	return ret == int(qt.QMessageBox__Apply)
 }
 
-func vcl_grid_set_row_colour(grid *qt.QTableWidget, rowId int, colour *qt.QBrush) {
+func vcl_monospace() *qt.QFont {
-
+	if runtime.GOOS == "windows" {
-	// Avoid triggering onCellChanged events while we update the background
+		return qt.NewQFont2("Consolas")
-	// colours
+	} else {
-	if !grid.SignalsBlocked() {
+		return qt.NewQFont2("monospace")
-		grid.BlockSignals(true)
-		defer grid.BlockSignals(false)
-	}
-
-	numCols := grid.ColumnCount()
-	for i := 0; i < numCols; i++ {
-		cell := grid.Item(rowId, i)
-		cell.SetBackground(colour)
 	}
 }
+
+// hexview creates a Qt hex viewer widget.
+func vcl_hexview(parent *qt.QWidget, data io.ReaderAt, dataLen int64) *qt.QWidget {
+	tbl := qt.NewQTableView(parent)
+
+	model := qt.NewQAbstractTableModel2(tbl.QObject)
+
+	model.OnRowCount(func(_ *qt.QModelIndex) int {
+		return int((dataLen + 15) / 16) // fake ceil
+	})
+
+	model.OnColumnCount(func(_ *qt.QModelIndex) int {
+		return 17 // 16 hex columns, 1 display column
+	})
+
+	model.OnHeaderData(func(super func(section int, orientation qt.Orientation, role int) *qt.QVariant, section int, orientation qt.Orientation, role int) *qt.QVariant {
+		if role == int(qt.DisplayRole) {
+			if orientation == qt.Horizontal {
+				if section == 16 {
+					return qt.NewQVariant11("Latin-1")
+				} else {
+					return qt.NewQVariant11(fmt.Sprintf("%02X", section))
+				}
+			} else {
+				// vertical
+				return qt.NewQVariant11(fmt.Sprintf("%08X", section*16))
+			}
+		}
+
+		return super(section, orientation, role)
+	})
+
+	model.OnData(func(index *qt.QModelIndex, role int) *qt.QVariant {
+		if !index.IsValid() {
+			return qt.NewQVariant()
+		}
+
+		if qt.ItemDataRole(role) != qt.DisplayRole {
+			return qt.NewQVariant() // ignoring everything else
+		}
+
+		aRow, aCol := int64(index.Row()), int64(index.Column())
+
+		if aCol == 16 {
+			// Display row
+			posn := aRow * 16 // must necessarily be < dataLen
+			buff := make([]byte, 16)
+
+			n, err := data.ReadAt(buff, posn)
+			if err != nil && err != io.EOF {
+				log.Printf("Read offset=0x%08x, len=16: error %v", posn, err.Error())
+				return qt.NewQVariant11("?")
+			}
+
+			return qt.NewQVariant11(string(buff[0:n])) // FIXME make per-character
+
+		} else {
+			// Display single byte
+			posn := (aRow * 16) + aCol
+
+			buff := make([]byte, 1)
+			if posn >= dataLen {
+				// EOF
+				return qt.NewQVariant()
+			}
+
+			n, err := data.ReadAt(buff, posn)
+			if n != 1 {
+				log.Printf("Read offset=0x%08x, len=1: unexpected short read", posn)
+				return qt.NewQVariant11("?")
+			}
+
+			if err != nil {
+				log.Printf("Read offset=0x%08x, len=1: error %v", posn, err.Error())
+				return qt.NewQVariant11("?")
+			}
+
+			return qt.NewQVariant11(fmt.Sprintf("%02X", buff[0]))
+		}
+	})
+
+	tbl.SetModel(model.QAbstractItemModel)
+
+	// Fixed column widths
+	tbl.HorizontalHeader().SetMinimumSectionSize(0)
+	for i := 0; i < 16; i++ {
+		tbl.SetColumnWidth(i, 28)
+	}
+	tbl.SetColumnWidth(16, 128)
+	tbl.HorizontalHeader().SetSectionResizeMode(qt.QHeaderView__Fixed)
+	tbl.VerticalHeader().SetSectionResizeMode(qt.QHeaderView__Fixed)
+
+	// Monospace font
+	tbl.SetFont(vcl_monospace())
+
+	return tbl.QWidget
+}

version.go

@@ -0,0 +1,3 @@
+package main
+
+const appVersion = "v0.0.0-devel"

winres.json

@@ -0,0 +1,54 @@
+{
+  "RT_GROUP_ICON": {
+    "APP": {
+      "0000": "assets/database_lightning.png"
+    }
+  },
+  "RT_VERSION": {
+    "#1": {
+      "0000": {
+        "fixed": {
+          "file_version": "0.0.0.0",
+          "product_version": "0.0.0.0"
+        },
+        "info": {
+          "0409": {
+            "Comments": "",
+            "CompanyName": "code.ivysaur.me",
+            "FileDescription": "QBolt Database Editor",
+            "FileVersion": "0.0.0.0",
+            "LegalCopyright": "code.ivysaur.me",
+            "LegalTrademarks": "",
+            "ProductName": "QBolt",
+            "ProductVersion": "0.0.0"
+          }
+        }
+      }
+    }
+  },
+  "RT_MANIFEST": {
+    "#1": {
+      "0409": {
+        "identity": {
+          "name": "",
+          "version": ""
+        },
+        "description": "",
+        "minimum-os": "win7",
+        "execution-level": "as invoker",
+        "ui-access": false,
+        "auto-elevate": false,
+        "dpi-awareness": "per monitor v2",
+        "disable-theming": false,
+        "disable-window-filtering": false,
+        "high-resolution-scrolling-aware": false,
+        "ultra-high-resolution-scrolling-aware": false,
+        "long-path-aware": false,
+        "printer-driver-isolation": false,
+        "gdi-scaling": false,
+        "segment-heap": false,
+        "use-common-controls-v6": true
+      }
+    }
+  }
+}