commit 387a005b608d47466adfb75fec24ef8a743022f6
author Jonathan Amsterdam <jba@google.com> Wed Aug 11 10:04:52 2021 -0400
committer Jonathan Amsterdam <jba@google.com> Wed Aug 11 14:50:22 2021 +0000
tree a9f78ec5d06ee308e4ed533e8211195611faaa2c
parent bb6530d3c036e8578505bb4b0a36492e7d304881

internal/postgres: rename function

For golang/go#47555

Change-Id: I9e90de83d441748e70b0992f3a31a02f46f1bce9
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/341429
Trust: Jonathan Amsterdam <jba@google.com>
Run-TryBot: Jonathan Amsterdam <jba@google.com>
Reviewed-by: Jamal Carvalho <jamal@golang.org>
TryBot-Result: kokoro <noreply+kokoro@google.com>

internal/postgres/search.go

diff --git a/internal/postgres/search.go b/internal/postgres/search.go
index 56376bb..fc788ed 100644
--- a/internal/postgres/search.go
+++ b/internal/postgres/search.go
@@ -1088,7 +1088,7 @@
 		}
 
 		// Delete all of those paths.
-		return deleteModuleFromSearchDocuments(ctx, tx, modulePath, ppaths)
+		return deleteModuleOrPackagesInModuleFromSearchDocuments(ctx, tx, modulePath, ppaths)
 	})
 }
 
@@ -1111,12 +1111,12 @@
 			otherPkgs = append(otherPkgs, p)
 		}
 	}
-	return deleteModuleFromSearchDocuments(ctx, tx, m.ModulePath, otherPkgs)
+	return deleteModuleOrPackagesInModuleFromSearchDocuments(ctx, tx, m.ModulePath, otherPkgs)
 }
 
-// deleteModuleFromSearchDocuments deletes module_path from search_documents.
-// If packages is non-empty, it only deletes those packages.
-func deleteModuleFromSearchDocuments(ctx context.Context, tx *database.DB, modulePath string, packages []string) error {
+// deleteModuleOrPackagesInModuleFromSearchDocuments deletes module_path from
+// search_documents. If packages is non-empty, it only deletes those packages.
+func deleteModuleOrPackagesInModuleFromSearchDocuments(ctx context.Context, tx *database.DB, modulePath string, packages []string) error {
 	d := squirrel.Delete("search_documents").
 		Where(squirrel.Eq{"module_path": modulePath})
 	if len(packages) > 0 {

internal/postgres/search_test.go

diff --git a/internal/postgres/search_test.go b/internal/postgres/search_test.go
index 5383ff1..2190465 100644
--- a/internal/postgres/search_test.go
+++ b/internal/postgres/search_test.go
@@ -1377,7 +1377,7 @@
 		defer release()
 		insertInitial(testDB)
 
-		if err := deleteModuleFromSearchDocuments(ctx, testDB.db, modulePath, nil); err != nil {
+		if err := deleteModuleOrPackagesInModuleFromSearchDocuments(ctx, testDB.db, modulePath, nil); err != nil {
 			t.Fatal(err)
 		}
 		checkSearchDocuments(ctx, t, testDB, []searchDocumentRow{