From f95c394bbb1f6dce16cf9fab6bcf1171c5905168 Mon Sep 17 00:00:00 2001 From: hinatamitsuru Date: Thu, 18 Jan 2024 19:11:04 +0900 Subject: [PATCH] Support pg16 --- COPYRIGHT | 2 +- Makefile | 8 +++---- SPECS/dblink_plus_pg14.spec | 14 ++++++----- SPECS/dblink_plus_pg14_ora.spec | 14 ++++++----- SPECS/dblink_plus_pg15.spec | 14 ++++++----- SPECS/dblink_plus_pg15_ora.spec | 14 ++++++----- ...k_plus_pg13.spec => dblink_plus_pg16.spec} | 24 ++++++++++--------- ...g13_ora.spec => dblink_plus_pg16_ora.spec} | 24 ++++++++++--------- dblink.c | 2 +- dblink.h | 2 +- dblink_internal.h | 2 +- dblink_mysql.c | 2 +- dblink_oracle.c | 2 +- dblink_plus.control | 2 +- dblink_postgres.c | 2 +- dblink_sqlite3.c | 2 +- docs/index.html | 6 ++--- 17 files changed, 74 insertions(+), 62 deletions(-) rename SPECS/{dblink_plus_pg13.spec => dblink_plus_pg16.spec} (80%) rename SPECS/{dblink_plus_pg13_ora.spec => dblink_plus_pg16_ora.spec} (80%) diff --git a/COPYRIGHT b/COPYRIGHT index 85d3e70..faab045 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,4 +1,4 @@ -Copyright (c) 2011-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION +Copyright (c) 2011-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Makefile b/Makefile index 849ab4d..56165ba 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # # dblink_plus: Makefile # -# Copyright (c) 2011-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright (c) 2011-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION # MODULE_big = dblink_plus -DATA_built = dblink_plus.sql dblink_plus--1.0.8.sql +DATA_built = dblink_plus.sql dblink_plus--1.0.9.sql DATA = uninstall_dblink_plus.sql OBJS = dblink.o dblink_postgres.o @@ -51,8 +51,8 @@ SHLIB_LINK += -L$(ORACLE_HOME)/lib -lclntsh endif endif -dblink_plus--1.0.8.sql: - head -n -2 dblink_plus.sql.in | tail -n +4 > dblink_plus--1.0.8.sql +dblink_plus--1.0.9.sql: + head -n -2 dblink_plus.sql.in | tail -n +4 > dblink_plus--1.0.9.sql standbycheck: all $(pg_regress_installcheck) --schedule=standby_schedule --use-existing --dbname=contrib_regression --port=$(PGPORT) diff --git a/SPECS/dblink_plus_pg14.spec b/SPECS/dblink_plus_pg14.spec index 52743dc..0db6374 100644 --- a/SPECS/dblink_plus_pg14.spec +++ b/SPECS/dblink_plus_pg14.spec @@ -1,5 +1,5 @@ # SPEC file for dblink_plus -# Copyright(C) 2023 NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright(C) 2024 NIPPON TELEGRAPH AND TELEPHONE CORPORATION %define _pgdir /usr/pgsql-14 %define _bindir %{_pgdir}/bin @@ -11,7 +11,7 @@ ## Set general information Summary: PostgreSQL module to connect PostgreSQL/Oracle Name: dblink_plus -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} License: BSD Group: Applications/Databases @@ -35,11 +35,11 @@ Note that this package is available for only PostgreSQL 14. %package llvmjit Requires: postgresql14-server, postgresql14-llvmjit -Requires: dblink_plus = 1.0.8 +Requires: dblink_plus = 1.0.9 Summary: Just-in-time compilation support for dblink_plus %description llvmjit -Just-in-time compilation support for dblink_plus 1.0.8 +Just-in-time compilation support for dblink_plus 1.0.9 ## prework %prep @@ -63,7 +63,7 @@ rm -rf %{buildroot} %{_libdir}/dblink_plus.so %defattr(0644,root,root) %{_datadir}/dblink_plus.sql -%{_datadir}/dblink_plus--1.0.8.sql +%{_datadir}/dblink_plus--1.0.9.sql %{_datadir}/dblink_plus.control %{_datadir}/uninstall_dblink_plus.sql %{_datadir}/COPYRIGHT_dblink_plus @@ -76,9 +76,11 @@ rm -rf %{buildroot} # History. %changelog +* Thu Jan 18 2023 - NTT OSS Center 1.0.9-1 +Support PG16. * Thu Jan 12 2023 - NTT OSS Center 1.0.8-1 Support PG15. -* Thu Jan 12 2022 - NTT OSS Center 1.0.7-1 +* Wed Jan 12 2022 - NTT OSS Center 1.0.7-1 Support PG14. * Thu Jan 07 2021 - NTT OSS Center 1.0.6-1 Support PG13 and fix how to install bitcode. diff --git a/SPECS/dblink_plus_pg14_ora.spec b/SPECS/dblink_plus_pg14_ora.spec index 0b84a06..7f740fa 100644 --- a/SPECS/dblink_plus_pg14_ora.spec +++ b/SPECS/dblink_plus_pg14_ora.spec @@ -1,5 +1,5 @@ # SPEC file for dblink_plus -# Copyright(C) 2023 NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright(C) 2024 NIPPON TELEGRAPH AND TELEPHONE CORPORATION %define _pgdir /usr/pgsql-14 %define _bindir %{_pgdir}/bin @@ -11,7 +11,7 @@ ## Set general information Summary: PostgreSQL module to connect PostgreSQL/Oracle Name: dblink_plus -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} License: BSD Group: Applications/Databases @@ -35,11 +35,11 @@ Note that this package is available for only PostgreSQL 14. %package llvmjit Requires: postgresql14-server, postgresql14-llvmjit -Requires: dblink_plus = 1.0.8 +Requires: dblink_plus = 1.0.9 Summary: Just-in-time compilation support for dblink_plus %description llvmjit -Just-in-time compilation support for dblink_plus 1.0.8 +Just-in-time compilation support for dblink_plus 1.0.9 ## prework %prep @@ -63,7 +63,7 @@ rm -rf %{buildroot} %{_libdir}/dblink_plus.so %defattr(0644,root,root) %{_datadir}/dblink_plus.sql -%{_datadir}/dblink_plus--1.0.8.sql +%{_datadir}/dblink_plus--1.0.9.sql %{_datadir}/dblink_plus.control %{_datadir}/uninstall_dblink_plus.sql %{_datadir}/COPYRIGHT_dblink_plus @@ -76,9 +76,11 @@ rm -rf %{buildroot} # History. %changelog +* Thu Jan 18 2023 - NTT OSS Center 1.0.9-1 +Support PG16. * Thu Jan 12 2023 - NTT OSS Center 1.0.8-1 Support PG15. -* Thu Jan 12 2022 - NTT OSS Center 1.0.7-1 +* Wed Jan 12 2022 - NTT OSS Center 1.0.7-1 Support PG14. * Thu Jan 07 2021 - NTT OSS Center 1.0.6-1 Support PG13 and fix how to install bitcode. diff --git a/SPECS/dblink_plus_pg15.spec b/SPECS/dblink_plus_pg15.spec index 2a08da3..1e32b8b 100644 --- a/SPECS/dblink_plus_pg15.spec +++ b/SPECS/dblink_plus_pg15.spec @@ -1,5 +1,5 @@ # SPEC file for dblink_plus -# Copyright(C) 2023 NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright(C) 2024 NIPPON TELEGRAPH AND TELEPHONE CORPORATION %define _pgdir /usr/pgsql-15 %define _bindir %{_pgdir}/bin @@ -11,7 +11,7 @@ ## Set general information Summary: PostgreSQL module to connect PostgreSQL/Oracle Name: dblink_plus -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} License: BSD Group: Applications/Databases @@ -35,11 +35,11 @@ Note that this package is available for only PostgreSQL 15. %package llvmjit Requires: postgresql15-server, postgresql15-llvmjit -Requires: dblink_plus = 1.0.8 +Requires: dblink_plus = 1.0.9 Summary: Just-in-time compilation support for dblink_plus %description llvmjit -Just-in-time compilation support for dblink_plus 1.0.8 +Just-in-time compilation support for dblink_plus 1.0.9 ## prework %prep @@ -63,7 +63,7 @@ rm -rf %{buildroot} %{_libdir}/dblink_plus.so %defattr(0644,root,root) %{_datadir}/dblink_plus.sql -%{_datadir}/dblink_plus--1.0.8.sql +%{_datadir}/dblink_plus--1.0.9.sql %{_datadir}/dblink_plus.control %{_datadir}/uninstall_dblink_plus.sql %{_datadir}/COPYRIGHT_dblink_plus @@ -76,9 +76,11 @@ rm -rf %{buildroot} # History. %changelog +* Thu Jan 18 2023 - NTT OSS Center 1.0.9-1 +Support PG16. * Thu Jan 12 2023 - NTT OSS Center 1.0.8-1 Support PG15. -* Thu Jan 12 2022 - NTT OSS Center 1.0.7-1 +* Wed Jan 12 2022 - NTT OSS Center 1.0.7-1 Support PG14. * Thu Jan 07 2021 - NTT OSS Center 1.0.6-1 Support PG13 and fix how to install bitcode. diff --git a/SPECS/dblink_plus_pg15_ora.spec b/SPECS/dblink_plus_pg15_ora.spec index f4733dd..3bd9fb9 100644 --- a/SPECS/dblink_plus_pg15_ora.spec +++ b/SPECS/dblink_plus_pg15_ora.spec @@ -1,5 +1,5 @@ # SPEC file for dblink_plus -# Copyright(C) 2023 NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright(C) 2024 NIPPON TELEGRAPH AND TELEPHONE CORPORATION %define _pgdir /usr/pgsql-15 %define _bindir %{_pgdir}/bin @@ -11,7 +11,7 @@ ## Set general information Summary: PostgreSQL module to connect PostgreSQL/Oracle Name: dblink_plus -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} License: BSD Group: Applications/Databases @@ -35,11 +35,11 @@ Note that this package is available for only PostgreSQL 15. %package llvmjit Requires: postgresql15-server, postgresql15-llvmjit -Requires: dblink_plus = 1.0.8 +Requires: dblink_plus = 1.0.9 Summary: Just-in-time compilation support for dblink_plus %description llvmjit -Just-in-time compilation support for dblink_plus 1.0.8 +Just-in-time compilation support for dblink_plus 1.0.9 ## prework %prep @@ -63,7 +63,7 @@ rm -rf %{buildroot} %{_libdir}/dblink_plus.so %defattr(0644,root,root) %{_datadir}/dblink_plus.sql -%{_datadir}/dblink_plus--1.0.8.sql +%{_datadir}/dblink_plus--1.0.9.sql %{_datadir}/dblink_plus.control %{_datadir}/uninstall_dblink_plus.sql %{_datadir}/COPYRIGHT_dblink_plus @@ -76,9 +76,11 @@ rm -rf %{buildroot} # History. %changelog +* Thu Jan 18 2023 - NTT OSS Center 1.0.9-1 +Support PG16. * Thu Jan 12 2023 - NTT OSS Center 1.0.8-1 Support PG15. -* Thu Jan 12 2022 - NTT OSS Center 1.0.7-1 +* Wed Jan 12 2022 - NTT OSS Center 1.0.7-1 Support PG14. * Thu Jan 07 2021 - NTT OSS Center 1.0.6-1 Support PG13 and fix how to install bitcode. diff --git a/SPECS/dblink_plus_pg13.spec b/SPECS/dblink_plus_pg16.spec similarity index 80% rename from SPECS/dblink_plus_pg13.spec rename to SPECS/dblink_plus_pg16.spec index 98042d0..9900a43 100644 --- a/SPECS/dblink_plus_pg13.spec +++ b/SPECS/dblink_plus_pg16.spec @@ -1,7 +1,7 @@ # SPEC file for dblink_plus -# Copyright(C) 2023 NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright(C) 2024 NIPPON TELEGRAPH AND TELEPHONE CORPORATION -%define _pgdir /usr/pgsql-13 +%define _pgdir /usr/pgsql-16 %define _bindir %{_pgdir}/bin %define _libdir %{_pgdir}/lib %define _datadir %{_pgdir}/share/extension @@ -11,7 +11,7 @@ ## Set general information Summary: PostgreSQL module to connect PostgreSQL/Oracle Name: dblink_plus -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} License: BSD Group: Applications/Databases @@ -23,23 +23,23 @@ Vendor: NIPPON TELEGRAPH AND TELEPHONE CORPORATION AutoReqProv: no ## We use postgresql-devel package -BuildRequires: postgresql13-devel -Requires: postgresql13-libs +BuildRequires: postgresql16-devel +Requires: postgresql16-libs ## Description %description dblink_plus is a PostgreSQL module which supports connections to other databases. It is similar to contrib/dblink except that it can connect to Oracle, MySQL and sqlite3. -Note that this package is available for only PostgreSQL 13. +Note that this package is available for only PostgreSQL 16. %package llvmjit -Requires: postgresql13-server, postgresql13-llvmjit -Requires: dblink_plus = 1.0.8 +Requires: postgresql16-server, postgresql16-llvmjit +Requires: dblink_plus = 1.0.9 Summary: Just-in-time compilation support for dblink_plus %description llvmjit -Just-in-time compilation support for dblink_plus 1.0.8 +Just-in-time compilation support for dblink_plus 1.0.9 ## prework %prep @@ -63,7 +63,7 @@ rm -rf %{buildroot} %{_libdir}/dblink_plus.so %defattr(0644,root,root) %{_datadir}/dblink_plus.sql -%{_datadir}/dblink_plus--1.0.8.sql +%{_datadir}/dblink_plus--1.0.9.sql %{_datadir}/dblink_plus.control %{_datadir}/uninstall_dblink_plus.sql %{_datadir}/COPYRIGHT_dblink_plus @@ -76,9 +76,11 @@ rm -rf %{buildroot} # History. %changelog +* Thu Jan 18 2023 - NTT OSS Center 1.0.9-1 +Support PG16. * Thu Jan 12 2023 - NTT OSS Center 1.0.8-1 Support PG15. -* Thu Jan 12 2022 - NTT OSS Center 1.0.7-1 +* Wed Jan 12 2022 - NTT OSS Center 1.0.7-1 Support PG14. * Thu Jan 07 2021 - NTT OSS Center 1.0.6-1 Support PG13 and fix how to install bitcode. diff --git a/SPECS/dblink_plus_pg13_ora.spec b/SPECS/dblink_plus_pg16_ora.spec similarity index 80% rename from SPECS/dblink_plus_pg13_ora.spec rename to SPECS/dblink_plus_pg16_ora.spec index 2d0c51e..1c250a4 100644 --- a/SPECS/dblink_plus_pg13_ora.spec +++ b/SPECS/dblink_plus_pg16_ora.spec @@ -1,7 +1,7 @@ # SPEC file for dblink_plus -# Copyright(C) 2023 NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright(C) 2024 NIPPON TELEGRAPH AND TELEPHONE CORPORATION -%define _pgdir /usr/pgsql-13 +%define _pgdir /usr/pgsql-16 %define _bindir %{_pgdir}/bin %define _libdir %{_pgdir}/lib %define _datadir %{_pgdir}/share/extension @@ -11,7 +11,7 @@ ## Set general information Summary: PostgreSQL module to connect PostgreSQL/Oracle Name: dblink_plus -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} License: BSD Group: Applications/Databases @@ -23,23 +23,23 @@ Vendor: NIPPON TELEGRAPH AND TELEPHONE CORPORATION AutoReqProv: no ## We use postgresql-devel package -BuildRequires: postgresql13-devel -Requires: postgresql13-libs +BuildRequires: postgresql16-devel +Requires: postgresql16-libs ## Description %description dblink_plus is a PostgreSQL module which supports connections to other databases. It is similar to contrib/dblink except that it can connect to Oracle, MySQL and sqlite3. -Note that this package is available for only PostgreSQL 13. +Note that this package is available for only PostgreSQL 16. %package llvmjit -Requires: postgresql13-server, postgresql13-llvmjit -Requires: dblink_plus = 1.0.8 +Requires: postgresql16-server, postgresql16-llvmjit +Requires: dblink_plus = 1.0.9 Summary: Just-in-time compilation support for dblink_plus %description llvmjit -Just-in-time compilation support for dblink_plus 1.0.8 +Just-in-time compilation support for dblink_plus 1.0.9 ## prework %prep @@ -63,7 +63,7 @@ rm -rf %{buildroot} %{_libdir}/dblink_plus.so %defattr(0644,root,root) %{_datadir}/dblink_plus.sql -%{_datadir}/dblink_plus--1.0.8.sql +%{_datadir}/dblink_plus--1.0.9.sql %{_datadir}/dblink_plus.control %{_datadir}/uninstall_dblink_plus.sql %{_datadir}/COPYRIGHT_dblink_plus @@ -76,9 +76,11 @@ rm -rf %{buildroot} # History. %changelog +* Thu Jan 18 2023 - NTT OSS Center 1.0.9-1 +Support PG16. * Thu Jan 12 2023 - NTT OSS Center 1.0.8-1 Support PG15. -* Thu Jan 12 2022 - NTT OSS Center 1.0.7-1 +* Wed Jan 12 2022 - NTT OSS Center 1.0.7-1 Support PG14. * Thu Jan 07 2021 - NTT OSS Center 1.0.6-1 Support PG13 and fix how to install bitcode. diff --git a/dblink.c b/dblink.c index 6ecaaae..b4196c7 100644 --- a/dblink.c +++ b/dblink.c @@ -1,7 +1,7 @@ /* * dblink.c * - * Copyright (c) 2011-2021, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2011-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION */ #include "postgres.h" diff --git a/dblink.h b/dblink.h index 764a16a..de7e65c 100644 --- a/dblink.h +++ b/dblink.h @@ -1,7 +1,7 @@ /* * dblink.h * - * Copyright (c) 2011-2017, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2011-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION */ #ifndef DBLINK_H #define DBLINK_H diff --git a/dblink_internal.h b/dblink_internal.h index 7ad0eb2..c0e9bef 100644 --- a/dblink_internal.h +++ b/dblink_internal.h @@ -1,7 +1,7 @@ /* * dblink_internal.h * - * Copyright (c) 2017, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION */ #ifndef DBLINK_INTERNAL_H #define DBLINK_INTERNAL_H diff --git a/dblink_mysql.c b/dblink_mysql.c index f4b593a..75ff37b 100644 --- a/dblink_mysql.c +++ b/dblink_mysql.c @@ -1,7 +1,7 @@ /* * dblink_mysql.c * - * Copyright (c) 2011-2017, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2011-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION */ #ifdef ENABLE_MYSQL diff --git a/dblink_oracle.c b/dblink_oracle.c index c032450..490542f 100644 --- a/dblink_oracle.c +++ b/dblink_oracle.c @@ -1,7 +1,7 @@ /* * dblink_oracle.c * - * Copyright (c) 2011-2020, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2011-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION */ #ifdef ENABLE_ORACLE diff --git a/dblink_plus.control b/dblink_plus.control index dc5e548..2c50b8b 100644 --- a/dblink_plus.control +++ b/dblink_plus.control @@ -1,5 +1,5 @@ # intarray extension comment = 'Connect to external database server, and then run the SQL' -default_version = '1.0.8' +default_version = '1.0.9' module_pathname = '$libdir/dblink_plus' relocatable = true diff --git a/dblink_postgres.c b/dblink_postgres.c index 99f0ba7..a15daca 100644 --- a/dblink_postgres.c +++ b/dblink_postgres.c @@ -1,7 +1,7 @@ /* * dblink_postgres.c * - * Copyright (c) 2011-2021, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2011-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION */ #include "postgres.h" diff --git a/dblink_sqlite3.c b/dblink_sqlite3.c index b1843d8..72aaccb 100644 --- a/dblink_sqlite3.c +++ b/dblink_sqlite3.c @@ -1,7 +1,7 @@ /* * dblink_sqlite3.c * - * Copyright (c) 2011-2020, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2011-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION */ #ifdef ENABLE_SQLITE3 diff --git a/docs/index.html b/docs/index.html index 771d288..d3a2c48 100644 --- a/docs/index.html +++ b/docs/index.html @@ -613,11 +613,11 @@

データベースからの登録解除

動作環境

PostgreSQLバージョン
-
PostgreSQL 9.2, 9.3, 9.4, 9.5, 9.6, 10, 11, 12, 13, 14, 15
+
PostgreSQL 9.2, 9.3, 9.4, 9.5, 9.6, 10, 11, 12, 13, 14, 15, 16
Oracleバージョン
Oracle 11g, 12c, 18c, 19c
OS
-
RHEL 6/7/8
+
RHEL 6/7/8/9

関連項目

@@ -627,7 +627,7 @@

関連項目

CREATE USER MAPPING
-

Copyright (c) 2011-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION

+

Copyright (c) 2011-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION