From 29f1ea079b975816b0248788bc9a0d70beaa273f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= Date: Mon, 30 Sep 2019 19:03:27 +0000 Subject: [PATCH] PG_VERSION_NUM > 110000 should be PG_VERSION_NUM >= 110000 Also fix a > 12000 typo --- src/backend/distributed/commands/function.c | 8 ++++---- src/backend/distributed/commands/index.c | 2 +- src/backend/distributed/commands/schema.c | 4 ++-- src/backend/distributed/commands/utility_hook.c | 8 ++++---- src/backend/distributed/deparser/objectaddress.c | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/backend/distributed/commands/function.c b/src/backend/distributed/commands/function.c index 507bba7fe..3a7888bcf 100644 --- a/src/backend/distributed/commands/function.c +++ b/src/backend/distributed/commands/function.c @@ -77,7 +77,7 @@ static void ErrorIfFunctionDependsOnExtension(const ObjectAddress *functionAddre PG_FUNCTION_INFO_V1(create_distributed_function); -#if PG_VERSION_NUM > 110000 +#if PG_VERSION_NUM >= 110000 #define AssertIsFunctionOrProcedure(objtype) \ Assert((objtype) == OBJECT_FUNCTION || (objtype) == OBJECT_PROCEDURE) #else @@ -795,7 +795,7 @@ CreateFunctionStmtObjectAddress(CreateFunctionStmt *stmt, bool missing_ok) ObjectWithArgs *objectWithArgs = NULL; ListCell *parameterCell = NULL; -#if PG_VERSION_NUM > 110000 +#if PG_VERSION_NUM >= 110000 if (stmt->is_procedure) { objectType = OBJECT_PROCEDURE; @@ -828,7 +828,7 @@ PlanAlterFunctionStmt(AlterFunctionStmt *stmt, const char *queryString) List *commands = NIL; /* AlterFunctionStmt->objtype has only been added since pg11 */ -#if PG_VERSION_NUM > 110000 +#if PG_VERSION_NUM >= 110000 AssertIsFunctionOrProcedure(stmt->objtype); #endif @@ -1168,7 +1168,7 @@ AlterFunctionStmtObjectAddress(AlterFunctionStmt *stmt, bool missing_ok) { ObjectType objectType = OBJECT_FUNCTION; -#if PG_VERSION_NUM > 110000 +#if PG_VERSION_NUM >= 110000 objectType = stmt->objtype; #endif diff --git a/src/backend/distributed/commands/index.c b/src/backend/distributed/commands/index.c index d564346f3..9a65718bf 100644 --- a/src/backend/distributed/commands/index.c +++ b/src/backend/distributed/commands/index.c @@ -10,7 +10,7 @@ #include "postgres.h" -#if PG_VERSION_NUM > 12000 +#if PG_VERSION_NUM >= 120000 #include "access/genam.h" #endif #include "access/htup_details.h" diff --git a/src/backend/distributed/commands/schema.c b/src/backend/distributed/commands/schema.c index 9c287f59f..fd95883b1 100644 --- a/src/backend/distributed/commands/schema.c +++ b/src/backend/distributed/commands/schema.c @@ -121,7 +121,7 @@ PlanAlterObjectSchemaStmt(AlterObjectSchemaStmt *stmt, const char *queryString) return PlanAlterTypeSchemaStmt(stmt, queryString); } -#if PG_VERSION_NUM > 110000 +#if PG_VERSION_NUM >= 110000 case OBJECT_PROCEDURE: #endif case OBJECT_FUNCTION: @@ -198,7 +198,7 @@ ProcessAlterObjectSchemaStmt(AlterObjectSchemaStmt *stmt, const char *queryStrin return; } -#if PG_VERSION_NUM > 110000 +#if PG_VERSION_NUM >= 110000 case OBJECT_PROCEDURE: #endif case OBJECT_FUNCTION: diff --git a/src/backend/distributed/commands/utility_hook.c b/src/backend/distributed/commands/utility_hook.c index 4decad574..8c5c78e4a 100644 --- a/src/backend/distributed/commands/utility_hook.c +++ b/src/backend/distributed/commands/utility_hook.c @@ -426,7 +426,7 @@ multi_ProcessUtility(PlannedStmt *pstmt, break; } -#if PG_VERSION_NUM > 110000 +#if PG_VERSION_NUM >= 110000 case OBJECT_PROCEDURE: #endif case OBJECT_FUNCTION: @@ -484,7 +484,7 @@ multi_ProcessUtility(PlannedStmt *pstmt, break; } -#if PG_VERSION_NUM > 110000 +#if PG_VERSION_NUM >= 110000 case OBJECT_PROCEDURE: #endif case OBJECT_FUNCTION: @@ -843,7 +843,7 @@ PlanAlterOwnerStmt(AlterOwnerStmt *stmt, const char *queryString) return PlanAlterTypeOwnerStmt(stmt, queryString); } -#if PG_VERSION_NUM > 110000 +#if PG_VERSION_NUM >= 110000 case OBJECT_PROCEDURE: #endif case OBJECT_FUNCTION: @@ -871,7 +871,7 @@ PlanAlterObjectDependsStmt(AlterObjectDependsStmt *stmt, const char *queryString { switch (stmt->objectType) { -#if PG_VERSION_NUM > 110000 +#if PG_VERSION_NUM >= 110000 case OBJECT_PROCEDURE: #endif case OBJECT_FUNCTION: diff --git a/src/backend/distributed/deparser/objectaddress.c b/src/backend/distributed/deparser/objectaddress.c index 9f82fc549..2a6f2975e 100644 --- a/src/backend/distributed/deparser/objectaddress.c +++ b/src/backend/distributed/deparser/objectaddress.c @@ -143,7 +143,7 @@ RenameStmtObjectAddress(RenameStmt *stmt, bool missing_ok) return RenameAttributeStmtObjectAddress(stmt, missing_ok); } -#if PG_VERSION_NUM > 110000 +#if PG_VERSION_NUM >= 110000 case OBJECT_PROCEDURE: #endif case OBJECT_FUNCTION: @@ -170,7 +170,7 @@ AlterObjectSchemaStmtObjectAddress(AlterObjectSchemaStmt *stmt, bool missing_ok) return AlterTypeSchemaStmtObjectAddress(stmt, missing_ok); } -#if PG_VERSION_NUM > 110000 +#if PG_VERSION_NUM >= 110000 case OBJECT_PROCEDURE: #endif case OBJECT_FUNCTION: @@ -218,7 +218,7 @@ AlterOwnerStmtObjectAddress(AlterOwnerStmt *stmt, bool missing_ok) return AlterTypeOwnerObjectAddress(stmt, missing_ok); } -#if PG_VERSION_NUM > 110000 +#if PG_VERSION_NUM >= 110000 case OBJECT_PROCEDURE: #endif case OBJECT_FUNCTION: @@ -250,7 +250,7 @@ AlterObjectDependsStmtObjectAddress(AlterObjectDependsStmt *stmt, bool missing_o { switch (stmt->objectType) { -#if PG_VERSION_NUM > 110000 +#if PG_VERSION_NUM >= 110000 case OBJECT_PROCEDURE: #endif case OBJECT_FUNCTION: