external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removes drop in citus_internal_db_command udf

pull/7240/head
gindibay 2023-11-13 15:58:09 +03:00
parent a9977e8840
commit fcdea98edd
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/backend/distributed/metadata/metadata_sync.c
View File

@ -3895,7 +3895,7 @@ citus_internal_update_none_dist_table_metadata(PG_FUNCTION_ARGS)
/* /*
* citus_internal_database_command is an internal UDF to * citus_internal_database_command is an internal UDF to
* create/drop a database in an idempotent maner without * create a database in an idempotent maner without
* transaction block restrictions. * transaction block restrictions.
*/ */
Datum Datum
@ -3925,7 +3925,7 @@ citus_internal_database_command(PG_FUNCTION_ARGS)
GUC_ACTION_LOCAL, true, 0, false); GUC_ACTION_LOCAL, true, 0, false);
/* /*
* createdb() / DropDatabase() uses ParseState to report the error position for the * createdb() uses ParseState to report the error position for the
* input command and the position is reported to be 0 when it's provided as NULL. * input command and the position is reported to be 0 when it's provided as NULL.
* We're okay with that because we don't expect this UDF to be called with an incorrect * We're okay with that because we don't expect this UDF to be called with an incorrect
* DDL command. * DDL command.
@ -3944,22 +3944,10 @@ citus_internal_database_command(PG_FUNCTION_ARGS)
createdb(pstate, (CreatedbStmt *) parseTree); createdb(pstate, (CreatedbStmt *) parseTree);
} }
} }
else if (IsA(parseTree, DropdbStmt))
{
DropdbStmt *stmt = castNode(DropdbStmt, parseTree);
bool missingOk = false;
Oid databaseOid = get_database_oid(stmt->dbname, missingOk);
if (OidIsValid(databaseOid))
{
DropDatabase(pstate, (DropdbStmt *) parseTree);
}
}
else else
{ {
ereport(ERROR, (errmsg("citus_internal_database_command() can only be used " ereport(ERROR, (errmsg("citus_internal_database_command() can only be used "
"for CREATE DATABASE and DROP DATABASE commands by " "for CREATE DATABASE command by "
"Citus."))); "Citus.")));
} }

4
src/test/regress/expected/create_drop_database_propagation.out
View File

@ -25,9 +25,9 @@ SELECT pg_catalog.citus_internal_database_command(null);
ERROR: command cannot be NULL ERROR: command cannot be NULL
-- fails on non create / drop db command -- fails on non create / drop db command
SELECT pg_catalog.citus_internal_database_command('CREATE TABLE foo_bar(a int)'); SELECT pg_catalog.citus_internal_database_command('CREATE TABLE foo_bar(a int)');
ERROR: citus_internal_database_command() can only be used for CREATE DATABASE and DROP DATABASE commands by Citus. ERROR: citus_internal_database_command() can only be used for CREATE DATABASE command by Citus.
SELECT pg_catalog.citus_internal_database_command('SELECT 1'); SELECT pg_catalog.citus_internal_database_command('SELECT 1');
ERROR: citus_internal_database_command() can only be used for CREATE DATABASE and DROP DATABASE commands by Citus. ERROR: citus_internal_database_command() can only be used for CREATE DATABASE command by Citus.
SELECT pg_catalog.citus_internal_database_command('asfsfdsg'); SELECT pg_catalog.citus_internal_database_command('asfsfdsg');
ERROR: syntax error at or near "asfsfdsg" ERROR: syntax error at or near "asfsfdsg"
SELECT pg_catalog.citus_internal_database_command(''); SELECT pg_catalog.citus_internal_database_command('');