diff --git a/internal/commands/migrations.go b/internal/commands/migrations.go index ab346a66e..564fc1a08 100644 --- a/internal/commands/migrations.go +++ b/internal/commands/migrations.go @@ -12,7 +12,7 @@ import ( "github.com/urfave/cli" "github.com/photoprism/photoprism/internal/config" - "github.com/photoprism/photoprism/internal/migrate" + "github.com/photoprism/photoprism/internal/entity/migrate" "github.com/photoprism/photoprism/pkg/report" ) diff --git a/internal/commands/reset.go b/internal/commands/reset.go index a0de70fe1..b5f0d0a95 100644 --- a/internal/commands/reset.go +++ b/internal/commands/reset.go @@ -8,14 +8,13 @@ import ( "regexp" "time" - "github.com/photoprism/photoprism/internal/migrate" - "github.com/manifoldco/promptui" "github.com/sirupsen/logrus" "github.com/urfave/cli" "github.com/photoprism/photoprism/internal/config" "github.com/photoprism/photoprism/internal/entity" + "github.com/photoprism/photoprism/internal/entity/migrate" ) // ResetCommand configures the command name, flags, and action. diff --git a/internal/config/config_db.go b/internal/config/config_db.go index b937a0746..7fdd8697f 100644 --- a/internal/config/config_db.go +++ b/internal/config/config_db.go @@ -15,7 +15,7 @@ import ( _ "github.com/jinzhu/gorm/dialects/sqlite" "github.com/photoprism/photoprism/internal/entity" - "github.com/photoprism/photoprism/internal/migrate" + "github.com/photoprism/photoprism/internal/entity/migrate" "github.com/photoprism/photoprism/internal/mutex" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/txt" diff --git a/internal/entity/entity_fixtures.go b/internal/entity/entity_fixtures.go index 0a63e03ce..dc04fa8d7 100644 --- a/internal/entity/entity_fixtures.go +++ b/internal/entity/entity_fixtures.go @@ -3,7 +3,7 @@ package entity import ( "time" - "github.com/photoprism/photoprism/internal/migrate" + "github.com/photoprism/photoprism/internal/entity/migrate" ) // CreateDefaultFixtures inserts default fixtures for test and production. diff --git a/internal/entity/entity_init.go b/internal/entity/entity_init.go index 1572477d7..c422091d7 100644 --- a/internal/entity/entity_init.go +++ b/internal/entity/entity_init.go @@ -4,7 +4,7 @@ import ( "os" "time" - "github.com/photoprism/photoprism/internal/migrate" + "github.com/photoprism/photoprism/internal/entity/migrate" "github.com/photoprism/photoprism/pkg/clean" ) diff --git a/internal/entity/entity_tables.go b/internal/entity/entity_tables.go index 442707807..cfcd5257c 100644 --- a/internal/entity/entity_tables.go +++ b/internal/entity/entity_tables.go @@ -7,7 +7,7 @@ import ( "github.com/jinzhu/gorm" - "github.com/photoprism/photoprism/internal/migrate" + "github.com/photoprism/photoprism/internal/entity/migrate" "github.com/photoprism/photoprism/pkg/clean" ) diff --git a/internal/migrate/dialect_mysql.go b/internal/entity/migrate/dialect_mysql.go similarity index 100% rename from internal/migrate/dialect_mysql.go rename to internal/entity/migrate/dialect_mysql.go diff --git a/internal/migrate/dialect_mysql_test.go b/internal/entity/migrate/dialect_mysql_test.go similarity index 100% rename from internal/migrate/dialect_mysql_test.go rename to internal/entity/migrate/dialect_mysql_test.go diff --git a/internal/migrate/dialect_sqlite3.go b/internal/entity/migrate/dialect_sqlite3.go similarity index 100% rename from internal/migrate/dialect_sqlite3.go rename to internal/entity/migrate/dialect_sqlite3.go diff --git a/internal/migrate/dialect_sqlite3_test.go b/internal/entity/migrate/dialect_sqlite3_test.go similarity index 100% rename from internal/migrate/dialect_sqlite3_test.go rename to internal/entity/migrate/dialect_sqlite3_test.go diff --git a/internal/migrate/dialects.go b/internal/entity/migrate/dialects.go similarity index 100% rename from internal/migrate/dialects.go rename to internal/entity/migrate/dialects.go diff --git a/internal/migrate/errors.go b/internal/entity/migrate/errors.go similarity index 100% rename from internal/migrate/errors.go rename to internal/entity/migrate/errors.go diff --git a/internal/migrate/generate.go b/internal/entity/migrate/generate.go similarity index 97% rename from internal/migrate/generate.go rename to internal/entity/migrate/generate.go index b6d32cbb5..24bc4dc4e 100644 --- a/internal/migrate/generate.go +++ b/internal/entity/migrate/generate.go @@ -12,7 +12,7 @@ import ( "strings" "text/template" - "github.com/photoprism/photoprism/internal/migrate" + "github.com/photoprism/photoprism/internal/entity/migrate" ) func gen_migrations(name string) { diff --git a/internal/migrate/migrate.go b/internal/entity/migrate/migrate.go similarity index 100% rename from internal/migrate/migrate.go rename to internal/entity/migrate/migrate.go diff --git a/internal/migrate/migration.go b/internal/entity/migrate/migration.go similarity index 100% rename from internal/migrate/migration.go rename to internal/entity/migrate/migration.go diff --git a/internal/migrate/migrations.go b/internal/entity/migrate/migrations.go similarity index 100% rename from internal/migrate/migrations.go rename to internal/entity/migrate/migrations.go diff --git a/internal/migrate/mysql/20211121-094727.sql b/internal/entity/migrate/mysql/20211121-094727.sql similarity index 100% rename from internal/migrate/mysql/20211121-094727.sql rename to internal/entity/migrate/mysql/20211121-094727.sql diff --git a/internal/migrate/mysql/20211124-120008.sql b/internal/entity/migrate/mysql/20211124-120008.sql similarity index 100% rename from internal/migrate/mysql/20211124-120008.sql rename to internal/entity/migrate/mysql/20211124-120008.sql diff --git a/internal/migrate/mysql/20220329-030000.sql b/internal/entity/migrate/mysql/20220329-030000.sql similarity index 100% rename from internal/migrate/mysql/20220329-030000.sql rename to internal/entity/migrate/mysql/20220329-030000.sql diff --git a/internal/migrate/mysql/20220329-040000.sql b/internal/entity/migrate/mysql/20220329-040000.sql similarity index 100% rename from internal/migrate/mysql/20220329-040000.sql rename to internal/entity/migrate/mysql/20220329-040000.sql diff --git a/internal/migrate/mysql/20220329-050000.sql b/internal/entity/migrate/mysql/20220329-050000.sql similarity index 100% rename from internal/migrate/mysql/20220329-050000.sql rename to internal/entity/migrate/mysql/20220329-050000.sql diff --git a/internal/migrate/mysql/20220329-060000.sql b/internal/entity/migrate/mysql/20220329-060000.sql similarity index 100% rename from internal/migrate/mysql/20220329-060000.sql rename to internal/entity/migrate/mysql/20220329-060000.sql diff --git a/internal/migrate/mysql/20220329-061000.sql b/internal/entity/migrate/mysql/20220329-061000.sql similarity index 100% rename from internal/migrate/mysql/20220329-061000.sql rename to internal/entity/migrate/mysql/20220329-061000.sql diff --git a/internal/migrate/mysql/20220329-070000.sql b/internal/entity/migrate/mysql/20220329-070000.sql similarity index 100% rename from internal/migrate/mysql/20220329-070000.sql rename to internal/entity/migrate/mysql/20220329-070000.sql diff --git a/internal/migrate/mysql/20220329-071000.sql b/internal/entity/migrate/mysql/20220329-071000.sql similarity index 100% rename from internal/migrate/mysql/20220329-071000.sql rename to internal/entity/migrate/mysql/20220329-071000.sql diff --git a/internal/migrate/mysql/20220329-080000.sql b/internal/entity/migrate/mysql/20220329-080000.sql similarity index 100% rename from internal/migrate/mysql/20220329-080000.sql rename to internal/entity/migrate/mysql/20220329-080000.sql diff --git a/internal/migrate/mysql/20220329-081000.sql b/internal/entity/migrate/mysql/20220329-081000.sql similarity index 100% rename from internal/migrate/mysql/20220329-081000.sql rename to internal/entity/migrate/mysql/20220329-081000.sql diff --git a/internal/migrate/mysql/20220329-083000.sql b/internal/entity/migrate/mysql/20220329-083000.sql similarity index 100% rename from internal/migrate/mysql/20220329-083000.sql rename to internal/entity/migrate/mysql/20220329-083000.sql diff --git a/internal/migrate/mysql/20220329-090000.sql b/internal/entity/migrate/mysql/20220329-090000.sql similarity index 100% rename from internal/migrate/mysql/20220329-090000.sql rename to internal/entity/migrate/mysql/20220329-090000.sql diff --git a/internal/migrate/mysql/20220329-091000.sql b/internal/entity/migrate/mysql/20220329-091000.sql similarity index 100% rename from internal/migrate/mysql/20220329-091000.sql rename to internal/entity/migrate/mysql/20220329-091000.sql diff --git a/internal/migrate/mysql/20220329-093000.sql b/internal/entity/migrate/mysql/20220329-093000.sql similarity index 100% rename from internal/migrate/mysql/20220329-093000.sql rename to internal/entity/migrate/mysql/20220329-093000.sql diff --git a/internal/migrate/mysql/20220421-200000.sql b/internal/entity/migrate/mysql/20220421-200000.sql similarity index 100% rename from internal/migrate/mysql/20220421-200000.sql rename to internal/entity/migrate/mysql/20220421-200000.sql diff --git a/internal/migrate/mysql/20220521-000001.sql b/internal/entity/migrate/mysql/20220521-000001.sql similarity index 100% rename from internal/migrate/mysql/20220521-000001.sql rename to internal/entity/migrate/mysql/20220521-000001.sql diff --git a/internal/migrate/mysql/20220521-000002.sql b/internal/entity/migrate/mysql/20220521-000002.sql similarity index 100% rename from internal/migrate/mysql/20220521-000002.sql rename to internal/entity/migrate/mysql/20220521-000002.sql diff --git a/internal/migrate/mysql/20220521-000003.sql b/internal/entity/migrate/mysql/20220521-000003.sql similarity index 100% rename from internal/migrate/mysql/20220521-000003.sql rename to internal/entity/migrate/mysql/20220521-000003.sql diff --git a/internal/migrate/mysql/20220927-000100.sql b/internal/entity/migrate/mysql/20220927-000100.sql similarity index 100% rename from internal/migrate/mysql/20220927-000100.sql rename to internal/entity/migrate/mysql/20220927-000100.sql diff --git a/internal/migrate/mysql/20221002-000100.sql b/internal/entity/migrate/mysql/20221002-000100.sql similarity index 100% rename from internal/migrate/mysql/20221002-000100.sql rename to internal/entity/migrate/mysql/20221002-000100.sql diff --git a/internal/migrate/mysql/20221015-100000.pre.sql b/internal/entity/migrate/mysql/20221015-100000.pre.sql similarity index 100% rename from internal/migrate/mysql/20221015-100000.pre.sql rename to internal/entity/migrate/mysql/20221015-100000.pre.sql diff --git a/internal/migrate/mysql/20221015-100100.pre.sql b/internal/entity/migrate/mysql/20221015-100100.pre.sql similarity index 100% rename from internal/migrate/mysql/20221015-100100.pre.sql rename to internal/entity/migrate/mysql/20221015-100100.pre.sql diff --git a/internal/migrate/mysql/20230102-000001.sql b/internal/entity/migrate/mysql/20230102-000001.sql similarity index 100% rename from internal/migrate/mysql/20230102-000001.sql rename to internal/entity/migrate/mysql/20230102-000001.sql diff --git a/internal/migrate/mysql/20230211-000001.sql b/internal/entity/migrate/mysql/20230211-000001.sql similarity index 100% rename from internal/migrate/mysql/20230211-000001.sql rename to internal/entity/migrate/mysql/20230211-000001.sql diff --git a/internal/migrate/mysql/20230309-000001.sql b/internal/entity/migrate/mysql/20230309-000001.sql similarity index 100% rename from internal/migrate/mysql/20230309-000001.sql rename to internal/entity/migrate/mysql/20230309-000001.sql diff --git a/internal/migrate/mysql/20230313-000001.sql b/internal/entity/migrate/mysql/20230313-000001.sql similarity index 100% rename from internal/migrate/mysql/20230313-000001.sql rename to internal/entity/migrate/mysql/20230313-000001.sql diff --git a/internal/migrate/mysql/20240112-000001.sql b/internal/entity/migrate/mysql/20240112-000001.sql similarity index 100% rename from internal/migrate/mysql/20240112-000001.sql rename to internal/entity/migrate/mysql/20240112-000001.sql diff --git a/internal/migrate/mysql/20240701-000001.sql b/internal/entity/migrate/mysql/20240701-000001.sql similarity index 100% rename from internal/migrate/mysql/20240701-000001.sql rename to internal/entity/migrate/mysql/20240701-000001.sql diff --git a/internal/migrate/options.go b/internal/entity/migrate/options.go similarity index 100% rename from internal/migrate/options.go rename to internal/entity/migrate/options.go diff --git a/internal/migrate/run.go b/internal/entity/migrate/run.go similarity index 100% rename from internal/migrate/run.go rename to internal/entity/migrate/run.go diff --git a/internal/migrate/sqlite3/20211121-094727.sql b/internal/entity/migrate/sqlite3/20211121-094727.sql similarity index 100% rename from internal/migrate/sqlite3/20211121-094727.sql rename to internal/entity/migrate/sqlite3/20211121-094727.sql diff --git a/internal/migrate/sqlite3/20211124-120008.sql b/internal/entity/migrate/sqlite3/20211124-120008.sql similarity index 100% rename from internal/migrate/sqlite3/20211124-120008.sql rename to internal/entity/migrate/sqlite3/20211124-120008.sql diff --git a/internal/migrate/sqlite3/20220329-040000.sql b/internal/entity/migrate/sqlite3/20220329-040000.sql similarity index 100% rename from internal/migrate/sqlite3/20220329-040000.sql rename to internal/entity/migrate/sqlite3/20220329-040000.sql diff --git a/internal/migrate/sqlite3/20220329-050000.sql b/internal/entity/migrate/sqlite3/20220329-050000.sql similarity index 100% rename from internal/migrate/sqlite3/20220329-050000.sql rename to internal/entity/migrate/sqlite3/20220329-050000.sql diff --git a/internal/migrate/sqlite3/20220329-061000.sql b/internal/entity/migrate/sqlite3/20220329-061000.sql similarity index 100% rename from internal/migrate/sqlite3/20220329-061000.sql rename to internal/entity/migrate/sqlite3/20220329-061000.sql diff --git a/internal/migrate/sqlite3/20220329-071000.sql b/internal/entity/migrate/sqlite3/20220329-071000.sql similarity index 100% rename from internal/migrate/sqlite3/20220329-071000.sql rename to internal/entity/migrate/sqlite3/20220329-071000.sql diff --git a/internal/migrate/sqlite3/20220329-081000.sql b/internal/entity/migrate/sqlite3/20220329-081000.sql similarity index 100% rename from internal/migrate/sqlite3/20220329-081000.sql rename to internal/entity/migrate/sqlite3/20220329-081000.sql diff --git a/internal/migrate/sqlite3/20220329-083000.sql b/internal/entity/migrate/sqlite3/20220329-083000.sql similarity index 100% rename from internal/migrate/sqlite3/20220329-083000.sql rename to internal/entity/migrate/sqlite3/20220329-083000.sql diff --git a/internal/migrate/sqlite3/20220329-091000.sql b/internal/entity/migrate/sqlite3/20220329-091000.sql similarity index 100% rename from internal/migrate/sqlite3/20220329-091000.sql rename to internal/entity/migrate/sqlite3/20220329-091000.sql diff --git a/internal/migrate/sqlite3/20220329-093000.sql b/internal/entity/migrate/sqlite3/20220329-093000.sql similarity index 100% rename from internal/migrate/sqlite3/20220329-093000.sql rename to internal/entity/migrate/sqlite3/20220329-093000.sql diff --git a/internal/migrate/sqlite3/20220421-200000.sql b/internal/entity/migrate/sqlite3/20220421-200000.sql similarity index 100% rename from internal/migrate/sqlite3/20220421-200000.sql rename to internal/entity/migrate/sqlite3/20220421-200000.sql diff --git a/internal/migrate/sqlite3/20221015-100000.pre.sql b/internal/entity/migrate/sqlite3/20221015-100000.pre.sql similarity index 100% rename from internal/migrate/sqlite3/20221015-100000.pre.sql rename to internal/entity/migrate/sqlite3/20221015-100000.pre.sql diff --git a/internal/migrate/sqlite3/20221015-100100.pre.sql b/internal/entity/migrate/sqlite3/20221015-100100.pre.sql similarity index 100% rename from internal/migrate/sqlite3/20221015-100100.pre.sql rename to internal/entity/migrate/sqlite3/20221015-100100.pre.sql diff --git a/internal/migrate/sqlite3/20230309-000001.sql b/internal/entity/migrate/sqlite3/20230309-000001.sql similarity index 100% rename from internal/migrate/sqlite3/20230309-000001.sql rename to internal/entity/migrate/sqlite3/20230309-000001.sql diff --git a/internal/migrate/sqlite3/20230313-000001.sql b/internal/entity/migrate/sqlite3/20230313-000001.sql similarity index 100% rename from internal/migrate/sqlite3/20230313-000001.sql rename to internal/entity/migrate/sqlite3/20230313-000001.sql diff --git a/internal/migrate/sqlite3/20240112-000001.sql b/internal/entity/migrate/sqlite3/20240112-000001.sql similarity index 100% rename from internal/migrate/sqlite3/20240112-000001.sql rename to internal/entity/migrate/sqlite3/20240112-000001.sql diff --git a/internal/migrate/stages.go b/internal/entity/migrate/stages.go similarity index 100% rename from internal/migrate/stages.go rename to internal/entity/migrate/stages.go diff --git a/internal/migrate/status.go b/internal/entity/migrate/status.go similarity index 100% rename from internal/migrate/status.go rename to internal/entity/migrate/status.go diff --git a/internal/migrate/testdata/migrate_mysql.sql b/internal/entity/migrate/testdata/migrate_mysql.sql similarity index 100% rename from internal/migrate/testdata/migrate_mysql.sql rename to internal/entity/migrate/testdata/migrate_mysql.sql diff --git a/internal/migrate/testdata/migrate_sqlite3 b/internal/entity/migrate/testdata/migrate_sqlite3 similarity index 100% rename from internal/migrate/testdata/migrate_sqlite3 rename to internal/entity/migrate/testdata/migrate_sqlite3 diff --git a/internal/migrate/version.go b/internal/entity/migrate/version.go similarity index 100% rename from internal/migrate/version.go rename to internal/entity/migrate/version.go diff --git a/internal/entity/mysql8_test.go b/internal/entity/mysql8_test.go index 9253bf642..3ce57e920 100644 --- a/internal/entity/mysql8_test.go +++ b/internal/entity/mysql8_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/photoprism/photoprism/internal/migrate" + "github.com/photoprism/photoprism/internal/entity/migrate" "github.com/jinzhu/gorm" )