duckdb 0.7.2-dev3515.0 → 0.7.2-dev3666.0

package/src/duckdb/ub_src_catalog_catalog_entry.cpp

@@ -10,7 +10,7 @@
 
 #include "src/catalog/catalog_entry/index_catalog_entry.cpp"
 
-#include "src/catalog/catalog_entry/scalar_macro_catalog_entry.cpp"
+#include "src/catalog/catalog_entry/macro_catalog_entry.cpp"
 
 #include "src/catalog/catalog_entry/pragma_function_catalog_entry.cpp"
 

package/src/duckdb/ub_src_parser_parsed_data.cpp

@@ -6,6 +6,8 @@
 
 #include "src/parser/parsed_data/alter_table_info.cpp"
 
+#include "src/parser/parsed_data/attach_info.cpp"
+
 #include "src/parser/parsed_data/create_info.cpp"
 
 #include "src/parser/parsed_data/create_index_info.cpp"
@@ -16,15 +18,29 @@
 
 #include "src/parser/parsed_data/create_copy_function_info.cpp"
 
+#include "src/parser/parsed_data/create_macro_info.cpp"
+
 #include "src/parser/parsed_data/create_pragma_function_info.cpp"
 
+#include "src/parser/parsed_data/create_sequence_info.cpp"
+
 #include "src/parser/parsed_data/create_scalar_function_info.cpp"
 
 #include "src/parser/parsed_data/create_table_function_info.cpp"
 
 #include "src/parser/parsed_data/create_table_info.cpp"
 
+#include "src/parser/parsed_data/create_type_info.cpp"
+
 #include "src/parser/parsed_data/create_view_info.cpp"
 
+#include "src/parser/parsed_data/detach_info.cpp"
+
+#include "src/parser/parsed_data/drop_info.cpp"
+
 #include "src/parser/parsed_data/sample_options.cpp"
 
+#include "src/parser/parsed_data/transaction_info.cpp"
+
+#include "src/parser/parsed_data/vacuum_info.cpp"
+

package/src/duckdb/src/catalog/catalog_entry/scalar_macro_catalog_entry.cpp

@@ -1,104 +0,0 @@
-#include "duckdb/catalog/catalog_entry/scalar_macro_catalog_entry.hpp"
-#include "duckdb/catalog/catalog_entry/table_macro_catalog_entry.hpp"
-#include "duckdb/common/field_writer.hpp"
-#include "duckdb/function/scalar_macro_function.hpp"
-#include "duckdb/function/table_macro_function.hpp"
-
-namespace duckdb {
-
-MacroCatalogEntry::MacroCatalogEntry(Catalog &catalog, SchemaCatalogEntry &schema, CreateMacroInfo &info)
-    : FunctionEntry(
-          (info.function->type == MacroType::SCALAR_MACRO ? CatalogType::MACRO_ENTRY : CatalogType::TABLE_MACRO_ENTRY),
-          catalog, schema, info),
-      function(std::move(info.function)) {
-	this->temporary = info.temporary;
-	this->internal = info.internal;
-}
-
-ScalarMacroCatalogEntry::ScalarMacroCatalogEntry(Catalog &catalog, SchemaCatalogEntry &schema, CreateMacroInfo &info)
-    : MacroCatalogEntry(catalog, schema, info) {
-}
-
-void ScalarMacroCatalogEntry::Serialize(Serializer &main_serializer) const {
-	D_ASSERT(!internal);
-	auto &scalar_function = function->Cast<ScalarMacroFunction>();
-	FieldWriter writer(main_serializer);
-	writer.WriteString(schema.name);
-	writer.WriteString(name);
-	writer.WriteSerializable(*scalar_function.expression);
-	// writer.WriteSerializableList(function->parameters);
-	writer.WriteSerializableList(function->parameters);
-	writer.WriteField<uint32_t>((uint32_t)function->default_parameters.size());
-	auto &serializer = writer.GetSerializer();
-	for (auto &kv : function->default_parameters) {
-		serializer.WriteString(kv.first);
-		kv.second->Serialize(serializer);
-	}
-	writer.Finalize();
-}
-
-unique_ptr<CreateMacroInfo> ScalarMacroCatalogEntry::Deserialize(Deserializer &main_source, ClientContext &context) {
-	auto info = make_uniq<CreateMacroInfo>(CatalogType::MACRO_ENTRY);
-	FieldReader reader(main_source);
-	info->schema = reader.ReadRequired<string>();
-	info->name = reader.ReadRequired<string>();
-	auto expression = reader.ReadRequiredSerializable<ParsedExpression>();
-	auto func = make_uniq<ScalarMacroFunction>(std::move(expression));
-	info->function = std::move(func);
-	info->function->parameters = reader.ReadRequiredSerializableList<ParsedExpression>();
-	auto default_param_count = reader.ReadRequired<uint32_t>();
-	auto &source = reader.GetSource();
-	for (idx_t i = 0; i < default_param_count; i++) {
-		auto name = source.Read<string>();
-		info->function->default_parameters[name] = ParsedExpression::Deserialize(source);
-	}
-	// dont like this
-	// info->type=CatalogType::MACRO_ENTRY;
-	reader.Finalize();
-	return info;
-}
-
-TableMacroCatalogEntry::TableMacroCatalogEntry(Catalog &catalog, SchemaCatalogEntry &schema, CreateMacroInfo &info)
-    : MacroCatalogEntry(catalog, schema, info) {
-}
-
-void TableMacroCatalogEntry::Serialize(Serializer &main_serializer) const {
-	D_ASSERT(!internal);
-	FieldWriter writer(main_serializer);
-
-	auto &table_function = function->Cast<TableMacroFunction>();
-	writer.WriteString(schema.name);
-	writer.WriteString(name);
-	writer.WriteSerializable(*table_function.query_node);
-	writer.WriteSerializableList(function->parameters);
-	writer.WriteField<uint32_t>((uint32_t)function->default_parameters.size());
-	auto &serializer = writer.GetSerializer();
-	for (auto &kv : function->default_parameters) {
-		serializer.WriteString(kv.first);
-		kv.second->Serialize(serializer);
-	}
-	writer.Finalize();
-}
-
-unique_ptr<CreateMacroInfo> TableMacroCatalogEntry::Deserialize(Deserializer &main_source, ClientContext &context) {
-	auto info = make_uniq<CreateMacroInfo>(CatalogType::TABLE_MACRO_ENTRY);
-	FieldReader reader(main_source);
-	info->schema = reader.ReadRequired<string>();
-	info->name = reader.ReadRequired<string>();
-	auto query_node = reader.ReadRequiredSerializable<QueryNode>();
-	auto table_function = make_uniq<TableMacroFunction>(std::move(query_node));
-	info->function = std::move(table_function);
-	info->function->parameters = reader.ReadRequiredSerializableList<ParsedExpression>();
-	auto default_param_count = reader.ReadRequired<uint32_t>();
-	auto &source = reader.GetSource();
-	for (idx_t i = 0; i < default_param_count; i++) {
-		auto name = source.Read<string>();
-		info->function->default_parameters[name] = ParsedExpression::Deserialize(source);
-	}
-
-	reader.Finalize();
-
-	return info;
-}
-
-} // namespace duckdb