From 29007b1b886e7455ece5aa6e4d477805209fad88 Mon Sep 17 00:00:00 2001
From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>
Date: Fri, 8 Nov 2024 13:51:23 +0000
Subject: [chore] update bun libraries to v1.2.5 (#3528)

* update bun libraries to v1.2.5

* pin old v1.29.0 of otel
---
 vendor/github.com/uptrace/bun/migrate/migrations.go | 4 ----
 vendor/github.com/uptrace/bun/migrate/migrator.go   | 5 ++++-
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'vendor/github.com/uptrace/bun/migrate')

diff --git a/vendor/github.com/uptrace/bun/migrate/migrations.go b/vendor/github.com/uptrace/bun/migrate/migrations.go
index 289735270..1a7ea5668 100644
--- a/vendor/github.com/uptrace/bun/migrate/migrations.go
+++ b/vendor/github.com/uptrace/bun/migrate/migrations.go
@@ -96,10 +96,6 @@ func (m *Migrations) Discover(fsys fs.FS) error {
 		}
 
 		migration := m.getOrCreateMigration(name)
-		if err != nil {
-			return err
-		}
-
 		migration.Comment = comment
 		migrationFunc := NewSQLMigrationFunc(fsys, path)
 
diff --git a/vendor/github.com/uptrace/bun/migrate/migrator.go b/vendor/github.com/uptrace/bun/migrate/migrator.go
index 33c5bd16f..e6d70e39f 100644
--- a/vendor/github.com/uptrace/bun/migrate/migrator.go
+++ b/vendor/github.com/uptrace/bun/migrate/migrator.go
@@ -362,7 +362,10 @@ func (m *Migrator) MarkUnapplied(ctx context.Context, migration *Migration) erro
 }
 
 func (m *Migrator) TruncateTable(ctx context.Context) error {
-	_, err := m.db.NewTruncateTable().TableExpr(m.table).Exec(ctx)
+	_, err := m.db.NewTruncateTable().
+		Model((*Migration)(nil)).
+		ModelTableExpr(m.table).
+		Exec(ctx)
 	return err
 }
 
-- 
cgit v1.3