add new seed command, use Makefile for migrations before seed

2 files changed, 3 insertions, 30 deletions

diff --git a/seed/seeder/seeder.go b/seed/seeder/seeder.go
index 37dfe30..323d2ac 100644
--- a/seed/seeder/seeder.go
+++ b/seed/seeder/seeder.go
@@ -28,12 +28,13 @@ func NewSeeder(dbconn *db.Db) *Seeder {
 func (s *Seeder) SeedUsers(num int) error {
 	user.InitHooks()
 	for i := 1; i <= num; i++ {
-		log.Printf("seeding=%d", i)
 		u := &models.User{}
 		u.Username = faker.Username()
 		u.Secret = faker.Password()
 
-		err := beginSeed(s.dbconn, u.Insert)
+		log.Printf("seeding user=%s", u.Username)
+		// err := beginSeed(s.dbconn, u.Insert)
+		err := u.Insert(context.Background(), s.dbconn.ToSqlDb(), boil.Infer())
 		if err != nil {
 			return err
 		}
diff --git a/seed/seeder/tern.go b/seed/seeder/tern.go
deleted file mode 100644
index 8eff9d5..0000000
--- a/seed/seeder/tern.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package seeder
-
-import (
-	"context"
-	"os"
-
-	"github.com/jackc/tern/v2/migrate"
-	"gitlab.com/alexkavon/newsstand/src/db"
-)
-
-func MigrateDatabase(dbpool *db.Db, migrationspath string) error {
-	conn, err := dbpool.Conn().Acquire(context.Background())
-	if err != nil {
-		return err
-	}
-	m, err := migrate.NewMigrator(context.Background(), conn.Conn(), "public.schema_version")
-	if err != nil {
-		return err
-	}
-	// load migration files
-	err = m.LoadMigrations(os.DirFS(migrationspath))
-	if err != nil {
-		return err
-	}
-
-	// migrate!
-	return m.Migrate(context.Background())
-}