Merge pull request #167 from Mytherin/issue160

Fix #160: correctly account for schema name in DROP

src/storage/postgres_catalog_set.cpp

@@ -63,6 +63,9 @@ void PostgresCatalogSet::DropEntry(ClientContext &context, DropInfo &info) {
 	if (info.if_not_found == OnEntryNotFound::RETURN_NULL) {
 		drop_query += " IF EXISTS ";
 	}
+	if (!info.schema.empty()) {
+		drop_query += KeywordHelper::WriteQuoted(info.schema, '"') + ".";
+	}
 	drop_query += KeywordHelper::WriteQuoted(info.name, '"');
 	if (info.cascade) {
 		drop_query += "CASCADE";

src/storage/postgres_schema_entry.cpp

@@ -171,6 +171,7 @@ void PostgresSchemaEntry::Scan(CatalogType type, const std::function<void(Catalo
 }
 
 void PostgresSchemaEntry::DropEntry(ClientContext &context, DropInfo &info) {
+	info.schema = name;
 	GetCatalogSet(info.type).DropEntry(context, info);
 }
 

test/sql/storage/attach_drop_table_in_schema.test

@@ -0,0 +1,25 @@
+# name: test/sql/storage/attach_drop_table_in_schema.test
+# description: Test DROP TABLE within a schema
+# group: [storage]
+
+require postgres_scanner
+
+require-env POSTGRES_TEST_DATABASE_AVAILABLE
+
+statement ok
+ATTACH 'dbname=postgresscanner' AS simple (TYPE POSTGRES)
+
+statement ok
+DROP SCHEMA IF EXISTS simple.new_schema CASCADE
+
+statement ok
+create schema simple.new_schema;
+
+statement ok
+create table simple.new_schema.newtable(i int);
+
+statement ok
+drop table simple.new_schema.newtable;
+
+statement ok
+drop schema simple.new_schema