mirror of
https://github.com/goharbor/harbor.git
synced 2025-02-02 04:51:22 +01:00
append commit to fix core compile error introduced by pr #8606
Signed-off-by: wang yan <wangyan@vmware.com> Signed-off-by: wang yan <wangyan@vmware.com>
This commit is contained in:
parent
699a935c05
commit
76c52c2332
@ -103,7 +103,7 @@ FROM
|
||||
)
|
||||
) AS a
|
||||
LEFT JOIN artifact_blob b ON a.digest = b.digest_af
|
||||
AND b.digest_blob IN (%s)`, paramPlaceholder(len(blobs)-1))
|
||||
AND b.digest_blob IN (%s)`, ParamPlaceholderForIn(len(blobs)-1))
|
||||
|
||||
params := []interface{}{projectID, repository, projectID, digest}
|
||||
for _, blob := range blobs {
|
||||
|
@ -64,7 +64,7 @@ func RemoveBlobsFromProject(projectID int64, blobs ...*models.Blob) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
sql := fmt.Sprintf(`DELETE FROM project_blob WHERE blob_id IN (%s)`, paramPlaceholder(len(blobIDs)))
|
||||
sql := fmt.Sprintf(`DELETE FROM project_blob WHERE blob_id IN (%s)`, ParamPlaceholderForIn(len(blobIDs)))
|
||||
|
||||
_, err := GetOrmer().Raw(sql, blobIDs).Exec()
|
||||
return err
|
||||
@ -89,7 +89,7 @@ func GetBlobsNotInProject(projectID int64, blobDigests ...string) ([]*models.Blo
|
||||
}
|
||||
|
||||
sql := fmt.Sprintf("SELECT * FROM blob WHERE id NOT IN (SELECT blob_id FROM project_blob WHERE project_id = ?) AND digest IN (%s)",
|
||||
paramPlaceholder(len(blobDigests)))
|
||||
ParamPlaceholderForIn(len(blobDigests)))
|
||||
|
||||
params := []interface{}{projectID}
|
||||
for _, digest := range blobDigests {
|
||||
|
@ -16,5 +16,4 @@ docker ps
|
||||
|
||||
go test -race -i ./src/core ./src/jobservice
|
||||
sudo -E env "PATH=$PATH" "POSTGRES_MIGRATION_SCRIPTS_PATH=/home/travis/gopath/src/github.com/goharbor/harbor/make/migrations/postgresql/" ./tests/coverage4gotest.sh
|
||||
set +e
|
||||
goveralls -coverprofile=profile.cov -service=travis-ci
|
||||
goveralls -coverprofile=profile.cov -service=travis-ci || true
|
Loading…
Reference in New Issue
Block a user