aboutsummaryrefslogtreecommitdiff
path: root/internal/postgres
diff options
context:
space:
mode:
Diffstat (limited to 'internal/postgres')
-rw-r--r--internal/postgres/insert_module_test.go4
-rw-r--r--internal/postgres/package.go6
-rw-r--r--internal/postgres/package_test.go10
3 files changed, 10 insertions, 10 deletions
diff --git a/internal/postgres/insert_module_test.go b/internal/postgres/insert_module_test.go
index fb3e8092..bdbbbe5f 100644
--- a/internal/postgres/insert_module_test.go
+++ b/internal/postgres/insert_module_test.go
@@ -94,7 +94,7 @@ func checkModule(ctx context.Context, t *testing.T, want *internal.Module) {
}
for _, wantp := range want.LegacyPackages {
- got, err := testDB.GetPackage(ctx, wantp.Path, want.ModulePath, want.Version)
+ got, err := testDB.LegacyGetPackage(ctx, wantp.Path, want.ModulePath, want.Version)
if err != nil {
t.Fatal(err)
}
@@ -106,7 +106,7 @@ func checkModule(ctx context.Context, t *testing.T, want *internal.Module) {
cmpopts.EquateEmpty(),
}
if diff := cmp.Diff(*wantp, got.LegacyPackage, opts...); diff != "" {
- t.Fatalf("testDB.GetPackage(%q, %q) mismatch (-want +got):\n%s", wantp.Path, want.Version, diff)
+ t.Fatalf("testDB.LegacyGetPackage(%q, %q) mismatch (-want +got):\n%s", wantp.Path, want.Version, diff)
}
}
diff --git a/internal/postgres/package.go b/internal/postgres/package.go
index 803b45d8..8f1e310e 100644
--- a/internal/postgres/package.go
+++ b/internal/postgres/package.go
@@ -16,7 +16,7 @@ import (
"golang.org/x/pkgsite/internal/stdlib"
)
-// GetPackage returns the a package from the database with the corresponding
+// LegacyGetPackage returns the a package from the database with the corresponding
// pkgPath, modulePath and version.
//
// If version = internal.LatestVersion, the package corresponding to
@@ -41,8 +41,8 @@ import (
// The returned error may be checked with
// errors.Is(err, derrors.InvalidArgument) to determine if it was caused by an
// invalid path or version.
-func (db *DB) GetPackage(ctx context.Context, pkgPath, modulePath, version string) (_ *internal.LegacyVersionedPackage, err error) {
- defer derrors.Wrap(&err, "DB.GetPackage(ctx, %q, %q)", pkgPath, version)
+func (db *DB) LegacyGetPackage(ctx context.Context, pkgPath, modulePath, version string) (_ *internal.LegacyVersionedPackage, err error) {
+ defer derrors.Wrap(&err, "DB.LegacyGetPackage(ctx, %q, %q)", pkgPath, version)
if pkgPath == "" || modulePath == "" || version == "" {
return nil, fmt.Errorf("none of pkgPath, modulePath, or version can be empty: %w", derrors.InvalidArgument)
}
diff --git a/internal/postgres/package_test.go b/internal/postgres/package_test.go
index 88996cad..61cb6fab 100644
--- a/internal/postgres/package_test.go
+++ b/internal/postgres/package_test.go
@@ -19,7 +19,7 @@ import (
"golang.org/x/pkgsite/internal/testing/sample"
)
-func TestGetPackage(t *testing.T) {
+func TestLegacyGetPackage(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
defer cancel()
@@ -56,7 +56,7 @@ func TestGetPackage(t *testing.T) {
cmpopts.IgnoreFields(licenses.Metadata{}, "Coverage"),
}
if diff := cmp.Diff(want, got, opts...); diff != "" {
- t.Errorf("testDB.GetPackage(ctx, %q, %q, %q) mismatch (-want +got):\n%s", pkgPath, modulePath, version, diff)
+ t.Errorf("testDB.LegacyGetPackage(ctx, %q, %q, %q) mismatch (-want +got):\n%s", pkgPath, modulePath, version, diff)
}
}
@@ -188,7 +188,7 @@ func TestGetPackage(t *testing.T) {
},
} {
t.Run(tc.name, func(t *testing.T) {
- got, err := testDB.GetPackage(ctx, tc.pkgPath, tc.modulePath, tc.version)
+ got, err := testDB.LegacyGetPackage(ctx, tc.pkgPath, tc.modulePath, tc.version)
if tc.wantNotFoundErr {
if !errors.Is(err, derrors.NotFound) {
t.Fatalf("want derrors.NotFound; got = %v", err)
@@ -203,7 +203,7 @@ func TestGetPackage(t *testing.T) {
}
}
-func TestGetPackageInvalidArguments(t *testing.T) {
+func TestLegacyGetPackageInvalidArguments(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
defer cancel()
@@ -227,7 +227,7 @@ func TestGetPackageInvalidArguments(t *testing.T) {
},
} {
t.Run(tc.name, func(t *testing.T) {
- got, err := testDB.GetPackage(ctx, tc.modulePath+"/package", tc.modulePath, tc.version)
+ got, err := testDB.LegacyGetPackage(ctx, tc.modulePath+"/package", tc.modulePath, tc.version)
if !errors.Is(err, derrors.InvalidArgument) {
t.Fatalf("want %v; got = \n%+v, %v", derrors.InvalidArgument, got, err)
}