duckdb 0.3.5-dev116.0 → 0.3.5-dev154.0

package/src/duckdb.hpp

@@ -11,8 +11,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #pragma once
 #define DUCKDB_AMALGAMATION 1
 #define DUCKDB_AMALGAMATION_EXTENDED 1
-#define DUCKDB_SOURCE_ID "4523b1e22"
-#define DUCKDB_VERSION "v0.3.5-dev116"
+#define DUCKDB_SOURCE_ID "0d3368c18"
+#define DUCKDB_VERSION "v0.3.5-dev154"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -3094,6 +3094,8 @@ template <>
 DUCKDB_API timestamp_t Value::GetValue() const;
 template <>
 DUCKDB_API interval_t Value::GetValue() const;
+template <>
+DUCKDB_API Value Value::GetValue() const;
 
 template <>
 DUCKDB_API bool Value::GetValueUnsafe() const;
@@ -6137,7 +6139,7 @@ public:
 	static bool RequiresQuotes(const string &text);
 
 	//! Writes a string that is optionally quoted + escaped so it can be used as an identifier
-	static string WriteOptionallyQuoted(const string &text);
+	static string WriteOptionallyQuoted(const string &text, char quote = '"');
 };
 
 } // namespace duckdb
@@ -13781,6 +13783,7 @@ public:
 
 
 namespace duckdb {
+
 //! SQLStatement is the base class of any type of SQL statement.
 class SQLStatement {
 public:
@@ -13803,6 +13806,9 @@ protected:
 	SQLStatement(const SQLStatement &other) = default;
 
 public:
+	virtual string ToString() const {
+		throw InternalException("ToString not supported for this type of SQLStatement");
+	}
 	//! Create a copy of this SelectStatement
 	virtual unique_ptr<SQLStatement> Copy() const = 0;
 };
@@ -13907,7 +13913,9 @@ public:
 
 public:
 	//! Convert the object to a string
-	virtual string ToString() const;
+	virtual string ToString() const = 0;
+	string BaseToString(string result) const;
+	string BaseToString(string result, const vector<string> &column_name_alias) const;
 	void Print();
 
 	virtual bool Equals(const TableRef *other) const;
@@ -13944,6 +13952,8 @@ protected:
 	SelectStatement(const SelectStatement &other);
 
 public:
+	//! Convert the SELECT statement to a string
+	string ToString() const override;
 	//! Create a copy of this SelectStatement
 	unique_ptr<SQLStatement> Copy() const override;
 	//! Serializes a SelectStatement to a stand-alone binary blob
@@ -13995,6 +14005,9 @@ public:
 	virtual const vector<unique_ptr<ParsedExpression>> &GetSelectList() const = 0;
 
 public:
+	//! Convert the query node to a string
+	virtual string ToString() const = 0;
+
 	virtual bool Equals(const QueryNode *other) const;
 
 	//! Create a copy of this QueryNode
@@ -14006,6 +14019,9 @@ public:
 	//! Deserializes a blob back into a QueryNode
 	DUCKDB_API static unique_ptr<QueryNode> Deserialize(Deserializer &source);
 
+	string CTEToString() const;
+	string ResultModifiersToString() const;
+
 protected:
 	//! Copy base QueryNode properties from another expression to this one,
 	//! used in Copy method
@@ -22714,11 +22730,11 @@ public:
 public:
 	template <class T, class BASE>
 	static string ToString(const T &entry) {
-		string result = entry.children[0]->ToString();
+		string result = "(" + entry.children[0]->ToString();
 		for (idx_t i = 1; i < entry.children.size(); i++) {
 			result += " " + ExpressionTypeToOperator(entry.type) + " " + entry.children[i]->ToString();
 		}
-		return result;
+		return result + ")";
 	}
 };
 } // namespace duckdb
@@ -22854,7 +22870,7 @@ public:
 	template <class T, class BASE>
 	static string ToString(const T &entry, const string &schema, const string &function_name, bool is_operator = false,
 	                       bool distinct = false, BASE *filter = nullptr, OrderModifier *order_bys = nullptr,
-	                       bool export_state = false) {
+	                       bool export_state = false, bool add_alias = false) {
 		if (is_operator) {
 			// built-in operator
 			D_ASSERT(!distinct);
@@ -22876,8 +22892,11 @@ public:
 		if (distinct) {
 			result += "DISTINCT ";
 		}
-		result += StringUtil::Join(entry.children, entry.children.size(), ", ",
-		                           [](const unique_ptr<BASE> &child) { return child->ToString(); });
+		result += StringUtil::Join(entry.children, entry.children.size(), ", ", [&](const unique_ptr<BASE> &child) {
+			return child->alias.empty() || !add_alias
+			           ? child->ToString()
+			           : KeywordHelper::WriteOptionallyQuoted(child->alias) + " := " + child->ToString();
+		});
 		// ordered aggregate
 		if (order_bys && !order_bys->orders.empty()) {
 			if (entry.children.empty()) {
@@ -22995,10 +23014,10 @@ public:
 			       KeywordHelper::WriteOptionallyQuoted(child_string.substr(1, child_string.size() - 2));
 		}
 		case ExpressionType::ARRAY_CONSTRUCTOR: {
-			string result = "ARRAY[";
+			string result = "(ARRAY[";
 			result += StringUtil::Join(entry.children, entry.children.size(), ", ",
 			                           [](const unique_ptr<BASE> &child) { return child->ToString(); });
-			result += "]";
+			result += "])";
 			return result;
 		}
 		default:
@@ -23794,6 +23813,7 @@ public:
 	vector<string> expected_names;
 
 public:
+	string ToString() const override;
 	bool Equals(const TableRef *other_p) const override;
 
 	unique_ptr<TableRef> Copy() override;
@@ -23830,6 +23850,7 @@ public:
 	unique_ptr<TableRef> right;
 
 public:
+	string ToString() const override;
 	bool Equals(const TableRef *other_p) const override;
 
 	unique_ptr<TableRef> Copy() override;
@@ -23861,6 +23882,7 @@ public:
 	}
 
 public:
+	string ToString() const override;
 	bool Equals(const TableRef *other_p) const override;
 
 	unique_ptr<TableRef> Copy() override;
@@ -23910,6 +23932,7 @@ public:
 	vector<string> using_columns;
 
 public:
+	string ToString() const override;
 	bool Equals(const TableRef *other_p) const override;
 
 	unique_ptr<TableRef> Copy() override;
@@ -23946,6 +23969,7 @@ public:
 	vector<string> column_name_alias;
 
 public:
+	string ToString() const override;
 	bool Equals(const TableRef *other_p) const override;
 
 	unique_ptr<TableRef> Copy() override;