QualifiedName and ProfilerPrintFormat

Author: evertlammerts

src/duckdb_py/pyconnection.cpp

@@ -413,7 +413,7 @@ shared_ptr<DuckDBPyConnection> DuckDBPyConnection::UnregisterUDF(const string &n
 		auto &catalog = Catalog::GetCatalog(context, SYSTEM_CATALOG);
 		DropInfo info;
 		info.type = CatalogType::SCALAR_FUNCTION_ENTRY;
-		info.name = Identifier(name);
+		info.NameMutable() = Identifier(name);
 		info.allow_drop_internal = true;
 		info.cascade = false;
 		info.if_not_found = OnEntryNotFound::THROW_EXCEPTION;
@@ -1651,11 +1651,12 @@ unique_ptr<DuckDBPyRelation> DuckDBPyConnection::RunQuery(const py::object &quer
 unique_ptr<DuckDBPyRelation> DuckDBPyConnection::Table(const string &tname) {
 	auto &connection = con.GetConnection();
 	auto qualified_name = QualifiedName::Parse(tname);
-	if (qualified_name.schema.empty()) {
-		qualified_name.schema = DEFAULT_SCHEMA;
+	if (qualified_name.Schema().empty()) {
+		qualified_name.SchemaMutable() = DEFAULT_SCHEMA;
 	}
 	try {
-		return CreateRelation(connection.Table(qualified_name.catalog, qualified_name.schema, qualified_name.name));
+		return CreateRelation(
+		    connection.Table(qualified_name.Catalog(), qualified_name.Schema(), qualified_name.Name()));
 	} catch (const CatalogException &) {
 		// CatalogException will be of the type '... is not a table'
 		// Not a table in the database, make a query relation that can perform replacement scans

src/duckdb_py/pyexpression.cpp

@@ -325,13 +325,13 @@ shared_ptr<DuckDBPyExpression> DuckDBPyExpression::ColumnExpression(const py::ar
 		}
 
 		auto qualified_name = QualifiedName::Parse(column_name);
-		if (!qualified_name.catalog.empty()) {
-			column_names.push_back(qualified_name.catalog);
+		if (!qualified_name.Catalog().empty()) {
+			column_names.push_back(qualified_name.Catalog());
 		}
-		if (!qualified_name.schema.empty()) {
-			column_names.push_back(qualified_name.schema);
+		if (!qualified_name.Schema().empty()) {
+			column_names.push_back(qualified_name.Schema());
 		}
-		column_names.push_back(qualified_name.name);
+		column_names.push_back(qualified_name.Name());
 	} else {
 		for (auto &part : names) {
 			column_names.push_back(Identifier(py::str(part)));

src/duckdb_py/pyrelation.cpp

@@ -1581,7 +1581,7 @@ DuckDBPyRelation &DuckDBPyRelation::Execute() {
 void DuckDBPyRelation::InsertInto(const string &table) {
 	AssertRelation();
 	auto parsed_info = QualifiedName::Parse(table);
-	auto insert = rel->InsertRel(parsed_info.catalog, parsed_info.schema, parsed_info.name);
+	auto insert = rel->InsertRel(parsed_info.Catalog(), parsed_info.Schema(), parsed_info.Name());
 	PyExecuteRelation(insert);
 }
 
@@ -1645,7 +1645,7 @@ void DuckDBPyRelation::Insert(const py::object &params) const {
 void DuckDBPyRelation::Create(const string &table) {
 	AssertRelation();
 	auto parsed_info = QualifiedName::Parse(table);
-	auto create = rel->CreateRel(parsed_info.schema, parsed_info.name, false);
+	auto create = rel->CreateRel(parsed_info.Schema(), parsed_info.Name(), false);
 	PyExecuteRelation(create);
 }
 
@@ -1747,7 +1747,7 @@ string DuckDBPyRelation::Explain(ExplainType type, const string &format) {
 
 	// An empty format means "auto": the default format, or HTML when running under Jupyter.
 	const bool auto_format = format.empty();
-	auto explain_format = auto_format ? GetExplainFormat(type) : ProfilerPrintFormat::FromString(format);
+	auto explain_format = auto_format ? GetExplainFormat(type) : ProfilerPrintFormat(format);
 	auto res = rel->Explain(type, explain_format);
 	D_ASSERT(res->type == duckdb::QueryResultType::MATERIALIZED_RESULT);
 	auto &materialized = res->Cast<MaterializedQueryResult>();