diff options
Diffstat (limited to 'src/backend/tcop/utility.c')
-rw-r--r-- | src/backend/tcop/utility.c | 193 |
1 files changed, 33 insertions, 160 deletions
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index 5b0633398cf..cc8f32d4cea 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -205,16 +205,10 @@ check_xact_readonly(Node *parsetree) case T_CreateRangeStmt: case T_AlterEnumStmt: case T_ViewStmt: - case T_DropCastStmt: case T_DropStmt: case T_DropdbStmt: case T_DropTableSpaceStmt: - case T_RemoveFuncStmt: case T_DropRoleStmt: - case T_DropPLangStmt: - case T_RemoveOpClassStmt: - case T_RemoveOpFamilyStmt: - case T_DropPropertyStmt: case T_GrantStmt: case T_GrantRoleStmt: case T_AlterDefaultPrivilegesStmt: @@ -228,10 +222,8 @@ check_xact_readonly(Node *parsetree) case T_AlterExtensionContentsStmt: case T_CreateFdwStmt: case T_AlterFdwStmt: - case T_DropFdwStmt: case T_CreateForeignServerStmt: case T_AlterForeignServerStmt: - case T_DropForeignServerStmt: case T_CreateUserMappingStmt: case T_AlterUserMappingStmt: case T_DropUserMappingStmt: @@ -616,10 +608,6 @@ standard_ProcessUtility(Node *parsetree, AlterForeignDataWrapper((AlterFdwStmt *) parsetree); break; - case T_DropFdwStmt: - RemoveForeignDataWrapper((DropFdwStmt *) parsetree); - break; - case T_CreateForeignServerStmt: CreateForeignServer((CreateForeignServerStmt *) parsetree); break; @@ -628,10 +616,6 @@ standard_ProcessUtility(Node *parsetree, AlterForeignServer((AlterForeignServerStmt *) parsetree); break; - case T_DropForeignServerStmt: - RemoveForeignServer((DropForeignServerStmt *) parsetree); - break; - case T_CreateUserMappingStmt: CreateUserMapping((CreateUserMappingStmt *) parsetree); break; @@ -947,29 +931,6 @@ standard_ProcessUtility(Node *parsetree, AlterSequence((AlterSeqStmt *) parsetree); break; - case T_RemoveFuncStmt: - { - RemoveFuncStmt *stmt = (RemoveFuncStmt *) parsetree; - - switch (stmt->kind) - { - case OBJECT_FUNCTION: - RemoveFunction(stmt); - break; - case OBJECT_AGGREGATE: - RemoveAggregate(stmt); - break; - case OBJECT_OPERATOR: - RemoveOperator(stmt); - break; - default: - elog(ERROR, "unrecognized object type: %d", - (int) stmt->kind); - break; - } - } - break; - case T_DoStmt: ExecuteDoStmt((DoStmt *) parsetree); break; @@ -1079,38 +1040,10 @@ standard_ProcessUtility(Node *parsetree, InvalidOid, InvalidOid, false); break; - case T_DropPropertyStmt: - { - DropPropertyStmt *stmt = (DropPropertyStmt *) parsetree; - - switch (stmt->removeType) - { - case OBJECT_RULE: - /* RemoveRewriteRule checks permissions */ - RemoveRewriteRule(stmt->relation, stmt->property, - stmt->behavior, stmt->missing_ok); - break; - case OBJECT_TRIGGER: - /* DropTrigger checks permissions */ - DropTrigger(stmt->relation, stmt->property, - stmt->behavior, stmt->missing_ok); - break; - default: - elog(ERROR, "unrecognized object type: %d", - (int) stmt->removeType); - break; - } - } - break; - case T_CreatePLangStmt: CreateProceduralLanguage((CreatePLangStmt *) parsetree); break; - case T_DropPLangStmt: - DropProceduralLanguage((DropPLangStmt *) parsetree); - break; - /* * ******************************** DOMAIN statements **** */ @@ -1220,10 +1153,6 @@ standard_ProcessUtility(Node *parsetree, CreateCast((CreateCastStmt *) parsetree); break; - case T_DropCastStmt: - DropCast((DropCastStmt *) parsetree); - break; - case T_CreateOpClassStmt: DefineOpClass((CreateOpClassStmt *) parsetree); break; @@ -1236,14 +1165,6 @@ standard_ProcessUtility(Node *parsetree, AlterOpFamily((AlterOpFamilyStmt *) parsetree); break; - case T_RemoveOpClassStmt: - RemoveOpClass((RemoveOpClassStmt *) parsetree); - break; - - case T_RemoveOpFamilyStmt: - RemoveOpFamily((RemoveOpFamilyStmt *) parsetree); - break; - case T_AlterTSDictionaryStmt: AlterTSDictionary((AlterTSDictionaryStmt *) parsetree); break; @@ -1674,10 +1595,6 @@ CreateCommandTag(Node *parsetree) tag = "ALTER FOREIGN DATA WRAPPER"; break; - case T_DropFdwStmt: - tag = "DROP FOREIGN DATA WRAPPER"; - break; - case T_CreateForeignServerStmt: tag = "CREATE SERVER"; break; @@ -1686,10 +1603,6 @@ CreateCommandTag(Node *parsetree) tag = "ALTER SERVER"; break; - case T_DropForeignServerStmt: - tag = "DROP SERVER"; - break; - case T_CreateUserMappingStmt: tag = "CREATE USER MAPPING"; break; @@ -1754,6 +1667,39 @@ CreateCommandTag(Node *parsetree) case OBJECT_EXTENSION: tag = "DROP EXTENSION"; break; + case OBJECT_FUNCTION: + tag = "DROP FUNCTION"; + break; + case OBJECT_AGGREGATE: + tag = "DROP AGGREGATE"; + break; + case OBJECT_OPERATOR: + tag = "DROP OPERATOR"; + break; + case OBJECT_LANGUAGE: + tag = "DROP LANGUAGE"; + break; + case OBJECT_CAST: + tag = "DROP CAST"; + break; + case OBJECT_TRIGGER: + tag = "DROP TRIGGER"; + break; + case OBJECT_RULE: + tag = "DROP RULE"; + break; + case OBJECT_FDW: + tag = "DROP FOREIGN DATA WRAPPER"; + break; + case OBJECT_FOREIGN_SERVER: + tag = "DROP SERVER"; + break; + case OBJECT_OPCLASS: + tag = "DROP OPERATOR CLASS"; + break; + case OBJECT_OPFAMILY: + tag = "DROP OPERATOR FAMILY"; + break; default: tag = "???"; } @@ -1891,23 +1837,6 @@ CreateCommandTag(Node *parsetree) tag = "ALTER SEQUENCE"; break; - case T_RemoveFuncStmt: - switch (((RemoveFuncStmt *) parsetree)->kind) - { - case OBJECT_FUNCTION: - tag = "DROP FUNCTION"; - break; - case OBJECT_AGGREGATE: - tag = "DROP AGGREGATE"; - break; - case OBJECT_OPERATOR: - tag = "DROP OPERATOR"; - break; - default: - tag = "???"; - } - break; - case T_DoStmt: tag = "DO"; break; @@ -2002,28 +1931,10 @@ CreateCommandTag(Node *parsetree) tag = "CREATE TRIGGER"; break; - case T_DropPropertyStmt: - switch (((DropPropertyStmt *) parsetree)->removeType) - { - case OBJECT_TRIGGER: - tag = "DROP TRIGGER"; - break; - case OBJECT_RULE: - tag = "DROP RULE"; - break; - default: - tag = "???"; - } - break; - case T_CreatePLangStmt: tag = "CREATE LANGUAGE"; break; - case T_DropPLangStmt: - tag = "DROP LANGUAGE"; - break; - case T_CreateRoleStmt: tag = "CREATE ROLE"; break; @@ -2072,10 +1983,6 @@ CreateCommandTag(Node *parsetree) tag = "CREATE CAST"; break; - case T_DropCastStmt: - tag = "DROP CAST"; - break; - case T_CreateOpClassStmt: tag = "CREATE OPERATOR CLASS"; break; @@ -2088,14 +1995,6 @@ CreateCommandTag(Node *parsetree) tag = "ALTER OPERATOR FAMILY"; break; - case T_RemoveOpClassStmt: - tag = "DROP OPERATOR CLASS"; - break; - - case T_RemoveOpFamilyStmt: - tag = "DROP OPERATOR FAMILY"; - break; - case T_AlterTSDictionaryStmt: tag = "ALTER TEXT SEARCH DICTIONARY"; break; @@ -2306,10 +2205,8 @@ GetCommandLogLevel(Node *parsetree) case T_CreateFdwStmt: case T_AlterFdwStmt: - case T_DropFdwStmt: case T_CreateForeignServerStmt: case T_AlterForeignServerStmt: - case T_DropForeignServerStmt: case T_CreateUserMappingStmt: case T_AlterUserMappingStmt: case T_DropUserMappingStmt: @@ -2446,10 +2343,6 @@ GetCommandLogLevel(Node *parsetree) lev = LOGSTMT_DDL; break; - case T_RemoveFuncStmt: - lev = LOGSTMT_DDL; - break; - case T_DoStmt: lev = LOGSTMT_ALL; break; @@ -2533,18 +2426,10 @@ GetCommandLogLevel(Node *parsetree) lev = LOGSTMT_DDL; break; - case T_DropPropertyStmt: - lev = LOGSTMT_DDL; - break; - case T_CreatePLangStmt: lev = LOGSTMT_DDL; break; - case T_DropPLangStmt: - lev = LOGSTMT_DDL; - break; - case T_CreateDomainStmt: lev = LOGSTMT_DDL; break; @@ -2597,10 +2482,6 @@ GetCommandLogLevel(Node *parsetree) lev = LOGSTMT_DDL; break; - case T_DropCastStmt: - lev = LOGSTMT_DDL; - break; - case T_CreateOpClassStmt: lev = LOGSTMT_DDL; break; @@ -2613,14 +2494,6 @@ GetCommandLogLevel(Node *parsetree) lev = LOGSTMT_DDL; break; - case T_RemoveOpClassStmt: - lev = LOGSTMT_DDL; - break; - - case T_RemoveOpFamilyStmt: - lev = LOGSTMT_DDL; - break; - case T_AlterTSDictionaryStmt: lev = LOGSTMT_DDL; break; |