npm - duckdb - Versions diffs - 0.8.0 → 0.8.1-dev111.0 - Mend

duckdb 0.8.0 → 0.8.1-dev111.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (556) hide show

package/src/duckdb/src/include/duckdb/parser/base_expression.hpp CHANGED Viewed

@@ -71,19 +71,13 @@ public:
 	//! Expression::Equals() returns true), that their hash value is identical as well.
 	virtual hash_t Hash() const = 0;
 	//! Returns true if this expression is equal to another expression
-	virtual bool Equals(const BaseExpression *other) const;
+	virtual bool Equals(const BaseExpression &other) const;
-	static bool Equals(const BaseExpression *left, const BaseExpression *right) {
-		if (left == right) {
-			return true;
-		}
-		if (!left || !right) {
-			return false;
-		}
-		return left->Equals(right);
+	static bool Equals(const BaseExpression &left, const BaseExpression &right) {
+		return left.Equals(right);
 	}
 	bool operator==(const BaseExpression &rhs) {
-		return this->Equals(&rhs);
+		return Equals(rhs);
 	}
 	virtual void Verify() const;
@@ -94,7 +88,7 @@ public:
 		if (expression_class != TARGET::TYPE) {
 			throw InternalException("Failed to cast expression to type - expression type mismatch");
 		}
-		return (TARGET &)*this;
+		return reinterpret_cast<TARGET &>(*this);
 	}
 	template <class TARGET>
@@ -102,7 +96,7 @@ public:
 		if (expression_class != TARGET::TYPE) {
 			throw InternalException("Failed to cast expression to type - expression type mismatch");
 		}
-		return (const TARGET &)*this;
+		return reinterpret_cast<const TARGET &>(*this);
 	}
 };

package/src/duckdb/src/include/duckdb/parser/constraint.hpp CHANGED Viewed

@@ -74,7 +74,7 @@ public:
 		if (type != TARGET::TYPE) {
 			throw InternalException("Failed to cast constraint to type - constraint type mismatch");
 		}
-		return (TARGET &)*this;
+		return reinterpret_cast<TARGET &>(*this);
 	}
 	template <class TARGET>
@@ -82,7 +82,7 @@ public:
 		if (type != TARGET::TYPE) {
 			throw InternalException("Failed to cast constraint to type - constraint type mismatch");
 		}
-		return (const TARGET &)*this;
+		return reinterpret_cast<const TARGET &>(*this);
 	}
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/expression/between_expression.hpp CHANGED Viewed

@@ -27,7 +27,7 @@ public:
 public:
 	string ToString() const override;
-	static bool Equal(const BetweenExpression *a, const BetweenExpression *b);
+	static bool Equal(const BetweenExpression &a, const BetweenExpression &b);
 	unique_ptr<ParsedExpression> Copy() const override;

package/src/duckdb/src/include/duckdb/parser/expression/bound_expression.hpp CHANGED Viewed

@@ -32,7 +32,7 @@ public:
 	string ToString() const override;
-	bool Equals(const BaseExpression *other) const override;
+	bool Equals(const BaseExpression &other) const override;
 	hash_t Hash() const override;
 	unique_ptr<ParsedExpression> Copy() const override;

package/src/duckdb/src/include/duckdb/parser/expression/case_expression.hpp CHANGED Viewed

@@ -35,7 +35,7 @@ public:
 public:
 	string ToString() const override;
-	static bool Equal(const CaseExpression *a, const CaseExpression *b);
+	static bool Equal(const CaseExpression &a, const CaseExpression &b);
 	unique_ptr<ParsedExpression> Copy() const override;

package/src/duckdb/src/include/duckdb/parser/expression/cast_expression.hpp CHANGED Viewed

@@ -31,7 +31,7 @@ public:
 public:
 	string ToString() const override;
-	static bool Equal(const CastExpression *a, const CastExpression *b);
+	static bool Equal(const CastExpression &a, const CastExpression &b);
 	unique_ptr<ParsedExpression> Copy() const override;

package/src/duckdb/src/include/duckdb/parser/expression/collate_expression.hpp CHANGED Viewed

@@ -28,7 +28,7 @@ public:
 public:
 	string ToString() const override;
-	static bool Equal(const CollateExpression *a, const CollateExpression *b);
+	static bool Equal(const CollateExpression &a, const CollateExpression &b);
 	unique_ptr<ParsedExpression> Copy() const override;

package/src/duckdb/src/include/duckdb/parser/expression/columnref_expression.hpp CHANGED Viewed

