fix: fix bind errors and add parameter validation

Author: rustyconover

src/textplot_bar.cpp

@@ -68,7 +68,7 @@ struct TextplotBarBindData : public FunctionData {
 		} else if (shape == "heart") {
 			lookup_map = &emoji_hearts;
 		} else {
-			throw BinderException("tp_bar: 'shape' argument must be one of 'square', 'circle', or 'heart'");
+			throw BinderException("tp_bar: 'shape' argument must be one of 'square', 'circle', 'heart'");
 		}
 
 		if (!color.empty()) {
@@ -100,7 +100,10 @@ unique_ptr<FunctionData> TextplotBarBindData::Copy() const {
 }
 
 bool TextplotBarBindData::Equals(const FunctionData &other_p) const {
-	return true;
+	const auto &other = other_p.Cast<TextplotBarBindData>();
+	return min == other.min && max == other.max && width == other.width && on == other.on && off == other.off &&
+	       filled == other.filled && thresholds == other.thresholds && char_shape == other.char_shape &&
+	       on_color == other.on_color && off_color == other.off_color;
 }
 
 unique_ptr<FunctionData> TextplotBarBind(ClientContext &context, ScalarFunction &bound_function,
@@ -221,10 +224,18 @@ unique_ptr<FunctionData> TextplotBarBind(ClientContext &context, ScalarFunction
 		shape = "square";
 	} else {
 		if (shape != "square" && shape != "circle" && shape != "heart") {
-			throw BinderException("tp_bar: 'shape' argument must be one of 'square', 'circle', or 'heart'");
+			throw BinderException("tp_bar: 'shape' argument must be one of 'square', 'circle', 'heart'");
 		}
 	}
 
+	if (width < 1) {
+		throw BinderException("tp_bar: 'width' argument must be at least 1");
+	}
+
+	if (min >= max) {
+		throw BinderException("tp_bar: 'min' must be less than 'max'");
+	}
+
 	return make_uniq<TextplotBarBindData>(min, max, width, on, off, filled, thresholds, shape, on_color, off_color);
 }
 

src/textplot_density.cpp

@@ -25,9 +25,6 @@ const std::unordered_map<std::string, std::vector<std::string>> density_sets = {
     {"white", {" ", "⚪", "🔘", "⚫"}},
 };
 
-// Density plot character sets
-extern const std::unordered_map<std::string, std::vector<std::string>> density_sets;
-
 // Density plot bind data structure
 struct TextplotDensityBindData : public FunctionData {
 	int64_t width = 20;
@@ -42,7 +39,8 @@ struct TextplotDensityBindData : public FunctionData {
 		return make_uniq<TextplotDensityBindData>(width, density_chars, marker_char);
 	}
 	bool Equals(const FunctionData &other_p) const override {
-		return true;
+		const auto &other = other_p.Cast<TextplotDensityBindData>();
+		return width == other.width && density_chars == other.density_chars && marker_char == other.marker_char;
 	}
 };
 
@@ -128,6 +126,11 @@ unique_ptr<FunctionData> TextplotDensityBind(ClientContext &context, ScalarFunct
 			throw BinderException(StringUtil::Format("tp_density: Unknown style '%s'", style));
 		}
 	}
+
+	if (width < 1) {
+		throw BinderException("tp_density: 'width' argument must be at least 1");
+	}
+
 	return make_uniq<TextplotDensityBindData>(width, graph_characters, marker_char);
 }
 

src/textplot_qr.cpp

@@ -27,7 +27,8 @@ unique_ptr<FunctionData> TextplotQRBindData::Copy() const {
 }
 
 bool TextplotQRBindData::Equals(const FunctionData &other_p) const {
-	return true;
+	const auto &other = other_p.Cast<TextplotQRBindData>();
+	return ecc == other.ecc && on == other.on && off == other.off;
 }
 
 unique_ptr<FunctionData> TextplotQRBind(ClientContext &context, ScalarFunction &bound_function,
@@ -75,6 +76,11 @@ unique_ptr<FunctionData> TextplotQRBind(ClientContext &context, ScalarFunction &
 		}
 	}
 
+	// Validate ECC at bind time
+	if (ecc != "low" && ecc != "medium" && ecc != "quartile" && ecc != "high") {
+		throw BinderException("tp_qr: 'ecc' argument must be one of 'low', 'medium', 'quartile', 'high'");
+	}
+
 	if (off.empty()) {
 		off = "⬜";
 	}
@@ -97,17 +103,14 @@ void TextplotQR(DataChunk &args, ExpressionState &state, Vector &result) {
 		// auto qr = qrcodegen::QrCode::encodeSegments(segs, qrcodegen::QrCode::Ecc::LOW, bind_data.min_version,
 		//                                             bind_data.max_version, -1, bind_data.boost_ecc);
 
+		// ECC is already validated at bind time
 		qrcodegen::QrCode::Ecc ecc_level = qrcodegen::QrCode::Ecc::LOW;
-		if (bind_data.ecc == "low") {
-			ecc_level = qrcodegen::QrCode::Ecc::LOW;
-		} else if (bind_data.ecc == "medium") {
+		if (bind_data.ecc == "medium") {
 			ecc_level = qrcodegen::QrCode::Ecc::MEDIUM;
 		} else if (bind_data.ecc == "quartile") {
 			ecc_level = qrcodegen::QrCode::Ecc::QUARTILE;
 		} else if (bind_data.ecc == "high") {
 			ecc_level = qrcodegen::QrCode::Ecc::HIGH;
-		} else {
-			throw InvalidTypeException("tp_qr: 'ecc' argument must be one of 'low', 'medium', 'quartile', 'high'");
 		}
 
 		auto qr = qrcodegen::QrCode::encodeText(value.GetString().c_str(), ecc_level);

src/textplot_sparkline.cpp

@@ -283,7 +283,8 @@ unique_ptr<FunctionData> TextplotSparklineBindData::Copy() const {
 }
 
 bool TextplotSparklineBindData::Equals(const FunctionData &other_p) const {
-	return true;
+	const auto &other = other_p.Cast<TextplotSparklineBindData>();
+	return mode == other.mode && theme == other.theme && width == other.width;
 }
 
 unique_ptr<FunctionData> TextplotSparklineBind(ClientContext &context, ScalarFunction &bound_function,
@@ -359,10 +360,14 @@ unique_ptr<FunctionData> TextplotSparklineBind(ClientContext &context, ScalarFun
 		}
 	}
 	if (std::find(available_themes.begin(), available_themes.end(), theme) == available_themes.end()) {
-		throw BinderException(StringUtil::Format("tp_sparkline: Unknown theme '%s' for type '%s' available are <%s>",
+		throw BinderException(StringUtil::Format("tp_sparkline: Unknown theme '%s' for mode '%s', available are <%s>",
 		                                         theme, specified_mode, StringUtil::Join(available_themes, ", ")));
 	}
 
+	if (width < 1) {
+		throw BinderException("tp_sparkline: 'width' argument must be at least 1");
+	}
+
 	return make_uniq<TextplotSparklineBindData>(mode, theme, width);
 }