feat(main): Reworked database instrumentation

http-demo/Makefile

@@ -1,3 +1,5 @@
+.PHONY: up down fresh logs test lint migrate sqlc
+
 up:
 	@if [ ! -f .env ]; then \
         cp .env.example .env; \
@@ -23,3 +25,9 @@ test:
 
 lint:
 	golangci-lint run -v
+
+sqlc:
+	docker run --rm -u $$(id -u):$$(id -g) -v ./:/src -w /src sqlc/sqlc $(filter-out $@,$(MAKECMDGOALS))
+
+%:
+    @:

http-demo/configs/config.dev.yaml

@@ -3,9 +3,6 @@ app:
 modules:
   log:
     output: console
-  orm:
-    driver: mysql
-    dsn: ${MYSQL_USER}:${MYSQL_PASSWORD}@tcp(${MYSQL_HOST}:${MYSQL_PORT})/${MYSQL_DATABASE}?parseTime=true
   trace:
     processor:
       type: otlp-grpc

http-demo/configs/config.test.yaml

@@ -1,9 +1,11 @@
 app:
   debug: true
 modules:
-  orm:
+  sql:
     driver: sqlite
     dsn: ":memory:"
+    migrations:
+      stdout: false
   log:
     output: test
   trace:
@@ -15,3 +17,8 @@ config:
     secret: ${AUTH_SECRET}
   dashboard:
     title: Test dashboard title
+  seed:
+    gophers:
+      alice: architect
+      bob: builder
+      carl: carpenter

http-demo/configs/config.yaml

@@ -56,14 +56,24 @@ modules:
       templates:
         enabled: true
         path: templates/*.html
-  orm:
+  sql:
+    driver: mysql
+    dsn: ${MYSQL_USER}:${MYSQL_PASSWORD}@tcp(${MYSQL_HOST}:${MYSQL_PORT})/${MYSQL_DATABASE}?parseTime=true
+    migrations:
+      path: db/migrations
     log:
       enabled: true
-      level: info
-      values: true
+      level: debug
+      arguments: true
+      exclude:
+        - "connection:ping"
+        - "connection:reset-session"
     trace:
       enabled: true
-      values: true
+      arguments: true
+      exclude:
+        - "connection:ping"
+        - "connection:reset-session"
   log:
     level: debug
 config:

http-demo/db/migrations/00001_create_gophers_table.sql

@@ -0,0 +1,9 @@
+-- +goose Up
+CREATE TABLE gophers (
+    id   INTEGER NOT NULL PRIMARY KEY /*!40101 AUTO_INCREMENT */,
+    name VARCHAR(255) NOT NULL,
+    job  VARCHAR(255)
+);
+
+-- +goose Down
+DROP TABLE IF EXISTS gophers;

http-demo/db/queries/gophers.sql

@@ -0,0 +1,19 @@
+-- name: ListGophers :many
+SELECT g.* FROM gophers AS g
+ORDER BY g.name;
+
+-- name: GetGopher :one
+SELECT g.* FROM gophers AS g
+WHERE g.id = ?
+LIMIT 1;
+
+-- name: CreateGopher :execresult
+INSERT INTO gophers (
+    name, job
+) VALUES (
+    ?, ?
+);
+
+-- name: DeleteGopher :exec
+DELETE FROM gophers
+WHERE id = ?;

http-demo/db/seeds/gophers.go

@@ -0,0 +1,33 @@
+package seeds
+
+import (
+	"context"
+	"database/sql"
+
+	"github.com/ankorstore/yokai/config"
+)
+
+type GophersSeed struct {
+	config *config.Config
+}
+
+func NewGophersSeed(config *config.Config) *GophersSeed {
+	return &GophersSeed{
+		config: config,
+	}
+}
+
+func (s *GophersSeed) Name() string {
+	return "gophers"
+}
+
+func (s *GophersSeed) Run(ctx context.Context, db *sql.DB) error {
+	for name, job := range s.config.GetStringMapString("config.seed.gophers") {
+		_, err := db.ExecContext(ctx, "INSERT INTO gophers (name, job) VALUES (?, ?)", name, job)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

http-demo/docker-compose.yaml

@@ -6,6 +6,8 @@ services:
     build:
       dockerfile: dev.Dockerfile
       context: .
+    depends_on:
+      - http-demo-database
     networks:
       - http-demo
     ports:
@@ -25,6 +27,10 @@ services:
     restart: always
     networks:
       - http-demo
+    ports:
+      - "3306:3306"
+    expose:
+      - "3306"
     volumes:
       - http-demo-database-data:/var/lib/mysql
     env_file: