go-shiori/shiori
1
1
Fork 0
mirror of https://github.com/go-shiori/shiori.git synced 2025-03-10 23:05:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix: not checking for nil-pointer errors on migrations (#906)

Browse source
This commit is contained in:
Felipe Martin 2024-05-12 19:07:16 +02:00 committed by GitHub
parent eaa6f0ea2a
commit a6e55705da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/database/mysql.go
View file

@ -32,7 +32,7 @@ var mysqlMigrations = []migration{
defer tx.Rollback()
_, err = tx.Exec(`ALTER TABLE bookmark ADD COLUMN has_content BOOLEAN DEFAULT 0`)
if strings.Contains(err.Error(), `Duplicate column name`) {
if err != nil && strings.Contains(err.Error(), `Duplicate column name`) {
tx.Rollback()
} else if err != nil {
return fmt.Errorf("failed to add has_content column to bookmark table: %w", err)
@ -49,7 +49,7 @@ var mysqlMigrations = []migration{
defer tx.Rollback()
_, err = tx.Exec(`ALTER TABLE account ADD COLUMN config JSON NOT NULL DEFAULT '{}'`)
if strings.Contains(err.Error(), `Duplicate column name`) {
if err != nil && strings.Contains(err.Error(), `Duplicate column name`) {
tx.Rollback()
} else if err != nil {
return fmt.Errorf("failed to add config column to account table: %w", err)

4
internal/database/pg.go
View file

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

4
internal/database/sqlite.go
View file

@ -29,7 +29,7 @@ var sqliteMigrations = []migration{
defer tx.Rollback()
_, err = tx.Exec(`ALTER TABLE bookmark ADD COLUMN has_content BOOLEAN DEFAULT FALSE NOT NULL`)
if strings.Contains(err.Error(), `duplicate column name`) {
if err != nil && strings.Contains(err.Error(), `duplicate column name`) {
tx.Rollback()
} else if err != nil {
return fmt.Errorf("failed to add has_content column to bookmark table: %w", err)
@ -46,7 +46,7 @@ var sqliteMigrations = []migration{
defer tx.Rollback()
_, err = tx.Exec(`ALTER TABLE account ADD COLUMN config JSON NOT NULL DEFAULT '{}'`)
if strings.Contains(err.Error(), `duplicate column name`) {
if err != nil && strings.Contains(err.Error(), `duplicate column name`) {
tx.Rollback()
} else if err != nil {
return fmt.Errorf("failed to add config column to account table: %w", err)