Compare commits

...

2 Commits

Author SHA1 Message Date
Mike Holloway
5bbe08ded5 new file: .gitignore
delve debug, vim swap files
new file:   anvildb.go
	ConnectAnvilDB func
modified:   main.go
	Moving things around, investigating interface references
modified:   models.go
	Removed previous AnvilDB, AnvilData struct work
2024-08-25 12:55:41 -04:00
Mike Holloway
b886c39ac9 go fmt 2024-08-24 23:12:58 -04:00
4 changed files with 105 additions and 63 deletions

2
.gitignore vendored Normal file
View File

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

24
anvildb.go Normal file
View File

@ -0,0 +1,24 @@
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,56 +1,72 @@
package main package main
import ( import (
"fmt" "context"
"context"
"errors" "errors"
"database/sql" "fmt"
"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())
db.AddQueryHook(bundebug.NewQueryHook( anvildb := ConnectAnvilDB(dsn)
bundebug.WithVerbose(true), // Turn these into funcs with error handling, logging, return vals etc.
bundebug.FromEnv("BUNDEBUG"), feederr := anvildb.NewSelect().
)) Model(&Feed{}).
OrderExpr("title ASC").
Limit(10).
Scan(ctx, &feeds)
if feederr != nil {
// Turn these into funcs with error handling, logging, return vals etc. errors.Join(feederr, err)
feederr := db.NewSelect().Model(&feeds).OrderExpr("title ASC").Limit(10).Scan(ctx) }
categoryerr := anvildb.NewSelect().
if feederr != nil { Model(&Category{}).
errors.Join(feederr, err) OrderExpr("title ASC").
} Scan(ctx, &categories)
categoryerr := db.NewSelect().Model(&categories).OrderExpr("title ASC").Scan(ctx) if categoryerr != nil {
if categoryerr != nil { errors.Join(categoryerr, err)
errors.Join(categoryerr, err) }
} entryerr := anvildb.NewSelect().
entryerr := db.NewSelect().Model(&entries).OrderExpr("published_at ASC").Limit(10).Scan(ctx) Model(&Entry{}).
if entryerr != nil { OrderExpr("published_at ASC").
errors.Join(entryerr, err) Limit(10).
} Scan(ctx, &entries)
usererr := db.NewSelect().Model(&users).OrderExpr("id ASC").Scan(ctx) if entryerr != nil {
if usererr != nil { errors.Join(entryerr, err)
errors.Join(usererr, err) }
} usererr := anvildb.NewSelect().
fmt.Printf("%+v\n", entries) Model(&User{}).
fmt.Printf("%+v\n", categories) OrderExpr("id ASC").
fmt.Printf("%+v\n", feeds) Scan(ctx, &users)
fmt.Printf("%+v\n", users) if usererr != nil {
// 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;
} }