From 5fdb7dafc5ee44a3490e5a9f9c0ceb292467616d Mon Sep 17 00:00:00 2001
From: Pierre Alexandre Tremblay <info@pierrealexandretremblay.com>
Date: Thu, 12 Jun 2025 18:07:09 +0200
Subject: [PATCH 1/2] adds kr- but still gets the error "WARNING:
 FluidDataSetQuery received fewer parameters than expected"

---
 .../Classes/FluidDataSetQuery.sc              | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/release-packaging/Classes/FluidDataSetQuery.sc b/release-packaging/Classes/FluidDataSetQuery.sc
index 299f8f91..f804b8ac 100644
--- a/release-packaging/Classes/FluidDataSetQuery.sc
+++ b/release-packaging/Classes/FluidDataSetQuery.sc
@@ -1,6 +1,8 @@
-FluidDataSetQuery : FluidDataObject {
+FluidDataSetQuery : FluidModelObject {
 	*new{|server| ^super.new(server) }
 
+	prGetParams{^[this.id, -1, -1];}
+
 	addColumnMsg { |column|
 		^this.prMakeMsg(\addColumn,id,column);
 	}
@@ -81,4 +83,22 @@ FluidDataSetQuery : FluidDataObject {
 		actions[\transformJoin] = [nil,action];
 		this.prSendMsg(this.transformJoinMsg(source1DataSet, source2DataSet, destDataSet));
 	}
+
+	kr{|trig, sourceDataSet, destDataSet|
+		^FluidDataSetQueryQuery.kr(trig, this, sourceDataSet, destDataSet);
+	}
+}
+
+FluidDataSetQueryQuery : FluidRTMultiOutUGen
+{
+	*kr{ |trig, dsq, sourceDataSet, destDataSet |
+		^this.multiNew('control', trig, dsq.asUGenInput, sourceDataSet.asUGenInput, destDataSet.asUGenInput)
+	}
+
+	init { arg ... theInputs;
+		inputs = theInputs;
+		^this.initOutputs(1, rate);
+	}
+
 }
+

From a7faf4ca9dfcd56b48f5cb82958d19ea5b8dcbc7 Mon Sep 17 00:00:00 2001
From: Pierre Alexandre Tremblay <info@pierrealexandretremblay.com>
Date: Thu, 12 Jun 2025 20:16:23 +0200
Subject: [PATCH 2/2] tweaks

---
 release-packaging/Classes/FluidDataSetQuery.sc | 2 +-
 scripts/settings/FluidManipulation.cpp.in      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/release-packaging/Classes/FluidDataSetQuery.sc b/release-packaging/Classes/FluidDataSetQuery.sc
index f804b8ac..7db71a44 100644
--- a/release-packaging/Classes/FluidDataSetQuery.sc
+++ b/release-packaging/Classes/FluidDataSetQuery.sc
@@ -1,7 +1,7 @@
 FluidDataSetQuery : FluidModelObject {
 	*new{|server| ^super.new(server) }
 
-	prGetParams{^[this.id, -1, -1];}
+	prGetParams{^[this.id];}
 
 	addColumnMsg { |column|
 		^this.prMakeMsg(\addColumn,id,column);
diff --git a/scripts/settings/FluidManipulation.cpp.in b/scripts/settings/FluidManipulation.cpp.in
index fadbcc18..fc133d14 100644
--- a/scripts/settings/FluidManipulation.cpp.in
+++ b/scripts/settings/FluidManipulation.cpp.in
@@ -1,3 +1,4 @@
+  makeSCWrapper<RTDataSetQueryClient>("FluidDataSetQueryQuery",inTable);
   makeSCWrapper<RTDataSetReadClient>("FluidDataSetRead",inTable);
   makeSCWrapper<RTKDTreeQueryClient>("FluidKDTreeQuery",inTable);
   makeSCWrapper<RTKMeansQueryClient>("FluidKMeansQuery",inTable);