Unverified Commit 2f8e7094 authored by Kevin Lyda's avatar Kevin Lyda
Browse files

First pass at storage module.

parent 54b02937

folders/sql/1_create_table.up.sql

+6 −5
Original line number Diff line number Diff line
@@ -85,8 +85,8 @@ BEGIN 
  SELECT RAISE (ABORT, 'GENERAL folder is protected');

END;



INSERT INTO folders (name, description, system, shownew, owner)

       VALUES ('GENERAL', 'Default general bulletin folder.', 1, 1, 'SYSTEM');

INSERT INTO folders (name, description, system, shownew)

       VALUES ('GENERAL', 'Default general bulletin folder.', 1, 1);



CREATE TABLE owners (

  folder      VARCHAR(25)  REFERENCES folders(name) ON DELETE CASCADE ON UPDATE CASCADE,
@@ -103,6 +103,8 @@ BEGIN 
  UPDATE owners SET update_at=CURRENT_TIMESTAMP WHERE folder=NEW.folder AND owner=NEW.owner;

END;



INSERT INTO owners (folder, owner) VALUES ('GENERAL', 'SYSTEM');



CREATE TABLE messages (

  id          INT          NOT NULL,

  folder      VARCHAR(25)  REFERENCES folders(name) ON DELETE CASCADE ON UPDATE CASCADE,
@@ -149,14 +151,13 @@ CREATE TABLE access ( 
  PRIMARY KEY (login, folder)

) WITHOUT ROWID;



--- TODO: The following is incomplete:

--- User configs.

--- User folder configs.

CREATE TABLE config (

  login       VARCHAR(25) REFERENCES users(login) ON DELETE CASCADE ON UPDATE CASCADE,

  folder      VARCHAR(25) REFERENCES folders(name) ON DELETE CASCADE ON UPDATE CASCADE,

  always      INT     NOT NULL DEFAULT 0,

  alert       INT     NOT NULL DEFAULT 0,  --- 0=no, 1=brief, 2=readnew

  always      INT     NOT NULL

  PRIMARY KEY (login, folder)

) WITHOUT ROWID;



--- System configs.

go.mod

+82 −0
Original line number Diff line number Diff line
@@ -15,23 +15,105 @@ require ( 
)



require (

	cel.dev/expr v0.19.1 // indirect

	dario.cat/mergo v1.0.1 // indirect

	filippo.io/edwards25519 v1.1.0 // indirect

	github.com/Masterminds/goutils v1.1.1 // indirect

	github.com/Masterminds/semver/v3 v3.3.0 // indirect

	github.com/Masterminds/sprig/v3 v3.3.0 // indirect

	github.com/aarondl/json v0.0.0-20221020222930-8b0db17ef1bf // indirect

	github.com/aarondl/opt v0.0.0-20230114172057-b91f370c41f0 // indirect

	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect

	github.com/coder/websocket v1.8.12 // indirect

	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect

	github.com/cubicdaiya/gonp v1.0.4 // indirect

	github.com/davecgh/go-spew v1.1.1 // indirect

	github.com/dustin/go-humanize v1.0.1 // indirect

	github.com/fatih/structtag v1.2.0 // indirect

	github.com/fergusstrange/embedded-postgres v1.26.0 // indirect

	github.com/fsnotify/fsnotify v1.6.0 // indirect

	github.com/gdamore/encoding v1.0.1 // indirect

	github.com/go-sql-driver/mysql v1.9.2 // indirect

	github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect

	github.com/gofrs/uuid v4.4.0+incompatible // indirect

	github.com/google/cel-go v0.24.1 // indirect

	github.com/google/go-cmp v0.7.0 // indirect

	github.com/google/uuid v1.6.0 // indirect

	github.com/hashicorp/errwrap v1.1.0 // indirect

	github.com/hashicorp/go-multierror v1.1.1 // indirect

	github.com/huandu/xstrings v1.5.0 // indirect

	github.com/inconshreveable/mousetrap v1.1.0 // indirect

	github.com/jackc/pgpassfile v1.0.0 // indirect

	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect

	github.com/jackc/pgx/v5 v5.7.4 // indirect

	github.com/jackc/puddle/v2 v2.2.2 // indirect

	github.com/jinzhu/inflection v1.0.0 // indirect

	github.com/knadh/koanf/maps v0.1.1 // indirect

	github.com/knadh/koanf/parsers/yaml v0.1.0 // indirect

	github.com/knadh/koanf/providers/confmap v0.1.0 // indirect

	github.com/knadh/koanf/providers/env v0.1.0 // indirect

	github.com/knadh/koanf/providers/file v0.1.0 // indirect

	github.com/knadh/koanf/v2 v2.1.0 // indirect

	github.com/lib/pq v1.10.9 // indirect

	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect

	github.com/mattn/go-isatty v0.0.20 // indirect

	github.com/mattn/go-runewidth v0.0.16 // indirect

	github.com/mitchellh/copystructure v1.2.0 // indirect

	github.com/mitchellh/reflectwalk v1.0.2 // indirect

	github.com/ncruces/go-strftime v0.1.9 // indirect

	github.com/pganalyze/pg_query_go/v6 v6.1.0 // indirect

	github.com/pingcap/errors v0.11.5-0.20240311024730-e056997136bb // indirect

	github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect

	github.com/pingcap/log v1.1.0 // indirect

	github.com/pingcap/tidb/pkg/parser v0.0.0-20250324122243-d51e00e5bbf0 // indirect

	github.com/qdm12/reprint v0.0.0-20200326205758-722754a53494 // indirect

	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect

	github.com/rivo/uniseg v0.4.7 // indirect

	github.com/riza-io/grpc-go v0.2.0 // indirect

	github.com/russross/blackfriday/v2 v2.1.0 // indirect

	github.com/shopspring/decimal v1.4.0 // indirect

	github.com/spf13/cast v1.7.0 // indirect

	github.com/spf13/cobra v1.9.1 // indirect

	github.com/spf13/pflag v1.0.6 // indirect

	github.com/sqlc-dev/sqlc v1.29.0 // indirect

	github.com/stephenafamo/bob v0.34.2 // indirect

	github.com/stephenafamo/scan v0.6.2 // indirect

	github.com/stephenafamo/sqlparser v0.0.0-20250408111851-b937299b5b7d // indirect

	github.com/stoewer/go-strcase v1.2.0 // indirect

	github.com/tetratelabs/wazero v1.9.0 // indirect

	github.com/tursodatabase/libsql-client-go v0.0.0-20240902231107-85af5b9d094d // indirect

	github.com/urfave/cli/v2 v2.23.7 // indirect

	github.com/volatiletech/inflect v0.0.1 // indirect

	github.com/volatiletech/strmangle v0.0.6 // indirect

	github.com/wasilibs/go-pgquery v0.0.0-20250409022910-10ac41983c07 // indirect

	github.com/wasilibs/wazero-helpers v0.0.0-20240620070341-3dff1577cd52 // indirect

	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect

	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect

	go.uber.org/atomic v1.11.0 // indirect

	go.uber.org/multierr v1.11.0 // indirect

	go.uber.org/zap v1.27.0 // indirect

	golang.org/x/crypto v0.38.0 // indirect

	golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect

	golang.org/x/mod v0.24.0 // indirect

	golang.org/x/net v0.40.0 // indirect

	golang.org/x/sync v0.14.0 // indirect

	golang.org/x/sys v0.33.0 // indirect

	golang.org/x/term v0.32.0 // indirect

	golang.org/x/text v0.25.0 // indirect

	golang.org/x/tools v0.33.0 // indirect

	google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect

	google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect

	google.golang.org/grpc v1.71.1 // indirect

	google.golang.org/protobuf v1.36.6 // indirect

	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect

	gopkg.in/yaml.v3 v3.0.1 // indirect

	modernc.org/libc v1.65.2 // indirect

	modernc.org/mathutil v1.7.1 // indirect

	modernc.org/memory v1.10.0 // indirect

	mvdan.cc/gofumpt v0.7.0 // indirect

)



tool (

	github.com/sqlc-dev/sqlc/cmd/sqlc

	github.com/stephenafamo/bob/gen/bobgen-sql

)

go.sum

+185 −0

File changed.

Preview size limit exceeded, changes collapsed.

storage/connection.go

0 → 100644
+64 −0
Original line number Diff line number Diff line 
package storage



import (

	"embed"

	"errors"

	"os"

	"path"



	"github.com/adrg/xdg"

	"github.com/golang-migrate/migrate/v4"

	"github.com/golang-migrate/migrate/v4/source/iofs"

	"github.com/jmoiron/sqlx"



	// Included to connect to sqlite.

	_ "github.com/golang-migrate/migrate/v4/database/sqlite"

	_ "modernc.org/sqlite"

)



//go:embed migrations/*.sql

var migrationsFS embed.FS



// Store is the store for bulletin.

type Store struct {

	user string

	db   *sqlx.DB

}



// Open opens the bulletin database.

func Open(user string) (*Store, error) {

	fdir := path.Join(xdg.DataHome, "BULLETIN")

	err := os.MkdirAll(fdir, 0700)

	if err != nil {

		return nil, errors.New("bulletin directory problem")

	}

	fdb := path.Join(fdir, "bulletin.db")



	// Run db migrations if needed.

	migrations, err := iofs.New(migrationsFS, "migrations")

	if err != nil {

		return nil, err

	}

	m, err := migrate.NewWithSourceInstance("iofs", migrations,

		"sqlite://"+fdb+"?_pragma=foreign_keys(1)")

	if err != nil {

		return nil, err

	}

	err = m.Up()

	if err != nil && err != migrate.ErrNoChange {

		return nil, err

	}

	m.Close()



	store := &Store{user: user}

	store.db, err = sqlx.Connect("sqlite", "file://"+fdb+"?_pragma=foreign_keys(1)")

	if err != nil {

		return nil, errors.New("bulletin database problem")

	}

	return store, nil

}



// Close closes the db backing the store.

func (fstore *Store) Close() {

	fstore.db.Close()

}

storage/db.go

0 → 100644
+31 −0
Original line number Diff line number Diff line 
// Code generated by sqlc. DO NOT EDIT.

// versions:

//   sqlc v1.29.0



package storage



import (

	"context"

	"database/sql"

)



type DBTX interface {

	ExecContext(context.Context, string, ...interface{}) (sql.Result, error)

	PrepareContext(context.Context, string) (*sql.Stmt, error)

	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)

	QueryRowContext(context.Context, string, ...interface{}) *sql.Row

}



func New(db DBTX) *Queries {

	return &Queries{db: db}

}



type Queries struct {

	db DBTX

}



func (q *Queries) WithTx(tx *sql.Tx) *Queries {

	return &Queries{

		db: tx,

	}

}