fixes to PROTECT and other errors

Author: isc-pbarton

cls/SourceControl/Git/Change.cls

@@ -195,10 +195,14 @@ ClassMethod InstanceUncommittedExecute(ByRef qHandle As %Binary) As %Status
     set namespaces = ##class(SourceControl.Git.Utils).GetGitEnabledNamespaces()
     set tPtr = 0
     set qHandle("i") = 1
+    new $namespace
     while $LISTNEXT(namespaces, tPtr, tValue) {
         set namespace = $ZCONVERT(tValue, "U")
         set $NAMESPACE = namespace
-        set resultSet = ##class(%SQL.Statement).%ExecDirect(, qHandle("q"))
+        set statement = ##class(%SQL.Statement).%New()
+        $$$ThrowOnError(statement.%Prepare(qHandle("q"), 0))
+        set resultSet = statement.%Execute()
+        throw:resultSet.%SQLCODE<0 ##class(%Exception.SQL).CreateFromSQLCODE(resultSet.%SQLCODE,resultSet.%Message)
         while resultSet.%Next() {
             set qHandle("changes", $increment(qHandle("changes")), "InternalName") = resultSet.%GetData(1)
             set qHandle("changes", qHandle("changes"), "User") = resultSet.%GetData(2)
@@ -211,20 +215,17 @@ ClassMethod InstanceUncommittedExecute(ByRef qHandle As %Binary) As %Status
 ClassMethod InstanceUncommittedFetch(ByRef qHandle As %Binary, ByRef Row As %List, ByRef AtEnd As %Integer = 0) As %Status [ PlaceAfter = InstanceUncommittedExecute ]
 {
     set i = qHandle("i")
-    set Row = $listbuild(qHandle("changes", i, "InternalName"), qHandle("changes", i, "User"))
-    if i = qHandle("changes") {
+    if $data(qHandle("changes",i))=10 {
+        set Row = $listbuild(qHandle("changes", i, "InternalName"), qHandle("changes", i, "User"))
+    }
+    if i >= $get(qHandle("changes"),0) {
         set AtEnd = 1
     } else {
         set qHandle("i") = $increment(qHandle("i"))
     }
     Quit $$$OK
 }
 
-ClassMethod InstanceUncommittedClose(ByRef qHandle As %Binary) As %Status [ PlaceAfter = InstanceUncommittedFetch ]
-{
-    Quit $$$OK
-}
-
 Storage Default
 {
 <Data name="ChangeDefaultData">
@@ -277,3 +278,4 @@ Storage Default
 }
 
 }
+

cls/SourceControl/Git/Utils.cls

@@ -2425,35 +2425,16 @@ ClassMethod GetGitEnabledNamespaces() As %String
     do ##class(%SYS.Namespace).ListAll(.allNamespaces)
 
     set enabledNamespaces = ""
-
-    // Write query for verifying git sourcecontrol in namespace
-    set gitscQuery = 9
-    set gitscQuery(1) = "SELECT CASE"
-    set gitscQuery(2) = "WHEN EXISTS ("
-    set gitscQuery(3) = "SELECT TABLE_SCHEMA"
-    set gitscQuery(4) = "FROM INFORMATION_SCHEMA.TABLES"
-    set gitscQuery(5) = "WHERE TABLE_TYPE = 'BASE TABLE'"
-    set gitscQuery(6) = "AND TABLE_SCHEMA = 'SourceControl_Git'"
-    set gitscQuery(7) = ") THEN 1"
-    set gitscQuery(8) = "ELSE 0"
-    set gitscQuery(9) = "END AS SchemaExists;"
-
-
     set namespace = ""
-    new $NAMESPACE
     for {
         set namespace = $ORDER(allNamespaces(namespace))
         quit:namespace=""
-        set $NAMESPACE = namespace
-        set statement = ##class(%SQL.Statement).%New()
-        set status = statement.%Prepare(.gitscQuery)
-        set result = statement.%Execute()
-        do result.%Next()
-        set gitEnabled = result.%GetData(1)
-        if (gitEnabled) set enabledNamespaces = enabledNamespaces _ $listbuild(namespace)
-        
-
-
+        try {
+            set sourceControlClass = ##class(%Studio.SourceControl.Interface).SourceControlClassGet(namespace)
+        } catch err {
+            set sourceControlClass = "" // user does not have access to this namespace
+        }
+        if (sourceControlClass = "SourceControl.Git.Extension") set enabledNamespaces = enabledNamespaces _ $listbuild(namespace)
     }
 
     quit enabledNamespaces
@@ -2463,6 +2444,7 @@ ClassMethod FileIsUncommitted(InternalName As %String, Output User) As %Boolean
 {
     set isUncommitted = 0
     set resultSet = ##class(SourceControl.Git.Change).InstanceUncommittedFunc()
+    throw:resultSet.%SQLCODE<0 ##class(%Exception.SQL).CreateFromSQLCODE(resultSet.%SQLCODE,resultSet.%Message)
     while resultSet.%Next() {
         set fileName = resultSet.InternalName
         if InternalName = fileName {
@@ -2628,3 +2610,4 @@ ClassMethod BaselineExport(pCommitMessage = "", pPushToRemote = "") As %Status
 }
 
 }
+