Compare commits

..

No commits in common. "5bbe08ded5d06ceb45322e407aa4db628b870d6f" and "ff6de847317e1c04d9318f9f035faf3275ee5cb7" have entirely different histories.

4 changed files with 63 additions and 105 deletions

2
.gitignore vendored
View File

@ -1,2 +0,0 @@
__debug*
.*.sw*

View File

@ -1,24 +0,0 @@
package main
import (
"database/sql"
"github.com/uptrace/bun"
"github.com/uptrace/bun/dialect/pgdialect"
"github.com/uptrace/bun/driver/pgdriver"
"github.com/uptrace/bun/extra/bundebug"
)
func ConnectAnvilDB(dsn string) *bun.DB {
sqldb := sql.OpenDB(pgdriver.NewConnector(pgdriver.WithDSN(dsn)))
db := bun.NewDB(sqldb, pgdialect.New())
db.AddQueryHook(bundebug.NewQueryHook(
bundebug.WithVerbose(true),
bundebug.FromEnv("BUNDEBUG"),
))
return db
}
//func GetFeeds(db *bun.DB)

106
main.go
View File

@ -1,72 +1,56 @@
package main package main
import ( import (
"context" "fmt"
"context"
"errors" "errors"
"fmt" "database/sql"
"github.com/uptrace/bun"
"github.com/uptrace/bun/extra/bundebug"
"github.com/uptrace/bun/dialect/pgdialect"
"github.com/uptrace/bun/driver/pgdriver"
) )
var feeds []Feed var feeds []Feed
var categories []Category var categories []Category
var entries []Entry var entries []Entry
var users []User var users []User
func main() { func main() {
var err error var err error
ctx := context.Background() ctx := context.Background()
dsn := "postgres://apache:@localhost:5432/miniflux?sslmode=disable" dsn := "postgres://apache:@localhost:5432/miniflux?sslmode=disable"
// dsn := "unix://user:pass@dbname/var/run/postgresql/.s.PGSQL.5432" // dsn := "unix://user:pass@dbname/var/run/postgresql/.s.PGSQL.5432"
sqldb := sql.OpenDB(pgdriver.NewConnector(pgdriver.WithDSN(dsn)))
db := bun.NewDB(sqldb, pgdialect.New())
anvildb := ConnectAnvilDB(dsn) db.AddQueryHook(bundebug.NewQueryHook(
// Turn these into funcs with error handling, logging, return vals etc. bundebug.WithVerbose(true),
feederr := anvildb.NewSelect(). bundebug.FromEnv("BUNDEBUG"),
Model(&Feed{}). ))
OrderExpr("title ASC").
Limit(10).
Scan(ctx, &feeds)
if feederr != nil {
errors.Join(feederr, err) // Turn these into funcs with error handling, logging, return vals etc.
} feederr := db.NewSelect().Model(&feeds).OrderExpr("title ASC").Limit(10).Scan(ctx)
categoryerr := anvildb.NewSelect().
Model(&Category{}). if feederr != nil {
OrderExpr("title ASC"). errors.Join(feederr, err)
Scan(ctx, &categories) }
if categoryerr != nil { categoryerr := db.NewSelect().Model(&categories).OrderExpr("title ASC").Scan(ctx)
errors.Join(categoryerr, err) if categoryerr != nil {
} errors.Join(categoryerr, err)
entryerr := anvildb.NewSelect(). }
Model(&Entry{}). entryerr := db.NewSelect().Model(&entries).OrderExpr("published_at ASC").Limit(10).Scan(ctx)
OrderExpr("published_at ASC"). if entryerr != nil {
Limit(10). errors.Join(entryerr, err)
Scan(ctx, &entries) }
if entryerr != nil { usererr := db.NewSelect().Model(&users).OrderExpr("id ASC").Scan(ctx)
errors.Join(entryerr, err) if usererr != nil {
} errors.Join(usererr, err)
usererr := anvildb.NewSelect(). }
Model(&User{}). fmt.Printf("%+v\n", entries)
OrderExpr("id ASC"). fmt.Printf("%+v\n", categories)
Scan(ctx, &users) fmt.Printf("%+v\n", feeds)
if usererr != nil { fmt.Printf("%+v\n", users)
errors.Join(usererr, err) //
}
for _, val := range entries {
fmt.Printf("val = %s\n", val)
}
for _, val := range categories {
fmt.Printf("val = %s\n", val)
}
for _, val := range feeds {
fmt.Printf("val = %s\n", val)
}
for _, val := range users {
fmt.Printf("val = %s\n", val)
}
// fmt.Printf("%+v\n", entries)
// fmt.Printf("%+v\n", categories)
// fmt.Printf("%+v\n", feeds)
// fmt.Printf("%+v\n", users)
} }

View File

@ -5,33 +5,33 @@ import (
) )
type User struct { type User struct {
bun.BaseModel `bun:"table:users"` bun.BaseModel `bun:"table:users"`
ID int64 `bun:"id,pk,autoincrement"` ID int64 `bun:"id,pk,autoincrement"`
Username string `bun:"username"` Username string `bun:"username"`
} }
type Feed struct { type Feed struct {
bun.BaseModel `bun:"table:feeds"` bun.BaseModel `bun:"table:feeds"`
ID int64 `bun:"id,pk,autoincrement"` ID int64 `bun:"id,pk,autoincrement"`
CategoryID int64 `bun:"category_id"` CategoryID int64 `bun:"category_id"`
Title string `bun:"title"` Title string `bun:"title"`
// SELECT id,category_id,title FROM feeds ORDER BY id; //SELECT id,category_id,title FROM feeds ORDER BY id;
} }
type Entry struct { type Entry struct {
bun.BaseModel `bun:"table:entries"` bun.BaseModel `bun:"table:entries"`
ID int64 `bun:"id,pk,autoincrement"` ID int64 `bun:"id,pk,autoincrement"`
Title string `bun:"title"` Title string `bun:"title"`
Author string `bun:"author"` Author string `bun:"author"`
// SELECT id,title,author FROM entries ORDER BY published_at LIMIT 10; //SELECT id,title,author FROM entries ORDER BY published_at LIMIT 10;
} }
type Category struct { type Category struct {
bun.BaseModel `bun:"table:categories"` bun.BaseModel `bun:"table:categories"`
ID int64 `bun:"id,pk,autoincrement"` ID int64 `bun:"id,pk,autoincrement"`
Title string `bun:"title"` Title string `bun:"title"`
//SELECT id,title from categories; //SELECT id,title from categories;
} }