@@ -41,7 +41,7 @@ public:
 	string GetName() const override;
 	string ToString() const override;
-	static bool Equal(const ColumnRefExpression *a, const ColumnRefExpression *b);
+	static bool Equal(const ColumnRefExpression &a, const ColumnRefExpression &b);
 	hash_t Hash() const override;
 	unique_ptr<ParsedExpression> Copy() const override;

package/src/duckdb/src/include/duckdb/parser/expression/comparison_expression.hpp CHANGED Viewed

@@ -27,7 +27,7 @@ public:
 public:
 	string ToString() const override;
-	static bool Equal(const ComparisonExpression *a, const ComparisonExpression *b);
+	static bool Equal(const ComparisonExpression &a, const ComparisonExpression &b);
 	unique_ptr<ParsedExpression> Copy() const override;

package/src/duckdb/src/include/duckdb/parser/expression/conjunction_expression.hpp CHANGED Viewed

@@ -31,7 +31,7 @@ public:
 	string ToString() const override;
-	static bool Equal(const ConjunctionExpression *a, const ConjunctionExpression *b);
+	static bool Equal(const ConjunctionExpression &a, const ConjunctionExpression &b);
 	unique_ptr<ParsedExpression> Copy() const override;

package/src/duckdb/src/include/duckdb/parser/expression/constant_expression.hpp CHANGED Viewed

@@ -27,7 +27,7 @@ public:
 public:
 	string ToString() const override;
-	static bool Equal(const ConstantExpression *a, const ConstantExpression *b);
+	static bool Equal(const ConstantExpression &a, const ConstantExpression &b);
 	hash_t Hash() const override;
 	unique_ptr<ParsedExpression> Copy() const override;

package/src/duckdb/src/include/duckdb/parser/expression/function_expression.hpp CHANGED Viewed

@@ -53,7 +53,7 @@ public:
 	unique_ptr<ParsedExpression> Copy() const override;
-	static bool Equal(const FunctionExpression *a, const FunctionExpression *b);
+	static bool Equal(const FunctionExpression &a, const FunctionExpression &b);
 	hash_t Hash() const override;
 	void Serialize(FieldWriter &writer) const override;

package/src/duckdb/src/include/duckdb/parser/expression/lambda_expression.hpp CHANGED Viewed

@@ -33,7 +33,7 @@ public:
 public:
 	string ToString() const override;
-	static bool Equal(const LambdaExpression *a, const LambdaExpression *b);
+	static bool Equal(const LambdaExpression &a, const LambdaExpression &b);
 	hash_t Hash() const override;
 	unique_ptr<ParsedExpression> Copy() const override;

package/src/duckdb/src/include/duckdb/parser/expression/operator_expression.hpp CHANGED Viewed

@@ -29,7 +29,7 @@ public:
 public:
 	string ToString() const override;
-	static bool Equal(const OperatorExpression *a, const OperatorExpression *b);
+	static bool Equal(const OperatorExpression &a, const OperatorExpression &b);
 	unique_ptr<ParsedExpression> Copy() const override;

package/src/duckdb/src/include/duckdb/parser/expression/parameter_expression.hpp CHANGED Viewed

@@ -30,7 +30,7 @@ public:
 	string ToString() const override;
-	static bool Equal(const ParameterExpression *a, const ParameterExpression *b);
+	static bool Equal(const ParameterExpression &a, const ParameterExpression &b);
 	unique_ptr<ParsedExpression> Copy() const override;
 	hash_t Hash() const override;

package/src/duckdb/src/include/duckdb/parser/expression/positional_reference_expression.hpp CHANGED Viewed

@@ -27,7 +27,7 @@ public:
 	string ToString() const override;
-	static bool Equal(const PositionalReferenceExpression *a, const PositionalReferenceExpression *b);
+	static bool Equal(const PositionalReferenceExpression &a, const PositionalReferenceExpression &b);
 	unique_ptr<ParsedExpression> Copy() const override;
 	hash_t Hash() const override;

package/src/duckdb/src/include/duckdb/parser/expression/star_expression.hpp CHANGED Viewed

@@ -35,7 +35,7 @@ public:
 public:
 	string ToString() const override;
-	static bool Equal(const StarExpression *a, const StarExpression *b);
+	static bool Equal(const StarExpression &a, const StarExpression &b);
 	unique_ptr<ParsedExpression> Copy() const override;

package/src/duckdb/src/include/duckdb/parser/expression/subquery_expression.hpp CHANGED Viewed

@@ -42,7 +42,7 @@ public:
 	string ToString() const override;
