refactor!: remove sqlc for jet

Author: ItsNotGoodName

Makefile

@@ -1,3 +1,6 @@
+gen:
+	jet -source=sqlite -dsn="./smtpbridge_data/smtpbridge.db" -path=./internal/dbgen -ignore-tables bun_migrations,bun_migration_locks
+
 snapshot:
 	goreleaser release --snapshot --clean
 
@@ -13,13 +16,13 @@ dev-web:
 clean:
 	rm -rf smtpbridge_data
 
-dep: dep-air dep-sqlc dep-web
+dep: dep-air dep-jet dep-web
 
 dep-air:
 	go install github.com/cosmtrek/air@latest
 
-dep-sqlc:
-	go install github.com/kyleconroy/sqlc/cmd/sqlc@latest
+dep-jet:
+	go install github.com/go-jet/jet/v2/cmd/jet@latest
 
 dep-web:
 	cd web && pnpm install

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/dustin/go-humanize v1.0.1
 	github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead
 	github.com/emersion/go-smtp v0.17.0
+	github.com/go-jet/jet/v2 v2.10.1
 	github.com/gofiber/fiber/v2 v2.48.0
 	github.com/gofiber/storage/bbolt v1.3.5
 	github.com/gofiber/template/html/v2 v2.0.5
@@ -26,6 +27,7 @@ require (
 require (
 	github.com/andybalholm/brotli v1.0.5 // indirect
 	github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.15.0 // indirect
 	github.com/gofiber/template v1.8.2 // indirect
 	github.com/gofiber/utils v1.1.0 // indirect
@@ -40,9 +42,11 @@ require (
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/philhofer/fwd v1.1.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
+	github.com/stretchr/testify v1.8.2 // indirect
 	github.com/tinylib/msgp v1.1.8 // indirect
 	github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect

go.sum

@@ -43,6 +43,7 @@ func Migrate(cc context.Context, bunDB *bun.DB) error {
 	// Migrate
 	group, err := migrator.Migrate(cc)
 	if err != nil {
+		migrator.Rollback(cc)
 		return err
 	}
 

internal/db/db.go

@@ -8,10 +8,12 @@ import (
 	"time"
 
 	"github.com/ItsNotGoodName/smtpbridge/internal/core"
-	"github.com/ItsNotGoodName/smtpbridge/internal/db/queries"
+	"github.com/ItsNotGoodName/smtpbridge/internal/dbgen/model"
+	. "github.com/ItsNotGoodName/smtpbridge/internal/dbgen/table"
 	"github.com/ItsNotGoodName/smtpbridge/internal/envelope"
 	"github.com/ItsNotGoodName/smtpbridge/internal/files"
 	"github.com/ItsNotGoodName/smtpbridge/pkg/pagination"
+	. "github.com/go-jet/jet/v2/sqlite"
 	"github.com/uptrace/bun"
 )
 
@@ -111,7 +113,12 @@ func EnvelopeGet(cc core.Context, id int64) (envelope.Envelope, error) {
 }
 
 func EnvelopeMessageHTMLGet(cc core.Context, id int64) (string, error) {
-	return queries.New(cc.DB.DB).GetEnvelopeMessageHTML(cc.Context(), id)
+	res := model.Messages{}
+	err := Messages.
+		SELECT(Messages.HTML).
+		WHERE(Messages.ID.EQ(Int64(id))).
+		QueryContext(cc.Context(), cc.DB, &res)
+	return res.HTML, err
 }
 
 func EnvelopeCount(cc core.Context) (int, error) {
@@ -160,14 +167,28 @@ func EnvelopeAttachmentListOrphan(cc core.Context, limit int) ([]*envelope.Attac
 }
 
 func EnvelopeDeleteUntilCount(cc core.Context, keep int, olderThan time.Time) (int64, error) {
-	return queries.New(cc.DB.DB).DeleteEnvelopeUntilCount(cc.Context(), queries.DeleteEnvelopeUntilCountParams{
-		CreatedAt: olderThan.UTC(),
-		Limit:     int64(keep),
-	})
+	// DELETE FROM messages WHERE id NOT IN ( SELECT id FROM messages ORDER BY id DESC LIMIT ?) AND messages.created_at < ?;
+
+	res, err := Messages.
+		DELETE().
+		WHERE(Messages.ID.NOT_IN(Messages.SELECT(Messages.ID).ORDER_BY(Messages.ID).LIMIT(int64(keep))).
+			AND(Messages.CreatedAt.LT(DATETIME(olderThan))),
+		).ExecContext(cc.Context(), cc.DB)
+	if err != nil {
+		return 0, err
+	}
+
+	return res.RowsAffected()
 }
 
 func EnvelopeDeleteOlderThan(cc core.Context, olderThan time.Time) (int64, error) {
-	return queries.New(cc.DB.DB).DeleteEnvelopeOlderThan(cc.Context(), olderThan.UTC())
+	res, err := Messages.DELETE().WHERE(Messages.CreatedAt.LT(DATETIME(olderThan))).ExecContext(cc.Context(), cc.DB)
+	if err != nil {
+		return 0, err
+	}
+
+	return res.RowsAffected()
+
 }
 
 func EnvelopeAttachmentDelete(cc core.Context, att *envelope.Attachment) error {

internal/db/envelope.go

@@ -8,58 +8,105 @@ import (
 	"time"
 
 	"github.com/ItsNotGoodName/smtpbridge/internal/core"
-	"github.com/ItsNotGoodName/smtpbridge/internal/db/queries"
+	"github.com/ItsNotGoodName/smtpbridge/internal/dbgen/model"
+	. "github.com/ItsNotGoodName/smtpbridge/internal/dbgen/table"
 	"github.com/ItsNotGoodName/smtpbridge/internal/endpoints"
 	"github.com/ItsNotGoodName/smtpbridge/internal/rules"
+	. "github.com/go-jet/jet/v2/sqlite"
 	"github.com/uptrace/bun"
 )
 
 func InternalRuleUpsert(cc core.Context, r rules.Rule, updatedAt time.Time) error {
-	return queries.New(cc.DB.DB).UpsertInternalRule(cc.Context(), queries.UpsertInternalRuleParams{
+	_, err := Rules.INSERT(
+		Rules.Internal,
+		Rules.InternalID,
+		Rules.Name,
+		Rules.Expression,
+		Rules.UpdatedAt,
+		Rules.Enable,
+	).MODEL(model.Rules{
+		Internal:   true,
 		InternalID: r.InternalID,
 		Name:       r.Name,
 		Expression: r.Expression,
-		UpdatedAt:  updatedAt.UTC(),
+		UpdatedAt:  updatedAt,
 		Enable:     r.Enable,
-	})
+	}).ON_CONFLICT(Rules.InternalID).DO_UPDATE(SET(
+		Rules.Name.SET(Rules.EXCLUDED.Name),
+		Rules.Expression.SET(Rules.EXCLUDED.Expression),
+		Rules.UpdatedAt.SET(Rules.EXCLUDED.UpdatedAt),
+	)).ExecContext(cc.Context(), cc.DB)
+
+	return err
 }
 
-func InternalEndpointUpsert(cc core.Context, end endpoints.Endpoint, updatedAt time.Time) error {
-	config, err := json.Marshal(end.Config)
+func InternalEndpointUpsert(cc core.Context, r endpoints.Endpoint, updatedAt time.Time) error {
+	config, err := json.Marshal(r.Config)
 	if err != nil {
 		return err
 	}
 
-	return queries.New(cc.DB.DB).UpsertInternalEndpoint(cc.Context(), queries.UpsertInternalEndpointParams{
-		InternalID:        end.InternalID,
-		Name:              end.Name,
-		AttachmentDisable: end.AttachmentDisable,
-		TextDisable:       end.TextDisable,
-		BodyTemplate:      end.BodyTemplate,
-		Kind:              end.Kind,
-		Config:            config,
-		UpdatedAt:         updatedAt.UTC(),
-	})
+	_, err = Endpoints.INSERT(
+		Endpoints.Internal,
+		Endpoints.InternalID,
+		Endpoints.Name,
+		Endpoints.AttachmentDisable,
+		Endpoints.TextDisable,
+		Endpoints.BodyTemplate,
+		Endpoints.Kind,
+		Endpoints.Config,
+		Endpoints.UpdatedAt,
+	).MODEL(model.Endpoints{
+		Internal:          true,
+		InternalID:        r.InternalID,
+		Name:              r.Name,
+		AttachmentDisable: r.AttachmentDisable,
+		TextDisable:       r.TextDisable,
+		BodyTemplate:      r.BodyTemplate,
+		Kind:              r.Kind,
+		Config:            string(config),
+		UpdatedAt:         updatedAt,
+	}).ON_CONFLICT(Endpoints.InternalID).DO_UPDATE(SET(
+		Endpoints.InternalID.SET(Endpoints.EXCLUDED.InternalID),
+		Endpoints.Name.SET(Endpoints.EXCLUDED.Name),
+		Endpoints.AttachmentDisable.SET(Endpoints.EXCLUDED.AttachmentDisable),
+		Endpoints.TextDisable.SET(Endpoints.EXCLUDED.TextDisable),
+		Endpoints.BodyTemplate.SET(Endpoints.EXCLUDED.BodyTemplate),
+		Endpoints.Kind.SET(Endpoints.EXCLUDED.Kind),
+		Endpoints.Config.SET(Endpoints.EXCLUDED.Config),
+		Endpoints.UpdatedAt.SET(Endpoints.EXCLUDED.UpdatedAt),
+	)).ExecContext(cc.Context(), cc.DB)
+
+	return err
 }
 
 func InternalRuleEndpointsUpsert(cc core.Context, ruleInternalID string, endpointInternalIDs []string, updatedAt time.Time) error {
 	if len(endpointInternalIDs) == 0 {
 		return nil
 	}
 
-	for _, v := range endpointInternalIDs {
-		rows, err := queries.New(cc.DB.DB).UpsertInternalRuleToEndpoint(cc.Context(), queries.UpsertInternalRuleToEndpointParams{
-			UpdatedAt:    updatedAt.UTC(),
-			InternalID:   ruleInternalID,
-			InternalID_2: v,
-		})
+	for _, endpointInternalID := range endpointInternalIDs {
+		rows, err := cc.DB.ExecContext(cc.Context(), `
+			INSERT INTO rules_to_endpoints (
+				internal,
+				rule_id,
+				endpoint_id,
+				updated_at
+			) SELECT "1" AS internal, rules.id AS rule_id, endpoints.id AS endpoint_id, ?
+			FROM rules, endpoints
+			WHERE rules.internal_id=? AND endpoints.internal_id IN (?) 
+			ON CONFLICT (rule_id, endpoint_id) DO UPDATE SET updated_at=EXCLUDED.updated_at, internal=EXCLUDED.internal
+		`, updatedAt.UTC(), ruleInternalID, endpointInternalID)
 		if err != nil {
 			return err
 		}
-		if rows == 0 {
-			return fmt.Errorf("endpoint not found '%s'", v)
+		count, err := rows.RowsAffected()
+		if err != nil {
+			return err
+		}
+		if count == 0 {
+			return fmt.Errorf("endpoint not found '%s'", endpointInternalID)
 		}
-
 	}
 
 	return nil

internal/db/internal.go

@@ -0,0 +1,9 @@
+SET statement_timeout = 0;
+
+--bun:split
+
+SELECT 1
+
+--bun:split
+
+SELECT 2

internal/db/migrations/20230805051005_nuke_everything.down.sql

@@ -1,5 +1,13 @@
-CREATE TABLE IF NOT EXISTS messages (
-    id INTEGER PRIMARY KEY,
+DROP TABLE IF EXISTS rules_to_endpoints;
+DROP TABLE IF EXISTS rules;
+DROP TABLE IF EXISTS endpoints;
+DROP TABLE IF EXISTS attachments;
+DROP TABLE IF EXISTS messages;
+
+--bun:split
+
+CREATE TABLE messages (
+    id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
     from_ TEXT NOT NULL,
     to_ JSON NOT NULL,
     subject TEXT NOT NULL,
@@ -11,9 +19,9 @@ CREATE TABLE IF NOT EXISTS messages (
 
 --bun:split
 
-CREATE TABLE IF NOT EXISTS attachments (
-    id INTEGER PRIMARY KEY,
-    message_id INTEGER,
+CREATE TABLE attachments (
+    id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    message_id INTEGER NOT NULL,
     name TEXT NOT NULL,
     mime TEXT NOT NULL,
     extension TEXT NOT NULL,
@@ -22,8 +30,8 @@ CREATE TABLE IF NOT EXISTS attachments (
 
 --bun:split
 
-CREATE TABLE IF NOT EXISTS endpoints (
-    id INTEGER PRIMARY KEY,
+CREATE TABLE endpoints (
+    id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
     internal BOOLEAN NOT NULL,
     internal_id TEXT NOT NULL,
     name TEXT NOT NULL,
@@ -39,8 +47,8 @@ CREATE TABLE IF NOT EXISTS endpoints (
 
 --bun:split
 
-CREATE TABLE IF NOT EXISTS rules (
-    id INTEGER PRIMARY KEY,
+CREATE TABLE rules (
+    id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
     internal BOOLEAN NOT NULL,
     internal_id TEXT NOT NULL,
     name TEXT NOT NULL,