chore: address review comments

supabase · Sep 25, 2024 · 9bf786c · 9bf786c
1 parent 7570c11
commit 9bf786c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/internal/db/push/push_test.go b/internal/db/push/push_test.go
@@ -162,8 +162,9 @@ func TestPushAll(t *testing.T) {
 
 	t.Run("throws error on seed failure", func(t *testing.T) {
 		// Setup in-memory fs
-		fsys := &fstest.OpenErrorFs{DenyPath: filepath.Join(utils.SupabaseDirPath, "seed.sql")}
-		_, _ = fsys.Create(filepath.Join(utils.SupabaseDirPath, "seed.sql"))
+		seedPath := filepath.Join(utils.SupabaseDirPath, "seed.sql")
+		fsys := &fstest.OpenErrorFs{DenyPath: seedPath}
+		_, _ = fsys.Create(seedPath)
 		path := filepath.Join(utils.MigrationsDir, "0_test.sql")
 		require.NoError(t, afero.WriteFile(fsys, path, []byte{}, 0644))
 		// Setup mock postgres

diff --git a/internal/db/reset/reset_test.go b/internal/db/reset/reset_test.go
@@ -362,7 +362,7 @@ func TestResetRemote(t *testing.T) {
 		fsys := afero.NewMemMapFs()
 		path := filepath.Join(utils.MigrationsDir, "0_schema.sql")
 		require.NoError(t, afero.WriteFile(fsys, path, nil, 0644))
-		seedPath := filepath.Join(filepath.Join(utils.SupabaseDirPath, "seed.sql"))
+		seedPath := filepath.Join(utils.SupabaseDirPath, "seed.sql")
 		// Will raise an error when seeding
 		require.NoError(t, afero.WriteFile(fsys, seedPath, []byte("INSERT INTO test_table;"), 0644))
 		// Setup mock postgres

diff --git a/internal/migration/apply/apply_test.go b/internal/migration/apply/apply_test.go
@@ -99,15 +99,12 @@ func TestSeedDatabase(t *testing.T) {
 	})
 
 	t.Run("throws error on read failure", func(t *testing.T) {
-		// Wrap the fs with OpenErrorFs
-		errorFs := &fstest.OpenErrorFs{
-			DenyPath: filepath.Join(utils.SupabaseDirPath, "seed.sql"),
-		}
-		_, _ = errorFs.Create(filepath.Join(utils.SupabaseDirPath, "seed.sql"))
-
+		// Setup in-memory fs
+		seedPath := filepath.Join(utils.SupabaseDirPath, "seed.sql")
+		fsys := &fstest.OpenErrorFs{DenyPath: seedPath}
+		_, _ = fsys.Create(seedPath)
 		// Run test
-		err := SeedDatabase(context.Background(), nil, errorFs)
-
+		err := SeedDatabase(context.Background(), nil, fsys)
 		// Check error
 		assert.ErrorIs(t, err, os.ErrPermission)
 	})

diff --git a/pkg/config/templates/config.toml b/pkg/config/templates/config.toml
@@ -40,11 +40,11 @@ default_pool_size = 20
 max_client_conn = 100
 
 [db.seed]
-# Determines whether to seed the database after migrations during a db reset
+# If enabled, seeds the database after migrations during a db reset.
 enabled = true
-# Specifies seed files to load during db reset using glob patterns
-# Base path is the Supabase project folder
-# Example: sql_paths = ['./seeds/*.sql', '../project-src/seeds/*-load-testing.sql']
+# Specifies an ordered list of seed files to load during db reset.
+# Supports glob patterns relative to supabase directory. For example:
+# sql_paths = ['./seeds/*.sql', '../project-src/seeds/*-load-testing.sql']
 sql_paths = ['./seed.sql']
 
 [realtime]

diff --git a/pkg/config/testdata/config.toml b/pkg/config/testdata/config.toml
@@ -40,12 +40,12 @@ default_pool_size = 20
 max_client_conn = 100
 
 [db.seed]
-# Determines whether to seed the database after migrations during a db reset
+# If enabled, seeds the database after migrations during a db reset.
 enabled = true
-# Specifies seed files to load during db reset using glob patterns
-# Base path is the Supabase project folder
-# Example: path = ['./seeds/*.sql', '../project-src/seeds/*-load-testing.sql']
-path = ['./seed.sql']
+# Specifies an ordered list of seed files to load during db reset.
+# Supports glob patterns relative to supabase directory. For example:
+# sql_paths = ['./seeds/*.sql', '../project-src/seeds/*-load-testing.sql']
+sql_paths = ['./seed.sql']
 
 [realtime]
 enabled = true