duckdb 0.6.2-dev1114.0 → 0.6.2-dev1120.0

package/package.json

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

package/src/duckdb/src/execution/operator/schema/physical_drop.cpp

@@ -1,6 +1,10 @@
 #include "duckdb/execution/operator/schema/physical_drop.hpp"
 #include "duckdb/main/client_data.hpp"
 #include "duckdb/main/database_manager.hpp"
+#include "duckdb/main/database.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/catalog/catalog_search_path.hpp"
+#include "duckdb/main/settings.hpp"
 
 namespace duckdb {
 
@@ -39,6 +43,24 @@ void PhysicalDrop::GetData(ExecutionContext &context, DataChunk &chunk, GlobalSo
 		db_manager.DetachDatabase(context.client, info->name, info->if_exists);
 		break;
 	}
+	case CatalogType::SCHEMA_ENTRY: {
+		auto &catalog = Catalog::GetCatalog(context.client, info->catalog);
+		catalog.DropEntry(context.client, info.get());
+		auto qualified_name = QualifiedName::Parse(info->name);
+
+		// Check if the dropped schema was set as the current schema
+		auto &client_data = ClientData::Get(context.client);
+		auto &default_entry = client_data.catalog_search_path->GetDefault();
+		auto &current_catalog = default_entry.catalog;
+		auto &current_schema = default_entry.schema;
+		D_ASSERT(info->name != DEFAULT_SCHEMA);
+
+		if (info->catalog == current_catalog && current_schema == info->name) {
+			// Reset the schema to default
+			SchemaSetting::SetLocal(context.client, DEFAULT_SCHEMA);
+		}
+		break;
+	}
 	default: {
 		auto &catalog = Catalog::GetCatalog(context.client, info->catalog);
 		catalog.DropEntry(context.client, info.get());

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

@@ -1,8 +1,8 @@
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "0.6.2-dev1114"
+#define DUCKDB_VERSION "0.6.2-dev1120"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "51945c68c0"
+#define DUCKDB_SOURCE_ID "a37177efe6"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"

package/src/duckdb/src/main/settings/settings.cpp

@@ -875,7 +875,8 @@ void SchemaSetting::SetLocal(ClientContext &context, const Value &input) {
 }
 
 Value SchemaSetting::GetSetting(ClientContext &context) {
-	return SearchPathSetting::GetSetting(context);
+	auto &client_data = ClientData::Get(context);
+	return client_data.catalog_search_path->GetDefault().schema;
 }
 
 //===--------------------------------------------------------------------===//

package/src/duckdb/src/parser/transform/statement/transform_drop.cpp

@@ -44,15 +44,24 @@ unique_ptr<SQLStatement> Transformer::TransformDrop(duckdb_libpgquery::PGNode *n
 	}
 
 	switch (stmt->removeType) {
-	case duckdb_libpgquery::PG_OBJECT_SCHEMA:
-		info.name = ((duckdb_libpgquery::PGValue *)stmt->objects->head->data.ptr_value)->val.str;
-		break;
 	case duckdb_libpgquery::PG_OBJECT_TYPE: {
 		auto view_list = (duckdb_libpgquery::PGList *)stmt->objects;
 		auto target = (duckdb_libpgquery::PGTypeName *)(view_list->head->data.ptr_value);
 		info.name = (reinterpret_cast<duckdb_libpgquery::PGValue *>(target->names->tail->data.ptr_value)->val.str);
 		break;
 	}
+	case duckdb_libpgquery::PG_OBJECT_SCHEMA: {
+		auto view_list = (duckdb_libpgquery::PGList *)stmt->objects->head->data.ptr_value;
+		if (view_list->length == 2) {
+			info.catalog = ((duckdb_libpgquery::PGValue *)view_list->head->data.ptr_value)->val.str;
+			info.name = ((duckdb_libpgquery::PGValue *)view_list->head->next->data.ptr_value)->val.str;
+		} else if (view_list->length == 1) {
+			info.name = ((duckdb_libpgquery::PGValue *)view_list->head->data.ptr_value)->val.str;
+		} else {
+			throw ParserException("Expected \"catalog.schema\" or \"schema\"");
+		}
+		break;
+	}
 	default: {
 		auto view_list = (duckdb_libpgquery::PGList *)stmt->objects->head->data.ptr_value;
 		if (view_list->length == 3) {

package/src/duckdb/third_party/libpg_query/include/parser/gram.hpp

@@ -1065,7 +1065,7 @@ typedef union YYSTYPE
 	PGSubLinkType subquerytype;
 	PGViewCheckOption viewcheckoption;
 }
-/* Line 1489 of yacc.c.  */
+/* Line 1529 of yacc.c.  */
 #line 1070 "third_party/libpg_query/grammar/grammar_out.hpp"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */