Skip to content

Commit 37edab2

Browse files
committed
fix sql
1 parent 3197b6a commit 37edab2

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/cls/ZPM/Package.cls

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ ClassMethod GetLatest(searchTerms As %DynamicArray = "", manifest As %String = "
594594
Set sql = "SELECT p1.name, p1.repository, p1.description, p1.version, ul.Host, IFNULL( (SELECT TOP 1 1 FROM ZPM.Package p3 WHERE p1.name=p3.name AND p3.owner = ? ORDER BY p3.versionMajor DESC, p3.versionMinor DESC, p3.versionPatch DESC, p3.versionPrerelease DESC, p3.versionBuildmetadata DESC ), 0, 1) as owner"_
595595
" FROM ZPM.Package p1 "_
596596
" LEFT JOIN ZPM.UpLink ul ON ul.ID = p1.UpLink " _
597-
" WHERE deleted = 0 OR deleted IS NULL AND "_searchCondition_" "_
597+
" WHERE (deleted = 0 OR deleted IS NULL) AND "_searchCondition_" "_
598598
" AND p1.version = ( SELECT TOP 1 version FROM ZPM.Package p2 WHERE p1.name=p2.name ORDER BY p2.versionMajor DESC, p2.versionMinor DESC, p2.versionPatch DESC, p2.versionPrerelease DESC, p2.versionBuildmetadata DESC ) "
599599

600600
Set tStatement = ##class(%SQL.Statement).%New()
@@ -632,7 +632,8 @@ ClassMethod GetLatest(searchTerms As %DynamicArray = "", manifest As %String = "
632632
If (allVersions = "1") {
633633
Set tPkgInfo.allVersions = []
634634
Set sql2 = "SELECT version "_
635-
" FROM ZPM.Package WHERE name = ? "_
635+
" FROM ZPM.Package "_
636+
" WHERE name = ? AND (deleted = 0 OR deleted IS NULL) "_
636637
" ORDER BY versionMajor DESC, versionMinor DESC, versionPatch DESC, versionPrerelease DESC, versionBuildmetadata DESC"
637638
Set versionsResult = ##class(%SQL.Statement).%ExecDirect(, sql2, tResult.name)
638639
While versionsResult.%Next() {

0 commit comments

Comments
 (0)