Improve Error Message for throwSqlError() (#905)

* wip use BeSQLiteLib functions * Use GetLogError * use throwSqlResult and use GetLogError * fix tab * clean up and remove comment --------- Co-authored-by: Daniel Rodriguez <DanRod1999@users.noreply.github.com> Co-authored-by: affank <khanaffan@gmail.com> Co-authored-by: Arun George <11051042+aruniverse@users.noreply.github.com>
iTwin · Nov 15, 2024 · f0435be · f0435be
1 parent eae3dd7
commit f0435be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/iModelJsNodeAddon/IModelJsNative.h b/iModelJsNodeAddon/IModelJsNative.h
@@ -360,7 +360,7 @@ ENUM_IS_FLAGS(TextEmphasis);
 
 struct JsInterop {
     [[noreturn]] static void throwSqlResult(Utf8CP msg, Utf8CP fileName, DbResult result) {
-        BeNapi::ThrowJsException(Env(), Utf8PrintfString("%s [%s]: %s", msg, fileName, BeSQLiteLib::GetErrorString(result)).c_str(), result);
+        BeNapi::ThrowJsException(Env(), Utf8PrintfString("%s [%s]: rc=%d, %s", msg, fileName, (int)result, BeSQLiteLib::GetLogError(result).c_str()).c_str(), result);
     }
     [[noreturn]] static void throwDgnDbStatus(DgnDbStatus);
     [[noreturn]] static void throwWrongClass() { throwDgnDbStatus(DgnDbStatus::WrongClass); }

diff --git a/iModelJsNodeAddon/JsInteropDgnDb.cpp b/iModelJsNodeAddon/JsInteropDgnDb.cpp
@@ -871,7 +871,7 @@ Napi::String JsInterop::InsertLinkTableRelationship(DgnDbR dgndb, Napi::Object o
     BeSQLite::EC::ECInstanceKey relKey;
     auto rc = dgndb.InsertLinkTableRelationship(relKey, *relClass, sourceId, targetId, props.get()); // nullptr is okay if there are no props
     if (BE_SQLITE_OK != rc)
-        throwSqlError();
+        JsInterop::throwSqlResult("Failed to insert relationship", dgndb.GetDbFileName(), rc);
 
     return Napi::String::New(Env(), relKey.GetInstanceId().ToHexStr());
     }