check non-nil err

go-shiori · May 12, 2024 · e65b18e · e65b18e
1 parent c107e97
commit e65b18e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/internal/database/pg.go b/internal/database/pg.go
@@ -28,7 +28,7 @@ var postgresMigrations = []migration{
 		defer tx.Rollback()
 
 		_, err = tx.Exec(`ALTER TABLE bookmark ADD COLUMN has_content BOOLEAN DEFAULT FALSE NOT NULL`)
-		if strings.Contains(err.Error(), `column "has_content" of relation "bookmark" already exists`) {
+		if err != nil && strings.Contains(err.Error(), `column "has_content" of relation "bookmark" already exists`) {
 			tx.Rollback()
 		} else if err != nil {
 			return fmt.Errorf("failed to add has_content column to bookmark table: %w", err)
@@ -45,7 +45,7 @@ var postgresMigrations = []migration{
 		defer tx.Rollback()
 
 		_, err = tx.Exec(`ALTER TABLE account ADD COLUMN config JSONB NOT NULL DEFAULT '{}'`)
-		if strings.Contains(err.Error(), `column "config" of relation "account" already exists`) {
+		if err != nil && strings.Contains(err.Error(), `column "config" of relation "account" already exists`) {
 			tx.Rollback()
 		} else if err != nil {
 			return fmt.Errorf("failed to add config column to account table: %w", err)