-	static bool Equal(const SubqueryExpression *a, const SubqueryExpression *b);
+	static bool Equal(const SubqueryExpression &a, const SubqueryExpression &b);
 	unique_ptr<ParsedExpression> Copy() const override;

package/src/duckdb/src/include/duckdb/parser/expression/window_expression.hpp CHANGED Viewed

@@ -70,7 +70,7 @@ public:
 	//! Convert the Expression to a String
 	string ToString() const override;
-	static bool Equal(const WindowExpression *a, const WindowExpression *b);
+	static bool Equal(const WindowExpression &a, const WindowExpression &b);
 	unique_ptr<ParsedExpression> Copy() const override;

package/src/duckdb/src/include/duckdb/parser/expression_map.hpp CHANGED Viewed

@@ -27,7 +27,7 @@ struct ExpressionHashFunction {
 template <class T>
 struct ExpressionEquality {
 	bool operator()(const reference<T> &a, const reference<T> &b) const {
-		return a.get().Equals(&b.get());
+		return a.get().Equals(b.get());
 	}
 };

package/src/duckdb/src/include/duckdb/parser/parsed_data/parse_info.hpp CHANGED Viewed

@@ -20,13 +20,13 @@ public:
 	template <class TARGET>
 	TARGET &Cast() {
 		D_ASSERT(dynamic_cast<TARGET *>(this));
-		return (TARGET &)*this;
+		return reinterpret_cast<TARGET &>(*this);
 	}
 	template <class TARGET>
 	const TARGET &Cast() const {
 		D_ASSERT(dynamic_cast<const TARGET *>(this));
-		return (const TARGET &)*this;
+		return reinterpret_cast<const TARGET &>(*this);
 	}
 };

package/src/duckdb/src/include/duckdb/parser/parsed_expression.hpp CHANGED Viewed

@@ -47,7 +47,7 @@ public:
 	bool IsScalar() const override;
 	bool HasParameter() const override;
-	bool Equals(const BaseExpression *other) const override;
+	bool Equals(const BaseExpression &other) const override;
 	hash_t Hash() const override;
 	//! Create a copy of this expression
@@ -65,6 +65,10 @@ public:
 	virtual void FormatSerialize(FormatSerializer &serializer) const;
 	static unique_ptr<ParsedExpression> FormatDeserialize(FormatDeserializer &deserializer);
+	static bool Equals(const unique_ptr<ParsedExpression> &left, const unique_ptr<ParsedExpression> &right);
+	static bool ListEquals(const vector<unique_ptr<ParsedExpression>> &left,
+	                       const vector<unique_ptr<ParsedExpression>> &right);
 protected:
 	//! Copy base Expression properties from another expression to this one,
 	//! used in Copy method

package/src/duckdb/src/include/duckdb/parser/query_node.hpp CHANGED Viewed

@@ -95,7 +95,7 @@ public:
 		if (type != TARGET::TYPE) {
 			throw InternalException("Failed to cast query node to type - query node type mismatch");
 		}
-		return (TARGET &)*this;
+		return reinterpret_cast<TARGET &>(*this);
 	}
 	template <class TARGET>
@@ -103,7 +103,7 @@ public:
 		if (type != TARGET::TYPE) {
 			throw InternalException("Failed to cast query node to type - query node type mismatch");
 		}
-		return (const TARGET &)*this;
+		return reinterpret_cast<const TARGET &>(*this);
 	}
 };

package/src/duckdb/src/include/duckdb/parser/result_modifier.hpp CHANGED Viewed

@@ -41,7 +41,7 @@ public:
 public:
 	//! Returns true if the two result modifiers are equivalent
-	virtual bool Equals(const ResultModifier *other) const;
+	virtual bool Equals(const ResultModifier &other) const;
 	//! Create a copy of this ResultModifier
 	virtual unique_ptr<ResultModifier> Copy() const = 0;
@@ -54,6 +54,23 @@ public:
 	virtual void FormatSerialize(FormatSerializer &serializer) const;
 	static unique_ptr<ResultModifier> FormatDeserialize(FormatDeserializer &deserializer);
+public:
+	template <class TARGET>
+	TARGET &Cast() {
+		if (type != TARGET::TYPE) {
+			throw InternalException("Failed to cast result modifier to type - result modifier type mismatch");
+		}
+		return reinterpret_cast<TARGET &>(*this);
+	}
+	template <class TARGET>
+	const TARGET &Cast() const {
+		if (type != TARGET::TYPE) {
+			throw InternalException("Failed to cast result modifier to type - result modifier type mismatch");
+		}
+		return reinterpret_cast<const TARGET &>(*this);
+	}
 };
 //! Single node in ORDER BY statement
