postgres/timescaledb
1
0
Fork 0
mirror of https://github.com/timescale/timescaledb.git synced 2025-04-20 03:21:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Check extension exists for DROP OWNED and DROP EXTENSION

Browse Source 
In a database without timescaledb installed drop owned
failed with an error while trying to lookup the extension
owner.
This commit is contained in:
Sven Klemm 2018-11-05 14:21:44 +01:00 committed by Sven Klemm
parent 0c8c085cda
commit 55a378ef7a
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/loader/loader.c
View File

@ -127,6 +127,9 @@ inval_cache_callback(Datum arg, Oid relid)
static bool
drop_statement_drops_extension(DropStmt *stmt)
{
if (!extension_exists())
return false;
if (stmt->removeType == OBJECT_EXTENSION)
{
if (list_length(stmt->objects) == 1)
@ -197,6 +200,9 @@ drop_owned_statement_drops_extension(DropOwnedStmt *stmt)
List *role_ids;
ListCell *lc;
if (!extension_exists())
return false;
Assert(IsTransactionState());
extension_owner_oid = extension_owner();
@ -312,6 +318,11 @@ load_utility_cmd(Node *utility_stmt)
static void
stop_workers_on_db_drop(DropdbStmt *drop_db_statement)
{
/*
* Don't check if extension exists here because even though the current
* database might not have TimescaleDB installed the database we are
* dropping might.
*/
Oid dropped_db_oid = get_database_oid(drop_db_statement->dbname, drop_db_statement->missing_ok);
if (dropped_db_oid != InvalidOid)

7
test/expected/drop_owned.out
View File

@ -84,3 +84,10 @@ SELECT * FROM _timescaledb_catalog.chunk_constraint;
----------+--------------------+-----------------+----------------------------
(0 rows)
-- test drop owned in database without extension installed
\c single :ROLE_SUPERUSER
CREATE database test_drop_owned;
\c test_drop_owned
DROP OWNED BY :ROLE_SUPERUSER;
\c single :ROLE_SUPERUSER
DROP DATABASE test_drop_owned;

9
test/sql/drop_owned.sql
View File

@ -35,3 +35,12 @@ SELECT * FROM _timescaledb_catalog.dimension;
SELECT * FROM _timescaledb_catalog.dimension_slice;
SELECT * FROM _timescaledb_catalog.chunk_index;
SELECT * FROM _timescaledb_catalog.chunk_constraint;
-- test drop owned in database without extension installed
\c single :ROLE_SUPERUSER
CREATE database test_drop_owned;
\c test_drop_owned
DROP OWNED BY :ROLE_SUPERUSER;
\c single :ROLE_SUPERUSER
DROP DATABASE test_drop_owned;