Skip to content

Commit 31971df

Browse files
committed
add exceptions for SQL
1 parent f46e738 commit 31971df

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

cls/SourceControl/Git/Change.cls

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,16 @@ ClassMethod GetOtherDeveloperChanges() As %Boolean
8383
{
8484
set numEntries = 0
8585
set fileToOtherDevelopers = {}
86-
set query = "Select ItemFile, ChangedBy FROM SourceControl_Git.Change WHERE CHARINDEX('SourceControl.Git', Name)>0 AND Committed = '0' AND ChangedBy != '"_$username_"'"
86+
set query = "Select ItemFile, ChangedBy FROM SourceControl_Git.Change WHERE CHARINDEX('SourceControl.Git', Name)>0 AND Committed = '0' AND ChangedBy <> ?"
8787
set statement = ##class(%SQL.Statement).%New()
8888
set status = statement.%Prepare(query)
89-
if $$$ISERR(status) {
90-
write "%Prepare failed:" do $SYSTEM.Status.DisplayError(status)
91-
quit
89+
$$$ThrowOnError(status)
90+
set rset = statement.%Execute($username)
91+
if (rset.%SQLCODE < 0) {
92+
throw ##class(%Exception.SQL).CreateFromSQLCODE(rset.%SQLCODE,rset.%Message)
9293
}
93-
set rset = statement.%Execute()
94-
if (rset.%SQLCODE '= 0) {
95-
write "%Execute failed:", !, "SQLCODE ", rset.%SQLCODE, ": ", rset.%Message
96-
quit
97-
}
98-
while rset.%Next() {
94+
while rset.%Next(.sc) {
95+
$$$ThrowOnError(sc)
9996
set filePath = "cls\"_$EXTRACT(rset.ItemFile, $FIND(rset.ItemFile,"cls\"),$LENGTH(rset.ItemFile))
10097
set otherDevelopers = fileToOtherDevelopers.%Get(filePath, [])
10198
do otherDevelopers.%Push(rset.ChangedBy)

0 commit comments

Comments
 (0)