.gitignore

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

anvildb.go

@@ -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)

main.go

@@ -1,9 +1,14 @@
 package main
 
 import (
+        "fmt"
         "context"
 	"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
@@ -16,57 +21,36 @@ func main() {
   ctx := context.Background()
   dsn := "postgres://apache:@localhost:5432/miniflux?sslmode=disable"
   // 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(
+  	bundebug.WithVerbose(true),
+  	bundebug.FromEnv("BUNDEBUG"),
+  ))
+
   
-	anvildb := ConnectAnvilDB(dsn)
   // Turn these into funcs with error handling, logging, return vals etc. 
-	feederr := anvildb.NewSelect().
-		Model(&Feed{}).
-		OrderExpr("title ASC").
-		Limit(10).
-		Scan(ctx, &feeds)
+  feederr := db.NewSelect().Model(&feeds).OrderExpr("title ASC").Limit(10).Scan(ctx)
   
   if feederr != nil {
     errors.Join(feederr, err)
   }
-	categoryerr := anvildb.NewSelect().
-		Model(&Category{}).
-		OrderExpr("title ASC").
-		Scan(ctx, &categories)
+  categoryerr := db.NewSelect().Model(&categories).OrderExpr("title ASC").Scan(ctx)
   if categoryerr != nil {
     errors.Join(categoryerr, err)
   }
-	entryerr := anvildb.NewSelect().
-		Model(&Entry{}).
-		OrderExpr("published_at ASC").
-		Limit(10).
-		Scan(ctx, &entries)
+  entryerr := db.NewSelect().Model(&entries).OrderExpr("published_at ASC").Limit(10).Scan(ctx)
   if entryerr != nil {
     errors.Join(entryerr, err)
   }
-	usererr := anvildb.NewSelect().
-		Model(&User{}).
-		OrderExpr("id ASC").
-		Scan(ctx, &users)
+  usererr := db.NewSelect().Model(&users).OrderExpr("id ASC").Scan(ctx)
   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)
+  fmt.Printf("%+v\n", entries)
+  fmt.Printf("%+v\n", categories)
+  fmt.Printf("%+v\n", feeds)
+  fmt.Printf("%+v\n", users)
+// 
 }