Skip to content

Commit

Permalink
fix: Use neoq-specific schema migrations able
Browse files Browse the repository at this point in the history
When neoq is embedded in apps already use golang-migrate, they would
both attempt to use the `schema_migrations` table for migrations.

This commit moves neoq to its own `neoq_schema_migrations` table so as
not to clash with other golang-migrate users.
  • Loading branch information
acaloiaro committed Sep 9, 2023
1 parent 20f5b13 commit ff02290
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions backends/postgres/postgres_backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ func WithTransactionTimeout(txTimeout int) neoq.ConfigOption {
//
//nolint:funlen,gocyclo,cyclop
func (p *PgBackend) initializeDB() (err error) {
d, err := iofs.New(migrationsFS, "migrations")
migrations, err := iofs.New(migrationsFS, "migrations")
if err != nil {
p.logger.Error("unable to run migrations", "error", err)
return
Expand All @@ -210,13 +210,13 @@ func (p *PgBackend) initializeDB() (err error) {
sslMode = "disable"
}

pqConnectionString := fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=%s",
pqConnectionString := fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=%s&x-migrations-table=neoq_schema_migrations",
pgxCfg.User,
pgxCfg.Password,
pgxCfg.Host,
pgxCfg.Database,
sslMode)
m, err := migrate.NewWithSourceInstance("iofs", d, pqConnectionString)
m, err := migrate.NewWithSourceInstance("iofs", migrations, pqConnectionString)
if err != nil {
p.logger.Error("unable to run migrations", "error", err)
return
Expand Down

0 comments on commit ff02290

Please sign in to comment.