From 26b9ae1804e4b8fe81ed33476aaf3ac06db012d0 Mon Sep 17 00:00:00 2001 From: Vasily Zorin Date: Fri, 20 Jun 2025 02:05:02 +0700 Subject: [PATCH 1/2] fix(FunctionBuilder): return type '?void' is now just 'void' --- src/builders/function.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/builders/function.rs b/src/builders/function.rs index 8839a1d1a5..0ad09082f5 100644 --- a/src/builders/function.rs +++ b/src/builders/function.rs @@ -138,7 +138,7 @@ impl<'a> FunctionBuilder<'a> { pub fn returns(mut self, type_: DataType, as_ref: bool, allow_null: bool) -> Self { self.retval = Some(type_); self.ret_as_ref = as_ref; - self.ret_as_null = allow_null; + self.ret_as_null = allow_null && type_ != DataType::Void; self } From ee1c5bf3e3ef53f8507f013b9f13182996597b0a Mon Sep 17 00:00:00 2001 From: Vasily Zorin Date: Fri, 20 Jun 2025 15:08:26 +0700 Subject: [PATCH 2/2] fix(function): return type '?mixed' is now just 'mixed' --- src/builders/function.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/builders/function.rs b/src/builders/function.rs index 0ad09082f5..2285a5b69f 100644 --- a/src/builders/function.rs +++ b/src/builders/function.rs @@ -138,7 +138,7 @@ impl<'a> FunctionBuilder<'a> { pub fn returns(mut self, type_: DataType, as_ref: bool, allow_null: bool) -> Self { self.retval = Some(type_); self.ret_as_ref = as_ref; - self.ret_as_null = allow_null && type_ != DataType::Void; + self.ret_as_null = allow_null && type_ != DataType::Void && type_ != DataType::Mixed; self }