duckdb 0.8.1-dev31.0 → 0.8.1-dev327.0

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

@@ -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

@@ -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

@@ -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

@@ -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/parser.hpp

@@ -62,6 +62,8 @@ public:
 	//! Parses a column list (i.e. as found in a CREATE TABLE statement)
 	static ColumnList ParseColumnList(const string &column_list, ParserOptions options = ParserOptions());
 
+	static bool StripUnicodeSpaces(const string &query_str, string &new_query);
+
 private:
 	ParserOptions options;
 };

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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -11,7 +11,7 @@
 #include "duckdb/parser/tableref.hpp"
 
 namespace duckdb {
-//! Represents a cross product
+
 class EmptyTableRef : public TableRef {
 public:
 	static constexpr const TableReferenceType TYPE = TableReferenceType::EMPTY;
@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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