Skip to content

Support PostgreSQL 16 #451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jcflack merged 3 commits into from
Sep 16, 2023
Merged

Support PostgreSQL 16 #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40788c1
Assume dlfcn.h exists except on Windows
jcflack Aug 21, 2023
2511321
Rely on __func__ being supported
jcflack Aug 21, 2023
e004f0a
Upstream has refactored aclcheck functions
jcflack Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pljava-so/src/main/c/Backend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <catalog/pg_type.h>

#if PG_VERSION_NUM >= 120000
#ifdef HAVE_DLOPEN
#if defined(HAVE_DLOPEN) || PG_VERSION_NUM >= 160000 && ! defined(WIN32)
#include <dlfcn.h>
#endif
#define pg_dlopen(f) dlopen((f), RTLD_NOW | RTLD_GLOBAL)
Expand Down
6 changes: 5 additions & 1 deletion pljava-so/src/main/c/Function.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2022 Tada AB and other contributors, as listed below.
* Copyright (c) 2004-2023 Tada AB and other contributors, as listed below.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the The BSD 3-Clause License
Expand Down Expand Up @@ -34,6 +34,10 @@
#include <funcapi.h>
#include <utils/typcache.h>

#if PG_VERSION_NUM >= 160000
#define PG_FUNCNAME_MACRO __func__
#endif

#ifdef _MSC_VER
# define strcasecmp _stricmp
# define strncasecmp _strnicmp
Expand Down
8 changes: 7 additions & 1 deletion pljava-so/src/main/c/type/AclId.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2019 Tada AB and other contributors, as listed below.
* Copyright (c) 2004-2023 Tada AB and other contributors, as listed below.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the The BSD 3-Clause License
Expand All @@ -22,6 +22,12 @@
#include "org_postgresql_pljava_internal_AclId.h"
#include "pljava/Exception.h"

#if PG_VERSION_NUM >= 160000
#include <catalog/pg_namespace.h>
#define pg_namespace_aclcheck(oid,rid,mode) \
object_aclcheck(NamespaceRelationId, (oid), (rid), (mode))
#endif

static jclass s_AclId_class;
static jmethodID s_AclId_init;
static jfieldID s_AclId_m_native;
Expand Down