duckdb 0.7.2-dev2507.0 → 0.7.2-dev2675.0

package/src/duckdb/src/common/types.cpp

@@ -773,7 +773,7 @@ struct ExtraTypeInfo {
 
 	ExtraTypeInfoType type;
 	string alias;
-	TypeCatalogEntry *catalog_entry = nullptr;
+	optional_ptr<TypeCatalogEntry> catalog_entry;
 
 public:
 	bool Equals(ExtraTypeInfo *other_p) const {
@@ -845,21 +845,6 @@ bool LogicalType::HasAlias() const {
 	return false;
 }
 
-void LogicalType::SetCatalog(LogicalType &type, TypeCatalogEntry *catalog_entry) {
-	auto info = type.AuxInfo();
-	if (!info) {
-		return;
-	}
-	((ExtraTypeInfo &)*info).catalog_entry = catalog_entry;
-}
-TypeCatalogEntry *LogicalType::GetCatalog(const LogicalType &type) {
-	auto info = type.AuxInfo();
-	if (!info) {
-		return nullptr;
-	}
-	return ((ExtraTypeInfo &)*info).catalog_entry;
-}
-
 ExtraTypeInfoType LogicalType::GetExtraTypeInfoType(const ExtraTypeInfo &type) {
 	return type.type;
 }
@@ -1327,7 +1312,7 @@ struct EnumTypeInfo : public ExtraTypeInfo {
 		return enum_name;
 	};
 	const string GetSchemaName() const {
-		return catalog_entry ? catalog_entry->schema->name : "";
+		return catalog_entry ? catalog_entry->schema.name : "";
 	};
 	const Vector &GetValuesInsertOrder() {
 		return values_insert_order;
@@ -1536,22 +1521,25 @@ idx_t EnumType::GetSize(const LogicalType &type) {
 	return ((EnumTypeInfo &)*info).GetDictSize();
 }
 
-void EnumType::SetCatalog(LogicalType &type, TypeCatalogEntry *catalog_entry) {
-	D_ASSERT(type.id() == LogicalTypeId::ENUM);
+void EnumType::SetCatalog(LogicalType &type, optional_ptr<TypeCatalogEntry> catalog_entry) {
 	auto info = type.AuxInfo();
-	D_ASSERT(info);
-	((EnumTypeInfo &)*info).catalog_entry = catalog_entry;
+	if (!info) {
+		return;
+	}
+	((ExtraTypeInfo &)*info).catalog_entry = catalog_entry;
 }
-TypeCatalogEntry *EnumType::GetCatalog(const LogicalType &type) {
-	D_ASSERT(type.id() == LogicalTypeId::ENUM);
+
+optional_ptr<TypeCatalogEntry> EnumType::GetCatalog(const LogicalType &type) {
 	auto info = type.AuxInfo();
-	D_ASSERT(info);
-	return ((EnumTypeInfo &)*info).catalog_entry;
+	if (!info) {
+		return nullptr;
+	}
+	return ((ExtraTypeInfo &)*info).catalog_entry;
 }
 
 string EnumType::GetSchemaName(const LogicalType &type) {
 	auto catalog_entry = EnumType::GetCatalog(type);
-	return catalog_entry ? catalog_entry->schema->name : "";
+	return catalog_entry ? catalog_entry->schema.name : "";
 }
 
 PhysicalType EnumType::GetPhysicalType(const LogicalType &type) {
@@ -1679,7 +1667,7 @@ shared_ptr<ExtraTypeInfo> ExtraTypeInfo::Deserialize(FieldReader &reader) {
 			// See if the serializer has a catalog
 			auto catalog = reader.GetSource().GetCatalog();
 			if (catalog) {
-				auto enum_type = catalog->GetType(client_context, schema_name, enum_name, true);
+				auto enum_type = catalog->GetType(client_context, schema_name, enum_name, OnEntryNotFound::RETURN_NULL);
 				if (enum_type != LogicalType::INVALID) {
 					extra_info = enum_type.GetAuxInfoShrPtr();
 				}