quietlight/skraakCLI - Change EBVWP6OGDMJZZOCALJU46LHFBF54MGNJADQ7ADJSZIQFNVPK7CFQC

replaced raw *sql.DB parameters with appropriate interfaces in the tools/ package

Created by quietlight on May 18, 2026

EBVWP6OGDMJZZOCALJU46LHFBF54MGNJADQ7ADJSZIQFNVPK7CFQC

Dependencies

In channels

main

Change contents

Replacement in tools/sql.go at line 155 [4.259371]

B:BD[3.4434] → [3.4434:4543]

func executeSQLQuery(ctx context.Context, database *sql.DB, query string, params []any) (*sql.Rows, error) {

[3.4434]

[3.4543]

func executeSQLQuery(ctx context.Context, q db.Querier, query string, params []any) (*sql.Rows, error) {

Replacement in tools/sql.go at line 157 [4.259371]

B:BD[3.4565] → [3.4565:4619]

		return database.QueryContext(ctx, query, params...)

[3.4565]

[3.4619]

		return q.QueryContext(ctx, query, params...)

Replacement in tools/sql.go at line 159 [4.259371]
B:BD[3.4622] → [3.4622:4664]
```
	return database.QueryContext(ctx, query)
```
[3.4622]
[3.4664]
```
	return q.QueryContext(ctx, query)
```

Insertion in tools/export.go at line 14 [4.357951]

[4.358068]


// writer is the local interface for write operations in export.
// Defined here per project convention: each consumer defines its own minimal interface.
// Uses Context variants exclusively so interfaces compose as compatible subsets of *sql.DB.
type writer interface {
	ExecContext(ctx context.Context, query string, args ...any) (sql.Result, error)
	QueryRowContext(ctx context.Context, query string, args ...any) *sql.Row
}

Replacement in tools/export.go at line 201 [4.357951]

B:BD[3.12599] → [3.12599:12718]

func getOrderedTableManifest(sourceDB *sql.DB) ([]TableRelationship, error) {
	fkOrder, err := db.GetFKOrder(sourceDB)

[3.12599]

[3.12718]

func getOrderedTableManifest(q db.Querier) ([]TableRelationship, error) {
	fkOrder, err := db.GetFKOrder(q)

Replacement in tools/export.go at line 210 [4.357951]

B:BD[3.12945] → [3.12945:13090]

func countAllTableRows(ctx context.Context, sourceDB *sql.DB, tables []TableRelationship, datasetID string, output *ExportDatasetOutput) error {

[3.12945]

[3.13090]

func countAllTableRows(ctx context.Context, q db.Querier, tables []TableRelationship, datasetID string, output *ExportDatasetOutput) error {

Replacement in tools/export.go at line 212 [4.357951]

B:BD[3.13119] → [3.13119:13180]

		count, err := countTableRows(ctx, sourceDB, tr, datasetID)

[3.13119]

[3.13180]

		count, err := countTableRows(ctx, q, tr, datasetID)

Replacement in tools/export.go at line 235 [4.357951]

B:BD[3.13759] → [2.2691:2916]

func copyDataToOutput(ctx context.Context, outputDB *sql.DB, tables []TableRelationship, datasetID string, sourceDBPath string) error {
	_, err := outputDB.ExecContext(ctx, fmt.Sprintf("ATTACH '%s' AS source", sourceDBPath))

[3.13759]

[3.13957]

func copyDataToOutput(ctx context.Context, w writer, tables []TableRelationship, datasetID string, sourceDBPath string) error {
	_, err := w.ExecContext(ctx, fmt.Sprintf("ATTACH '%s' AS source", sourceDBPath))

Replacement in tools/export.go at line 243 [4.357951]
B:BD[3.14101] → [3.14101:14149]
```
			err = copyTableAsIs(ctx, outputDB, tr.Table)
```
[3.14101]
[3.14149]
```
			err = copyTableAsIs(ctx, w, tr.Table)
```

Replacement in tools/export.go at line 245 [4.357951]

B:BD[3.14160] → [3.14160:14213]

			err = copyTableData(ctx, outputDB, tr, datasetID)

[3.14160]

[3.14213]

			err = copyTableData(ctx, w, tr, datasetID)

Replacement in tools/export.go at line 260 [4.357951]

B:BD[4.365004] → [4.365004:365101]

	connStr := outputPath + "?access_mode=read_write"
	database, err := sql.Open("duckdb", connStr)

[4.365004]

[4.365101]

	database, err := db.OpenWriteableDB(outputPath)

Replacement in tools/export.go at line 294 [4.357951]

B:BD[4.366188] → [4.366188:366268]

func copyTableAsIs(ctx context.Context, outputDB *sql.DB, table string) error {

[4.366188]

[4.366268]

func copyTableAsIs(ctx context.Context, w writer, table string) error {

Replacement in tools/export.go at line 296 [4.357951]
B:BD[4.366346] → [4.366346:366390]
```
	_, err := outputDB.ExecContext(ctx, query)
```
[4.366346]
[4.366390]
```
	_, err := w.ExecContext(ctx, query)
```

Replacement in tools/export.go at line 301 [4.357951]

B:BD[4.366465] → [4.366465:366571]

func copyTableData(ctx context.Context, outputDB *sql.DB, tr TableRelationship, datasetID string) error {

[4.366465]

[4.366571]

func copyTableData(ctx context.Context, w writer, tr TableRelationship, datasetID string) error {

Replacement in tools/export.go at line 321 [4.357951]
B:BD[4.367100] → [4.367100:367155]
```
	_, err := outputDB.ExecContext(ctx, query, datasetID)
```
[4.367100]
[4.367155]
```
	_, err := w.ExecContext(ctx, query, datasetID)
```

Replacement in tools/export.go at line 355 [4.357951]

B:BD[4.368441] → [4.368441:368551]

func countTableRows(ctx context.Context, db *sql.DB, tr TableRelationship, datasetID string) (int64, error) {

[4.368441]

[4.368551]

func countTableRows(ctx context.Context, q db.Querier, tr TableRelationship, datasetID string) (int64, error) {

Replacement in tools/export.go at line 375 [4.357951]

B:BD[4.368979] → [4.368979:369042]

	err := db.QueryRowContext(ctx, query, datasetID).Scan(&count)

[4.368979]

[4.369042]

	err := q.QueryRowContext(ctx, query, datasetID).Scan(&count)

Replacement in tools/cluster.go at line 86 [4.378727]

B:BD[4.381890] → [2.3354:3487]

	err := db.WithWriteTx(ctx, resolveDBPath(input.DBPath), "create_or_update_cluster", func(database *sql.DB, tx *db.LoggedTx) error {

[4.381890]

[5.19556]

	err := db.WithWriteTx(ctx, resolveDBPath(input.DBPath), "create_or_update_cluster", func(_ *sql.DB, tx *db.LoggedTx) error {

Replacement in tools/cluster.go at line 210 [4.378727]

B:BD[6.11113] → [6.11113:11184]

B:BD[6.11184] → [2.3578:3633]

func validateClusterActive(database *sql.DB, clusterID string) error {
	return db.ClusterExistsAndActive(database, clusterID)

[6.11113]

[7.8486]

func validateClusterActive(q db.Querier, clusterID string) error {
	return db.ClusterExistsAndActive(q, clusterID)

Replacement in tools/cluster.go at line 215 [4.378727]

B:BD[7.8573] → [7.8573:8653]

func validateClusterCyclicPattern(database *sql.DB, input ClusterInput) error {

[7.8573]

[7.8653]

func validateClusterCyclicPattern(q db.Querier, input ClusterInput) error {

Replacement in tools/cluster.go at line 223 [4.378727]
B:BD[7.8812] → [2.3634:3687]
```
	return db.PatternExistsAndActive(database, trimmed)
```
[7.8812]
[6.11435]
```
	return db.PatternExistsAndActive(q, trimmed)
```

Replacement in tools/cluster.go at line 297 [4.378727]

B:BD[6.12965] → [2.3688:3820]

∅:D[2.3820] → [5.20672:20741]

B:BD[5.20672] → [5.20672:20741]

	err = db.WithWriteTx(ctx, resolveDBPath(input.DBPath), "create_or_update_cluster", func(database *sql.DB, tx *db.LoggedTx) error {
		if err := validateClusterActive(database, clusterID); err != nil {

[6.12965]

[5.20741]

	err = db.WithWriteTx(ctx, resolveDBPath(input.DBPath), "create_or_update_cluster", func(_ *sql.DB, tx *db.LoggedTx) error {
		if err := validateClusterActive(tx, clusterID); err != nil {

Replacement in tools/cluster.go at line 302 [4.378727]

B:BD[6.13577] → [5.20760:20832]

		if err := validateClusterCyclicPattern(database, input); err != nil {

[6.13577]

[5.20832]

		if err := validateClusterCyclicPattern(tx, input); err != nil {

Replacement in db/schema.go at line 4 [4.1000207]
B:BD[4.1000229] → [4.1000229:1000245]
```
	"database/sql"
```
[4.1000229]
[4.1000245]
```
	"context"
```

Replacement in db/schema.go at line 157 [4.1000207]

B:BD[4.1004330] → [4.1004330:1004378]

B:BD[4.1004378] → [8.7848:7904]

func GetFKOrder(db *sql.DB) ([]string, error) {
	dependsOnMe, tables, err := buildFKDependencyGraph(db)

[4.1004330]

[8.7904]

func GetFKOrder(q Querier) ([]string, error) {
	dependsOnMe, tables, err := buildFKDependencyGraph(q)

Replacement in db/schema.go at line 163 [4.1000207]

B:BD[8.7943] → [8.7943:7997]

	if err := collectAllTables(db, tables); err != nil {

[8.7943]

[8.7997]

	if err := collectAllTables(q, tables); err != nil {

Replacement in db/schema.go at line 173 [4.1000207]

B:BD[8.8269] → [8.8269:8357]

func buildFKDependencyGraph(db *sql.DB) (map[string][]string, map[string]bool, error) {

[8.8269]

[8.8357]

func buildFKDependencyGraph(q Querier) (map[string][]string, map[string]bool, error) {

Replacement in db/schema.go at line 177 [4.1000207]
B:BD[8.8433] → [8.8433:8458]
```
	rows, err := db.Query(`
```
[8.8433]
[4.1004458]
```
	rows, err := q.QueryContext(context.Background(), `
```

Replacement in db/schema.go at line 205 [4.1000207]

B:BD[8.8794] → [8.8794:8885]

func collectAllTables(db *sql.DB, tables map[string]bool) error {
	rows, err := db.Query(`

[8.8794]

[4.1005460]

func collectAllTables(q Querier, tables map[string]bool) error {
	rows, err := q.QueryContext(context.Background(), `