Merge with main

core/function.rs

@@ -1,11 +1,21 @@
-use crate::ext::ExtFunc;
 use std::fmt;
 use std::fmt::{Debug, Display};
 use std::rc::Rc;
 
+use limbo_extension::ScalarFunction;
+
 pub struct ExternalFunc {
     pub name: String,
-    pub func: Box<dyn Fn(&[crate::types::Value]) -> crate::Result<crate::types::OwnedValue>>,
+    pub func: ScalarFunction,
+}
+
+impl ExternalFunc {
+    pub fn new(name: &str, func: ScalarFunction) -> Self {
+        Self {
+            name: name.to_string(),
+            func,
+        }
+    }
 }
 
 impl Debug for ExternalFunc {
@@ -128,6 +138,8 @@ pub enum ScalarFunc {
     ZeroBlob,
     LastInsertRowid,
     Replace,
+    #[cfg(not(target_family = "wasm"))]
+    LoadExtension,
 }
 
 impl Display for ScalarFunc {
@@ -177,6 +189,8 @@ impl Display for ScalarFunc {
             Self::LastInsertRowid => "last_insert_rowid".to_string(),
             Self::Replace => "replace".to_string(),
             Self::DateTime => "datetime".to_string(),
+            #[cfg(not(target_family = "wasm"))]
+            Self::LoadExtension => "load_extension".to_string(),
         };
         write!(f, "{}", str)
     }
@@ -301,7 +315,6 @@ pub enum Func {
     Math(MathFunc),
     #[cfg(feature = "json")]
     Json(JsonFunc),
-    Extension(ExtFunc),
     External(Rc<ExternalFunc>),
 }
 
@@ -313,7 +326,6 @@ impl Display for Func {
             Self::Math(math_func) => write!(f, "{}", math_func),
             #[cfg(feature = "json")]
             Self::Json(json_func) => write!(f, "{}", json_func),
-            Self::Extension(ext_func) => write!(f, "{}", ext_func),
             Self::External(generic_func) => write!(f, "{}", generic_func),
         }
     }
@@ -422,10 +434,9 @@ impl Func {
             "tan" => Ok(Self::Math(MathFunc::Tan)),
             "tanh" => Ok(Self::Math(MathFunc::Tanh)),
             "trunc" => Ok(Self::Math(MathFunc::Trunc)),
-            _ => match ExtFunc::resolve_function(name, arg_count) {
-                Some(ext_func) => Ok(Self::Extension(ext_func)),
-                None => Err(()),
-            },
+            #[cfg(not(target_family = "wasm"))]
+            "load_extension" => Ok(Self::Scalar(ScalarFunc::LoadExtension)),
+            _ => Err(()),
         }
     }
 }