mirror of https://github.com/citusdata/citus.git
PG_VERSION_NUM > 110000 should be PG_VERSION_NUM >= 110000
Also fix a > 12000 typopull/3057/head
parent
1989ff85b5
commit
29f1ea079b
|
@ -77,7 +77,7 @@ static void ErrorIfFunctionDependsOnExtension(const ObjectAddress *functionAddre
|
||||||
|
|
||||||
PG_FUNCTION_INFO_V1(create_distributed_function);
|
PG_FUNCTION_INFO_V1(create_distributed_function);
|
||||||
|
|
||||||
#if PG_VERSION_NUM > 110000
|
#if PG_VERSION_NUM >= 110000
|
||||||
#define AssertIsFunctionOrProcedure(objtype) \
|
#define AssertIsFunctionOrProcedure(objtype) \
|
||||||
Assert((objtype) == OBJECT_FUNCTION || (objtype) == OBJECT_PROCEDURE)
|
Assert((objtype) == OBJECT_FUNCTION || (objtype) == OBJECT_PROCEDURE)
|
||||||
#else
|
#else
|
||||||
|
@ -795,7 +795,7 @@ CreateFunctionStmtObjectAddress(CreateFunctionStmt *stmt, bool missing_ok)
|
||||||
ObjectWithArgs *objectWithArgs = NULL;
|
ObjectWithArgs *objectWithArgs = NULL;
|
||||||
ListCell *parameterCell = NULL;
|
ListCell *parameterCell = NULL;
|
||||||
|
|
||||||
#if PG_VERSION_NUM > 110000
|
#if PG_VERSION_NUM >= 110000
|
||||||
if (stmt->is_procedure)
|
if (stmt->is_procedure)
|
||||||
{
|
{
|
||||||
objectType = OBJECT_PROCEDURE;
|
objectType = OBJECT_PROCEDURE;
|
||||||
|
@ -828,7 +828,7 @@ PlanAlterFunctionStmt(AlterFunctionStmt *stmt, const char *queryString)
|
||||||
List *commands = NIL;
|
List *commands = NIL;
|
||||||
|
|
||||||
/* AlterFunctionStmt->objtype has only been added since pg11 */
|
/* AlterFunctionStmt->objtype has only been added since pg11 */
|
||||||
#if PG_VERSION_NUM > 110000
|
#if PG_VERSION_NUM >= 110000
|
||||||
AssertIsFunctionOrProcedure(stmt->objtype);
|
AssertIsFunctionOrProcedure(stmt->objtype);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1168,7 +1168,7 @@ AlterFunctionStmtObjectAddress(AlterFunctionStmt *stmt, bool missing_ok)
|
||||||
{
|
{
|
||||||
ObjectType objectType = OBJECT_FUNCTION;
|
ObjectType objectType = OBJECT_FUNCTION;
|
||||||
|
|
||||||
#if PG_VERSION_NUM > 110000
|
#if PG_VERSION_NUM >= 110000
|
||||||
objectType = stmt->objtype;
|
objectType = stmt->objtype;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
#include "postgres.h"
|
#include "postgres.h"
|
||||||
|
|
||||||
#if PG_VERSION_NUM > 12000
|
#if PG_VERSION_NUM >= 120000
|
||||||
#include "access/genam.h"
|
#include "access/genam.h"
|
||||||
#endif
|
#endif
|
||||||
#include "access/htup_details.h"
|
#include "access/htup_details.h"
|
||||||
|
|
|
@ -121,7 +121,7 @@ PlanAlterObjectSchemaStmt(AlterObjectSchemaStmt *stmt, const char *queryString)
|
||||||
return PlanAlterTypeSchemaStmt(stmt, queryString);
|
return PlanAlterTypeSchemaStmt(stmt, queryString);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if PG_VERSION_NUM > 110000
|
#if PG_VERSION_NUM >= 110000
|
||||||
case OBJECT_PROCEDURE:
|
case OBJECT_PROCEDURE:
|
||||||
#endif
|
#endif
|
||||||
case OBJECT_FUNCTION:
|
case OBJECT_FUNCTION:
|
||||||
|
@ -198,7 +198,7 @@ ProcessAlterObjectSchemaStmt(AlterObjectSchemaStmt *stmt, const char *queryStrin
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if PG_VERSION_NUM > 110000
|
#if PG_VERSION_NUM >= 110000
|
||||||
case OBJECT_PROCEDURE:
|
case OBJECT_PROCEDURE:
|
||||||
#endif
|
#endif
|
||||||
case OBJECT_FUNCTION:
|
case OBJECT_FUNCTION:
|
||||||
|
|
|
@ -426,7 +426,7 @@ multi_ProcessUtility(PlannedStmt *pstmt,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if PG_VERSION_NUM > 110000
|
#if PG_VERSION_NUM >= 110000
|
||||||
case OBJECT_PROCEDURE:
|
case OBJECT_PROCEDURE:
|
||||||
#endif
|
#endif
|
||||||
case OBJECT_FUNCTION:
|
case OBJECT_FUNCTION:
|
||||||
|
@ -484,7 +484,7 @@ multi_ProcessUtility(PlannedStmt *pstmt,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if PG_VERSION_NUM > 110000
|
#if PG_VERSION_NUM >= 110000
|
||||||
case OBJECT_PROCEDURE:
|
case OBJECT_PROCEDURE:
|
||||||
#endif
|
#endif
|
||||||
case OBJECT_FUNCTION:
|
case OBJECT_FUNCTION:
|
||||||
|
@ -843,7 +843,7 @@ PlanAlterOwnerStmt(AlterOwnerStmt *stmt, const char *queryString)
|
||||||
return PlanAlterTypeOwnerStmt(stmt, queryString);
|
return PlanAlterTypeOwnerStmt(stmt, queryString);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if PG_VERSION_NUM > 110000
|
#if PG_VERSION_NUM >= 110000
|
||||||
case OBJECT_PROCEDURE:
|
case OBJECT_PROCEDURE:
|
||||||
#endif
|
#endif
|
||||||
case OBJECT_FUNCTION:
|
case OBJECT_FUNCTION:
|
||||||
|
@ -871,7 +871,7 @@ PlanAlterObjectDependsStmt(AlterObjectDependsStmt *stmt, const char *queryString
|
||||||
{
|
{
|
||||||
switch (stmt->objectType)
|
switch (stmt->objectType)
|
||||||
{
|
{
|
||||||
#if PG_VERSION_NUM > 110000
|
#if PG_VERSION_NUM >= 110000
|
||||||
case OBJECT_PROCEDURE:
|
case OBJECT_PROCEDURE:
|
||||||
#endif
|
#endif
|
||||||
case OBJECT_FUNCTION:
|
case OBJECT_FUNCTION:
|
||||||
|
|
|
@ -143,7 +143,7 @@ RenameStmtObjectAddress(RenameStmt *stmt, bool missing_ok)
|
||||||
return RenameAttributeStmtObjectAddress(stmt, missing_ok);
|
return RenameAttributeStmtObjectAddress(stmt, missing_ok);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if PG_VERSION_NUM > 110000
|
#if PG_VERSION_NUM >= 110000
|
||||||
case OBJECT_PROCEDURE:
|
case OBJECT_PROCEDURE:
|
||||||
#endif
|
#endif
|
||||||
case OBJECT_FUNCTION:
|
case OBJECT_FUNCTION:
|
||||||
|
@ -170,7 +170,7 @@ AlterObjectSchemaStmtObjectAddress(AlterObjectSchemaStmt *stmt, bool missing_ok)
|
||||||
return AlterTypeSchemaStmtObjectAddress(stmt, missing_ok);
|
return AlterTypeSchemaStmtObjectAddress(stmt, missing_ok);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if PG_VERSION_NUM > 110000
|
#if PG_VERSION_NUM >= 110000
|
||||||
case OBJECT_PROCEDURE:
|
case OBJECT_PROCEDURE:
|
||||||
#endif
|
#endif
|
||||||
case OBJECT_FUNCTION:
|
case OBJECT_FUNCTION:
|
||||||
|
@ -218,7 +218,7 @@ AlterOwnerStmtObjectAddress(AlterOwnerStmt *stmt, bool missing_ok)
|
||||||
return AlterTypeOwnerObjectAddress(stmt, missing_ok);
|
return AlterTypeOwnerObjectAddress(stmt, missing_ok);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if PG_VERSION_NUM > 110000
|
#if PG_VERSION_NUM >= 110000
|
||||||
case OBJECT_PROCEDURE:
|
case OBJECT_PROCEDURE:
|
||||||
#endif
|
#endif
|
||||||
case OBJECT_FUNCTION:
|
case OBJECT_FUNCTION:
|
||||||
|
@ -250,7 +250,7 @@ AlterObjectDependsStmtObjectAddress(AlterObjectDependsStmt *stmt, bool missing_o
|
||||||
{
|
{
|
||||||
switch (stmt->objectType)
|
switch (stmt->objectType)
|
||||||
{
|
{
|
||||||
#if PG_VERSION_NUM > 110000
|
#if PG_VERSION_NUM >= 110000
|
||||||
case OBJECT_PROCEDURE:
|
case OBJECT_PROCEDURE:
|
||||||
#endif
|
#endif
|
||||||
case OBJECT_FUNCTION:
|
case OBJECT_FUNCTION:
|
||||||
|
|
Loading…
Reference in New Issue