Merge pull request #271 from duckdb/jray/scalar-func-except-handling

scalar function exception handling

Author: jraymakers

bindings/binding.gyp

@@ -39,7 +39,7 @@
       'target_name': 'duckdb',
       'dependencies': [
         'fetch_libduckdb',
-        '<!(node -p "require(\'node-addon-api\').targets"):node_addon_api_except',
+        '<!(node -p "require(\'node-addon-api\').targets"):node_addon_api_except_all',
       ],
       'sources': ['src/duckdb_node_bindings.cpp'],
       'include_dirs': ['<(module_root_dir)/libduckdb'],

bindings/src/duckdb_node_bindings.cpp

@@ -692,14 +692,18 @@ struct ScalarFunctionMainData {
 void ScalarFunctionMainCallback(Napi::Env env, Napi::Function callback, ScalarFunctionMainContext *context, ScalarFunctionMainData *data) {
   if (env != nullptr) {
     if (callback != nullptr) {
-      callback.Call(
-        env.Undefined(),
-        {
-          CreateExternalForFunctionInfoWithoutFinalizer(env, data->info),
-          CreateExternalForDataChunkWithoutFinalizer(env, data->input),
-          CreateExternalForVectorWithoutFinalizer(env, data->output)
-        }
-      );
+      try {
+        callback.Call(
+          env.Undefined(),
+          {
+            CreateExternalForFunctionInfoWithoutFinalizer(env, data->info),
+            CreateExternalForDataChunkWithoutFinalizer(env, data->input),
+            CreateExternalForVectorWithoutFinalizer(env, data->output)
+          }
+        );
+      } catch (const Napi::Error &err) {
+        duckdb_scalar_function_set_error(data->info, err.Message().c_str());
+      }
     }
   }
   {