Fix migration package name mismatch

navidrome · May 8, 2024 · a029058 · a029058
1 parent eb93136
commit a029058
Show file tree

Hide file tree

Showing 76 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -61,12 +61,12 @@ snapshots: ##@Development Update (GoLang) Snapshot tests
 
 migration-sql: ##@Development Create an empty SQL migration file
 	@if [ -z "${name}" ]; then echo "Usage: make migration-sql name=name_of_migration_file"; exit 1; fi
-	go run github.com/pressly/goose/v3/cmd/goose@latest -dir db/migration create ${name} sql
+	go run github.com/pressly/goose/v3/cmd/goose@latest -dir db/migrations create ${name} sql
 .PHONY: migration
 
 migration-go: ##@Development Create an empty Go migration file
 	@if [ -z "${name}" ]; then echo "Usage: make migration-go name=name_of_migration_file"; exit 1; fi
-	go run github.com/pressly/goose/v3/cmd/goose@latest -dir db/migration create ${name}
+	go run github.com/pressly/goose/v3/cmd/goose@latest -dir db/migrations create ${name}
 .PHONY: migration
 
 setup-dev: setup

diff --git a/db/db.go b/db/db.go
@@ -7,7 +7,7 @@ import (
 
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/navidrome/navidrome/conf"
-	_ "github.com/navidrome/navidrome/db/migration"
+	_ "github.com/navidrome/navidrome/db/migrations"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/utils/singleton"
 	"github.com/pressly/goose/v3"
@@ -18,10 +18,10 @@ var (
 	Path   string
 )
 
-//go:embed migration/*.sql
+//go:embed migrations/*.sql
 var embedMigrations embed.FS
 
-const migrationsFolder = "migration"
+const migrationsFolder = "migrations"
 
 func Db() *sql.DB {
 	return singleton.GetInstance(func() *sql.DB {

diff --git a/db/migration/20200130083147_create_schema.go → ...igrations/20200130083147_create_schema.go b/db/migration/20200130083147_create_schema.go → ...igrations/20200130083147_create_schema.go
diff --git a/...n/20200131183653_standardize_item_type.go → ...s/20200131183653_standardize_item_type.go b/...n/20200131183653_standardize_item_type.go → ...s/20200131183653_standardize_item_type.go
diff --git a/...0208222418_add_defaults_to_annotations.go → ...0208222418_add_defaults_to_annotations.go b/...0208222418_add_defaults_to_annotations.go → ...0208222418_add_defaults_to_annotations.go
diff --git a/...0200220143731_change_duration_to_float.go → ...0200220143731_change_duration_to_float.go b/...0200220143731_change_duration_to_float.go → ...0200220143731_change_duration_to_float.go
diff --git a/...310171621_enable_search_by_albumartist.go → ...310171621_enable_search_by_albumartist.go b/...310171621_enable_search_by_albumartist.go → ...310171621_enable_search_by_albumartist.go
diff --git a/...1627_add_transcoding_and_player_tables.go → ...1627_add_transcoding_and_player_tables.go b/...1627_add_transcoding_and_player_tables.go → ...1627_add_transcoding_and_player_tables.go
diff --git a/...19211049_merge_search_into_main_tables.go → ...19211049_merge_search_into_main_tables.go b/...19211049_merge_search_into_main_tables.go → ...19211049_merge_search_into_main_tables.go
diff --git a/...ion/20200325185135_add_album_artist_id.go → ...ons/20200325185135_add_album_artist_id.go b/...ion/20200325185135_add_album_artist_id.go → ...ons/20200325185135_add_album_artist_id.go
diff --git a/...0326090707_fix_album_artists_importing.go → ...0326090707_fix_album_artists_importing.go b/...0326090707_fix_album_artists_importing.go → ...0326090707_fix_album_artists_importing.go
diff --git a/...20200327193744_add_year_range_to_album.go → ...20200327193744_add_year_range_to_album.go b/...20200327193744_add_year_range_to_album.go → ...20200327193744_add_year_range_to_album.go
diff --git a/db/migration/20200404214704_add_indexes.go → db/migrations/20200404214704_add_indexes.go b/db/migration/20200404214704_add_indexes.go → db/migrations/20200404214704_add_indexes.go
diff --git a/...002249_enable_search_by_tracks_artists.go → ...002249_enable_search_by_tracks_artists.go b/...002249_enable_search_by_tracks_artists.go → ...002249_enable_search_by_tracks_artists.go
diff --git a/...reated_and_updated_fields_to_playlists.go → ...reated_and_updated_fields_to_playlists.go b/...reated_and_updated_fields_to_playlists.go → ...reated_and_updated_fields_to_playlists.go
diff --git a/...00418110522_reindex_to_fix_album_years.go → ...00418110522_reindex_to_fix_album_years.go b/...00418110522_reindex_to_fix_album_years.go → ...00418110522_reindex_to_fix_album_years.go
diff --git a/...708_reindex_to_change_full_text_search.go → ...708_reindex_to_change_full_text_search.go b/...708_reindex_to_change_full_text_search.go → ...708_reindex_to_change_full_text_search.go
diff --git a/...gration/20200423204116_add_sort_fields.go → ...rations/20200423204116_add_sort_fields.go b/...gration/20200423204116_add_sort_fields.go → ...rations/20200423204116_add_sort_fields.go
diff --git a/...n/20200508093059_add_artist_song_count.go → ...s/20200508093059_add_artist_song_count.go b/...n/20200508093059_add_artist_song_count.go → ...s/20200508093059_add_artist_song_count.go
diff --git a/...ation/20200512104202_add_disc_subtitle.go → ...tions/20200512104202_add_disc_subtitle.go b/...ation/20200512104202_add_disc_subtitle.go → ...tions/20200512104202_add_disc_subtitle.go
diff --git a/...200516140647_add_playlist_tracks_table.go → ...200516140647_add_playlist_tracks_table.go b/...200516140647_add_playlist_tracks_table.go → ...200516140647_add_playlist_tracks_table.go
diff --git a/...n/20200608153717_referential_integrity.go → ...s/20200608153717_referential_integrity.go b/...n/20200608153717_referential_integrity.go → ...s/20200608153717_referential_integrity.go
diff --git a/...0200706231659_add_default_transcodings.go → ...0200706231659_add_default_transcodings.go b/...0200706231659_add_default_transcodings.go → ...0200706231659_add_default_transcodings.go
diff --git a/...ation/20200710211442_add_playlist_path.go → ...tions/20200710211442_add_playlist_path.go b/...ation/20200710211442_add_playlist_path.go → ...tions/20200710211442_add_playlist_path.go
diff --git a/...0200731095603_create_play_queues_table.go → ...0200731095603_create_play_queues_table.go b/...0200731095603_create_play_queues_table.go → ...0200731095603_create_play_queues_table.go
diff --git a/...n/20200801101355_create_bookmark_table.go → ...s/20200801101355_create_bookmark_table.go b/...n/20200801101355_create_bookmark_table.go → ...s/20200801101355_create_bookmark_table.go
diff --git a/...819111809_drop_email_unique_constraint.go → ...819111809_drop_email_unique_constraint.go b/...819111809_drop_email_unique_constraint.go → ...819111809_drop_email_unique_constraint.go
diff --git a/...on/20201003111749_add_starred_at_index.go → ...ns/20201003111749_add_starred_at_index.go b/...on/20201003111749_add_starred_at_index.go → ...ns/20201003111749_add_starred_at_index.go
diff --git a/...igration/20201010162350_add_album_size.go → ...grations/20201010162350_add_album_size.go b/...igration/20201010162350_add_album_size.go → ...grations/20201010162350_add_album_size.go
diff --git a/...0201012210022_add_artist_playlist_size.go → ...0201012210022_add_artist_playlist_size.go b/...0201012210022_add_artist_playlist_size.go → ...0201012210022_add_artist_playlist_size.go
diff --git a/db/migration/20201021085410_add_mbids.go → db/migrations/20201021085410_add_mbids.go b/db/migration/20201021085410_add_mbids.go → db/migrations/20201021085410_add_mbids.go
diff --git a/.../20201021093209_add_media_file_indexes.go → .../20201021093209_add_media_file_indexes.go b/.../20201021093209_add_media_file_indexes.go → .../20201021093209_add_media_file_indexes.go
diff --git a/...1021135455_add_media_file_artist_index.go → ...1021135455_add_media_file_artist_index.go b/...1021135455_add_media_file_artist_index.go → ...1021135455_add_media_file_artist_index.go
diff --git a/...n/20201030162009_add_artist_info_table.go → ...s/20201030162009_add_artist_info_table.go b/...n/20201030162009_add_artist_info_table.go → ...s/20201030162009_add_artist_info_table.go
diff --git a/...20201110205344_add_comments_and_lyrics.go → ...20201110205344_add_comments_and_lyrics.go b/...20201110205344_add_comments_and_lyrics.go → ...20201110205344_add_comments_and_lyrics.go
diff --git a/...on/20201128100726_add_real-path_option.go → ...ns/20201128100726_add_real-path_option.go b/...on/20201128100726_add_real-path_option.go → ...ns/20201128100726_add_real-path_option.go
diff --git a/...1213124814_add_all_artist_ids_to_album.go → ...1213124814_add_all_artist_ids_to_album.go b/...1213124814_add_all_artist_ids_to_album.go → ...1213124814_add_all_artist_ids_to_album.go
diff --git a/...n/20210322132848_add_timestamp_indexes.go → ...s/20210322132848_add_timestamp_indexes.go b/...n/20210322132848_add_timestamp_indexes.go → ...s/20210322132848_add_timestamp_indexes.go
diff --git a/...tion/20210418232815_fix_album_comments.go → ...ions/20210418232815_fix_album_comments.go b/...tion/20210418232815_fix_album_comments.go → ...ions/20210418232815_fix_album_comments.go
diff --git a/...ration/20210430212322_add_bpm_metadata.go → ...ations/20210430212322_add_bpm_metadata.go b/...ration/20210430212322_add_bpm_metadata.go → ...ations/20210430212322_add_bpm_metadata.go
diff --git a/...ion/20210530121921_create_shares_table.go → ...ons/20210530121921_create_shares_table.go b/...ion/20210530121921_create_shares_table.go → ...ons/20210530121921_create_shares_table.go
diff --git a/...20210601231734_update_share_fieldnames.go → ...20210601231734_update_share_fieldnames.go b/...20210601231734_update_share_fieldnames.go → ...20210601231734_update_share_fieldnames.go
diff --git a/...n/20210616150710_encrypt_all_passwords.go → ...s/20210616150710_encrypt_all_passwords.go b/...n/20210616150710_encrypt_all_passwords.go → ...s/20210616150710_encrypt_all_passwords.go
diff --git a/...716_drop_player_name_unique_constraint.go → ...716_drop_player_name_unique_constraint.go b/...716_drop_player_name_unique_constraint.go → ...716_drop_player_name_unique_constraint.go
diff --git a/...dd_user_prefs_player_scrobbler_enabled.go → ...dd_user_prefs_player_scrobbler_enabled.go b/...dd_user_prefs_player_scrobbler_enabled.go → ...dd_user_prefs_player_scrobbler_enabled.go
diff --git a/...dd_referential_integrity_to_user_props.go → ...dd_referential_integrity_to_user_props.go b/...dd_referential_integrity_to_user_props.go → ...dd_referential_integrity_to_user_props.go
diff --git a/...ion/20210626213026_add_scrobble_buffer.go → ...ons/20210626213026_add_scrobble_buffer.go b/...ion/20210626213026_add_scrobble_buffer.go → ...ons/20210626213026_add_scrobble_buffer.go
diff --git a/...ration/20210715151153_add_genre_tables.go → ...ations/20210715151153_add_genre_tables.go b/...ration/20210715151153_add_genre_tables.go → ...ations/20210715151153_add_genre_tables.go
diff --git a/.../20210821212604_add_mediafile_channels.go → .../20210821212604_add_mediafile_channels.go b/.../20210821212604_add_mediafile_channels.go → .../20210821212604_add_mediafile_channels.go
diff --git a/...tion/20211008205505_add_smart_playlist.go → ...ions/20211008205505_add_smart_playlist.go b/...tion/20211008205505_add_smart_playlist.go → ...ions/20211008205505_add_smart_playlist.go
diff --git a/...23184825_add_order_title_to_media_file.go → ...23184825_add_order_title_to_media_file.go b/...23184825_add_order_title_to_media_file.go → ...23184825_add_order_title_to_media_file.go
diff --git a/...026191915_unescape_lyrics_and_comments.go → ...026191915_unescape_lyrics_and_comments.go b/...026191915_unescape_lyrics_and_comments.go → ...026191915_unescape_lyrics_and_comments.go
diff --git a/.../20211029213200_add_userid_to_playlist.go → .../20211029213200_add_userid_to_playlist.go b/.../20211029213200_add_userid_to_playlist.go → .../20211029213200_add_userid_to_playlist.go
diff --git a/...15414_add_alphabetical_by_artist_index.go → ...15414_add_alphabetical_by_artist_index.go b/...15414_add_alphabetical_by_artist_index.go → ...15414_add_alphabetical_by_artist_index.go
diff --git a/...211105162746_remove_invalid_artist_ids.go → ...211105162746_remove_invalid_artist_ids.go b/...211105162746_remove_invalid_artist_ids.go → ...211105162746_remove_invalid_artist_ids.go
diff --git a/...31849_add_musicbrainz_release_track_id.go → ...31849_add_musicbrainz_release_track_id.go b/...31849_add_musicbrainz_release_track_id.go → ...31849_add_musicbrainz_release_track_id.go
diff --git a/...n/20221219112733_add_album_image_paths.go → ...s/20221219112733_add_album_image_paths.go b/...n/20221219112733_add_album_image_paths.go → ...s/20221219112733_add_album_image_paths.go
diff --git a/...ion/20221219140528_remove_cover_art_id.go → ...ons/20221219140528_remove_cover_art_id.go b/...ion/20221219140528_remove_cover_art_id.go → ...ons/20221219140528_remove_cover_art_id.go
diff --git a/...gration/20230112111457_add_album_paths.go → ...rations/20230112111457_add_album_paths.go b/...gration/20230112111457_add_album_paths.go → ...rations/20230112111457_add_album_paths.go
diff --git a/...gration/20230114121537_touch_playlists.go → ...rations/20230114121537_touch_playlists.go b/...gration/20230114121537_touch_playlists.go → ...rations/20230114121537_touch_playlists.go
diff --git a/...n/20230115103212_create_internet_radio.go → ...s/20230115103212_create_internet_radio.go b/...n/20230115103212_create_internet_radio.go → ...s/20230115103212_create_internet_radio.go
diff --git a/...20230117155559_add_replaygain_metadata.go → ...20230117155559_add_replaygain_metadata.go b/...20230117155559_add_replaygain_metadata.go → ...20230117155559_add_replaygain_metadata.go
diff --git a/...igration/20230117180400_add_album_info.go → ...grations/20230117180400_add_album_info.go b/...igration/20230117180400_add_album_info.go → ...grations/20230117180400_add_album_info.go
diff --git a/...on/20230119152657_recreate_share_table.go → ...ns/20230119152657_recreate_share_table.go b/...on/20230119152657_recreate_share_table.go → ...ns/20230119152657_recreate_share_table.go
diff --git a/...30202143713_change_path_list_separator.go → ...30202143713_change_path_list_separator.go b/...30202143713_change_path_list_separator.go → ...30202143713_change_path_list_separator.go
diff --git a/...1414_change_image_files_list_separator.go → ...1414_change_image_files_list_separator.go b/...1414_change_image_files_list_separator.go → ...1414_change_image_files_list_separator.go
diff --git a/...n/20230310222612_add_download_to_share.go → ...s/20230310222612_add_download_to_share.go b/...n/20230310222612_add_download_to_share.go → ...s/20230310222612_add_download_to_share.go
diff --git a/...on/20230404104309_empty_sql_migration.sql → ...ns/20230404104309_empty_sql_migration.sql b/...on/20230404104309_empty_sql_migration.sql → ...ns/20230404104309_empty_sql_migration.sql
diff --git a/...ration/20230515184510_add_release_date.go → ...ations/20230515184510_add_release_date.go b/...ration/20230515184510_add_release_date.go → ...ations/20230515184510_add_release_date.go
diff --git a/...214944_rename_musicbrainz_recording_id.go → ...214944_rename_musicbrainz_recording_id.go b/...214944_rename_musicbrainz_recording_id.go → ...214944_rename_musicbrainz_recording_id.go
diff --git a/...tion/20231208182311_add_discs_to_album.go → ...ions/20231208182311_add_discs_to_album.go b/...tion/20231208182311_add_discs_to_album.go → ...ions/20231208182311_add_discs_to_album.go
diff --git a/...tion/20231209211223_alter_lyric_column.go → ...ions/20231209211223_alter_lyric_column.go b/...tion/20231209211223_alter_lyric_column.go → ...ions/20231209211223_alter_lyric_column.go
diff --git a/..._add_default_values_to_null_columns.go.go → ..._add_default_values_to_null_columns.go.go b/..._add_default_values_to_null_columns.go.go → ..._add_default_values_to_null_columns.go.go
diff --git a/...240426202913_add_id_to_scrobble_buffer.go → ...240426202913_add_id_to_scrobble_buffer.go b/...240426202913_add_id_to_scrobble_buffer.go → ...240426202913_add_id_to_scrobble_buffer.go
diff --git a/db/migration/migration.go → db/migrations/migration.go b/db/migration/migration.go → db/migrations/migration.go
diff --git a/reflex.conf b/reflex.conf
@@ -1 +1 @@
--s -r "(\.go$$|\.cpp$$|\.h$$|navidrome.toml|resources|token_received.html)" -R "(^ui|^data|^db/migration)" -- go run -race -tags netgo .
+-s -r "(\.go$$|\.cpp$$|\.h$$|navidrome.toml|resources|token_received.html)" -R "(^ui|^data|^db/migrations)" -- go run -race -tags netgo .