duckdb 0.7.2-dev2699.0 → 0.7.2-dev2706.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "duckdb",
   "main": "./lib/duckdb.js",
   "types": "./lib/duckdb.d.ts",
-  "version": "0.7.2-dev2699.0",
+  "version": "0.7.2-dev2706.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

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

@@ -55,6 +55,8 @@ void TableCatalogEntry::Serialize(Serializer &serializer) const {
 	D_ASSERT(!internal);
 
 	FieldWriter writer(serializer);
+	auto catalog_name = catalog.GetName();
+	writer.WriteString(catalog_name);
 	writer.WriteString(schema.name);
 	writer.WriteString(name);
 	columns.Serialize(writer);
@@ -66,6 +68,7 @@ unique_ptr<CreateTableInfo> TableCatalogEntry::Deserialize(Deserializer &source,
 	auto info = make_uniq<CreateTableInfo>();
 
 	FieldReader reader(source);
+	info->catalog = reader.ReadRequired<string>();
 	info->schema = reader.ReadRequired<string>();
 	info->table = reader.ReadRequired<string>();
 	info->columns = ColumnList::Deserialize(reader);

package/src/duckdb/src/function/table/version/pragma_version.cpp

@@ -1,8 +1,8 @@
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "0.7.2-dev2699"
+#define DUCKDB_VERSION "0.7.2-dev2706"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "199c0211c7"
+#define DUCKDB_SOURCE_ID "43a97f9078"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"

package/src/duckdb/src/planner/operator/logical_create.cpp

@@ -10,8 +10,7 @@ unique_ptr<LogicalOperator> LogicalCreate::Deserialize(LogicalDeserializationSta
 	auto &context = state.gstate.context;
 	auto info = CreateInfo::Deserialize(reader.GetSource());
 
-	auto schema_catalog_entry =
-	    Catalog::GetSchema(context, INVALID_CATALOG, info->schema, OnEntryNotFound::RETURN_NULL);
+	auto schema_catalog_entry = Catalog::GetSchema(context, info->catalog, info->schema, OnEntryNotFound::RETURN_NULL);
 	return make_uniq<LogicalCreate>(state.type, std::move(info), schema_catalog_entry);
 }
 

package/src/duckdb/src/planner/operator/logical_create_index.cpp

@@ -22,7 +22,7 @@ unique_ptr<LogicalOperator> LogicalCreateIndex::Deserialize(LogicalDeserializati
 	auto catalog_info = TableCatalogEntry::Deserialize(reader.GetSource(), context);
 
 	auto &table =
-	    Catalog::GetEntry<TableCatalogEntry>(context, INVALID_CATALOG, catalog_info->schema, catalog_info->table);
+	    Catalog::GetEntry<TableCatalogEntry>(context, catalog_info->catalog, catalog_info->schema, catalog_info->table);
 	auto unbound_expressions = reader.ReadRequiredSerializableList<Expression>(state.gstate);
 
 	auto create_info = reader.ReadOptional<CreateInfo>(nullptr);

package/src/duckdb/src/planner/operator/logical_delete.cpp

@@ -1,6 +1,7 @@
 #include "duckdb/planner/operator/logical_delete.hpp"
-#include "duckdb/parser/parsed_data/create_table_info.hpp"
+
 #include "duckdb/catalog/catalog_entry/table_catalog_entry.hpp"
+#include "duckdb/parser/parsed_data/create_table_info.hpp"
 
 namespace duckdb {
 
@@ -19,8 +20,7 @@ unique_ptr<LogicalOperator> LogicalDelete::Deserialize(LogicalDeserializationSta
 	auto &context = state.gstate.context;
 	auto info = TableCatalogEntry::Deserialize(reader.GetSource(), context);
 
-	auto &table_catalog_entry =
-	    Catalog::GetEntry<TableCatalogEntry>(context, INVALID_CATALOG, info->schema, info->table);
+	auto &table_catalog_entry = Catalog::GetEntry<TableCatalogEntry>(context, info->catalog, info->schema, info->table);
 
 	auto table_index = reader.ReadRequired<idx_t>();
 	auto result = make_uniq<LogicalDelete>(table_catalog_entry, table_index);

package/src/duckdb/src/planner/operator/logical_insert.cpp

@@ -41,7 +41,7 @@ unique_ptr<LogicalOperator> LogicalInsert::Deserialize(LogicalDeserializationSta
 	auto bound_defaults = reader.ReadRequiredSerializableList<Expression>(state.gstate);
 	auto action_type = reader.ReadRequired<OnConflictAction>();
 
-	auto &catalog = Catalog::GetCatalog(context, INVALID_CATALOG);
+	auto &catalog = Catalog::GetCatalog(context, info->catalog);
 
 	auto &table_catalog_entry = catalog.GetEntry<TableCatalogEntry>(context, info->schema, info->table);
 	auto result = make_uniq<LogicalInsert>(table_catalog_entry, table_index);

package/src/duckdb/src/planner/operator/logical_update.cpp

@@ -21,7 +21,7 @@ void LogicalUpdate::Serialize(FieldWriter &writer) const {
 unique_ptr<LogicalOperator> LogicalUpdate::Deserialize(LogicalDeserializationState &state, FieldReader &reader) {
 	auto &context = state.gstate.context;
 	auto info = TableCatalogEntry::Deserialize(reader.GetSource(), context);
-	auto &catalog = Catalog::GetCatalog(context, INVALID_CATALOG);
+	auto &catalog = Catalog::GetCatalog(context, info->catalog);
 
 	auto &table_catalog_entry = catalog.GetEntry<TableCatalogEntry>(context, info->schema, info->table);
 	auto result = make_uniq<LogicalUpdate>(table_catalog_entry);

package/src/duckdb/src/planner/parsed_data/bound_create_table_info.cpp

@@ -5,46 +5,25 @@
 
 namespace duckdb {
 void BoundCreateTableInfo::Serialize(Serializer &serializer) const {
-	schema.Serialize(serializer);
 	serializer.WriteOptional(base);
-
-	// TODO[YLM]: Review if we want/need to serialize more of the fields.
-	//! The map of column names -> column index, used during binding
-	// case_insensitive_map_t<column_t> name_map;
-
-	//! Column dependency manager of the table
-	// ColumnDependencyManager column_dependency_manager;
-
 	serializer.WriteList(constraints);
 	serializer.WriteList(bound_constraints);
 	serializer.WriteList(bound_defaults);
-
-	//! Dependents of the table (in e.g. default values)
-	// unordered_set<CatalogEntry *> dependencies;
-
-	//! The existing table data on disk (if any)
-	// unique_ptr<PersistentTableData> data;
-
-	//! CREATE TABLE from QUERY
 	serializer.WriteOptional(query);
-
-	//! Indexes created by this table <Block_ID, Offset>
-	// vector<BlockPointer> indexes;
 }
 
 unique_ptr<BoundCreateTableInfo> BoundCreateTableInfo::Deserialize(Deserializer &source,
                                                                    PlanDeserializationState &state) {
-	auto &context = state.context;
-	auto create_info = SchemaCatalogEntry::Deserialize(source);
-	auto schema_name = create_info->schema;
-	auto &schema = Catalog::GetSchema(context, INVALID_CATALOG, schema_name);
-	auto result = make_uniq<BoundCreateTableInfo>(schema, std::move(create_info));
-	result->base = source.ReadOptional<CreateInfo>();
+	auto create_info_base = source.ReadOptional<CreateInfo>();
+	// Get schema from the catalog to create BoundCreateTableInfo
+	auto schema_name = create_info_base->schema;
+	auto catalog = create_info_base->catalog;
+	auto &schema_catalog_entry = Catalog::GetSchema(state.context, catalog, schema_name);
 
+	auto result = make_uniq<BoundCreateTableInfo>(schema_catalog_entry, std::move(create_info_base));
 	source.ReadList<Constraint>(result->constraints);
 	source.ReadList<BoundConstraint>(result->bound_constraints);
 	source.ReadList<Expression>(result->bound_defaults, state);
-
 	result->query = source.ReadOptional<LogicalOperator>(state);
 	return result;
 }

package/src/duckdb/src/storage/storage_info.cpp

@@ -2,7 +2,7 @@
 
 namespace duckdb {
 
-const uint64_t VERSION_NUMBER = 49;
+const uint64_t VERSION_NUMBER = 50;
 
 struct StorageVersionInfo {
 	const char *version_name;