From 3ad5a6ab1ef53330f18014b710534d0ed0cd55b0 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 18 Aug 2024 16:06:54 -0400 Subject: Fix using a schema with a custom migration table name (#7) * Fix using a schema with a custom migration table name * Fix test --- internal/storage/postgresql.go | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'internal/storage/postgresql.go') diff --git a/internal/storage/postgresql.go b/internal/storage/postgresql.go index dee0288..d93d014 100644 --- a/internal/storage/postgresql.go +++ b/internal/storage/postgresql.go @@ -29,19 +29,25 @@ func (p PostgresqlAdapter) TableExists( tableName string, ) (bool, error) { var exists bool - // Assumption: Anytime we check if a table exists, it will be - // for the 'public' schema. If someone wants to have bolt_migrations - // table outside of the 'public' schema on postgresql, this would be - // an issue. + + schemaName := "public" + parts := strings.Split(tableName, ".") + if len(parts) == 2 { + schemaName = parts[0] + tableName = parts[1] + } else { + tableName = parts[0] + } + err := executor.QueryRow(` SELECT EXISTS ( SELECT FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace - WHERE n.nspname = 'public' - AND c.relname = $1 + WHERE n.nspname = $1 + AND c.relname = $2 AND c.relkind = 'r' -- Only tables ); - `, tableName).Scan(&exists) + `, schemaName, tableName).Scan(&exists) if err != nil { return false, fmt.Errorf( "unable to check if %s exists: %w", -- cgit v1.2.3