@@ -79,6 +96,9 @@ public:
 };
 class LimitModifier : public ResultModifier {
+public:
+	static constexpr const ResultModifierType TYPE = ResultModifierType::LIMIT_MODIFIER;
 public:
 	LimitModifier() : ResultModifier(ResultModifierType::LIMIT_MODIFIER) {
 	}
@@ -89,7 +109,7 @@ public:
 	unique_ptr<ParsedExpression> offset;
 public:
-	bool Equals(const ResultModifier *other) const override;
+	bool Equals(const ResultModifier &other) const override;
 	unique_ptr<ResultModifier> Copy() const override;
 	void Serialize(FieldWriter &writer) const override;
 	static unique_ptr<ResultModifier> Deserialize(FieldReader &reader);
@@ -99,6 +119,9 @@ public:
 };
 class OrderModifier : public ResultModifier {
+public:
+	static constexpr const ResultModifierType TYPE = ResultModifierType::ORDER_MODIFIER;
 public:
 	OrderModifier() : ResultModifier(ResultModifierType::ORDER_MODIFIER) {
 	}
@@ -107,16 +130,21 @@ public:
 	vector<OrderByNode> orders;
 public:
-	bool Equals(const ResultModifier *other) const override;
+	bool Equals(const ResultModifier &other) const override;
 	unique_ptr<ResultModifier> Copy() const override;
 	void Serialize(FieldWriter &writer) const override;
 	static unique_ptr<ResultModifier> Deserialize(FieldReader &reader);
 	void FormatSerialize(FormatSerializer &serializer) const override;
 	static unique_ptr<ResultModifier> FormatDeserialize(FormatDeserializer &deserializer);
+	static bool Equals(const unique_ptr<OrderModifier> &left, const unique_ptr<OrderModifier> &right);
 };
 class DistinctModifier : public ResultModifier {
+public:
+	static constexpr const ResultModifierType TYPE = ResultModifierType::DISTINCT_MODIFIER;
 public:
 	DistinctModifier() : ResultModifier(ResultModifierType::DISTINCT_MODIFIER) {
 	}
@@ -125,7 +153,7 @@ public:
 	vector<unique_ptr<ParsedExpression>> distinct_on_targets;
 public:
-	bool Equals(const ResultModifier *other) const override;
+	bool Equals(const ResultModifier &other) const override;
 	unique_ptr<ResultModifier> Copy() const override;
 	void Serialize(FieldWriter &writer) const override;
 	static unique_ptr<ResultModifier> Deserialize(FieldReader &reader);
@@ -135,6 +163,9 @@ public:
 };
 class LimitPercentModifier : public ResultModifier {
+public:
+	static constexpr const ResultModifierType TYPE = ResultModifierType::LIMIT_PERCENT_MODIFIER;
 public:
 	LimitPercentModifier() : ResultModifier(ResultModifierType::LIMIT_PERCENT_MODIFIER) {
 	}
@@ -145,7 +176,7 @@ public:
 	unique_ptr<ParsedExpression> offset;
 public:
-	bool Equals(const ResultModifier *other) const override;
+	bool Equals(const ResultModifier &other) const override;
 	unique_ptr<ResultModifier> Copy() const override;
 	void Serialize(FieldWriter &writer) const override;
 	static unique_ptr<ResultModifier> Deserialize(FieldReader &reader);

package/src/duckdb/src/include/duckdb/parser/sql_statement.hpp CHANGED Viewed

@@ -18,6 +18,9 @@ namespace duckdb {
 //! SQLStatement is the base class of any type of SQL statement.
 class SQLStatement {
+public:
+	static constexpr const StatementType TYPE = StatementType::INVALID_STATEMENT;
 public:
 	explicit SQLStatement(StatementType type) : type(type) {
 	}
@@ -52,18 +55,18 @@ public:
 public:
 	template <class TARGET>
 	TARGET &Cast() {
-		if (type != TARGET::TYPE) {
+		if (type != TARGET::TYPE && TARGET::TYPE != StatementType::INVALID_STATEMENT) {
 			throw InternalException("Failed to cast statement to type - statement type mismatch");
 		}
-		return (TARGET &)*this;
+		return reinterpret_cast<TARGET &>(*this);
 	}
 	template <class TARGET>
 	const TARGET &Cast() const {
-		if (type != TARGET::TYPE) {
+		if (type != TARGET::TYPE && TARGET::TYPE != StatementType::INVALID_STATEMENT) {
 			throw InternalException("Failed to cast statement to type - statement type mismatch");
 		}
-		return (const TARGET &)*this;
+		return reinterpret_cast<const TARGET &>(*this);
 	}
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/statement/select_statement.hpp CHANGED Viewed

@@ -46,7 +46,7 @@ public:
 	//! deserialization is not possible
 	static unique_ptr<SelectStatement> Deserialize(Deserializer &source);
 	//! Whether or not the statements are equivalent
-	bool Equals(const SQLStatement *other) const;
+	bool Equals(const SQLStatement &other) const;
 	void FormatSerialize(FormatSerializer &serializer) const;
 	static unique_ptr<SelectStatement> FormatDeserialize(FormatDeserializer &deserializer);

package/src/duckdb/src/include/duckdb/parser/tableref/basetableref.hpp CHANGED Viewed

@@ -33,7 +33,7 @@ public:
 public:
 	string ToString() const override;
-	bool Equals(const TableRef *other_p) const override;
+	bool Equals(const TableRef &other_p) const override;
 	unique_ptr<TableRef> Copy() override;

package/src/duckdb/src/include/duckdb/parser/tableref/emptytableref.hpp CHANGED Viewed

@@ -22,7 +22,7 @@ public:
 public:
 	string ToString() const override;
-	bool Equals(const TableRef *other_p) const override;
+	bool Equals(const TableRef &other_p) const override;
 	unique_ptr<TableRef> Copy() override;

package/src/duckdb/src/include/duckdb/parser/tableref/expressionlistref.hpp CHANGED Viewed

@@ -32,7 +32,7 @@ public:
 public:
 	string ToString() const override;
-	bool Equals(const TableRef *other_p) const override;
+	bool Equals(const TableRef &other_p) const override;
 	unique_ptr<TableRef> Copy() override;

package/src/duckdb/src/include/duckdb/parser/tableref/joinref.hpp CHANGED Viewed

@@ -42,7 +42,7 @@ public:
 public:
 	string ToString() const override;
-	bool Equals(const TableRef *other_p) const override;
+	bool Equals(const TableRef &other_p) const override;
 	unique_ptr<TableRef> Copy() override;

package/src/duckdb/src/include/duckdb/parser/tableref/pivotref.hpp CHANGED Viewed

@@ -89,7 +89,7 @@ public:
 public:
 	string ToString() const override;
-	bool Equals(const TableRef *other_p) const override;
+	bool Equals(const TableRef &other_p) const override;
 	unique_ptr<TableRef> Copy() override;

package/src/duckdb/src/include/duckdb/parser/tableref/subqueryref.hpp CHANGED Viewed

@@ -27,7 +27,7 @@ public:
 public:
 	string ToString() const override;
-	bool Equals(const TableRef *other_p) const override;
+	bool Equals(const TableRef &other_p) const override;
 	unique_ptr<TableRef> Copy() override;

package/src/duckdb/src/include/duckdb/parser/tableref/table_function_ref.hpp CHANGED Viewed

@@ -35,7 +35,7 @@ public:
 public:
 	string ToString() const override;
-	bool Equals(const TableRef *other_p) const override;
+	bool Equals(const TableRef &other_p) const override;
 	unique_ptr<TableRef> Copy() override;

package/src/duckdb/src/include/duckdb/parser/tableref.hpp CHANGED Viewed

@@ -41,7 +41,8 @@ public:
 	string BaseToString(string result, const vector<string> &column_name_alias) const;
 	void Print();
-	virtual bool Equals(const TableRef *other) const;
+	virtual bool Equals(const TableRef &other) const;
+	static bool Equals(const unique_ptr<TableRef> &left, const unique_ptr<TableRef> &right);
 	virtual unique_ptr<TableRef> Copy() = 0;
@@ -63,7 +64,7 @@ public:
 		if (type != TARGET::TYPE && TARGET::TYPE != TableReferenceType::INVALID) {
 			throw InternalException("Failed to cast constraint to type - constraint type mismatch");
 		}
-		return (TARGET &)*this;
+		return reinterpret_cast<TARGET &>(*this);
 	}
 	template <class TARGET>
@@ -71,7 +72,7 @@ public:
 		if (type != TARGET::TYPE && TARGET::TYPE != TableReferenceType::INVALID) {
 			throw InternalException("Failed to cast constraint to type - constraint type mismatch");
 		}
-		return (const TARGET &)*this;
+		return reinterpret_cast<const TARGET &>(*this);
 	}
 };
 } // namespace duckdb