Skip to content

Commit

Permalink
Support pg16
Browse files Browse the repository at this point in the history
  • Loading branch information
hinatamitsuru committed Jan 18, 2024
1 parent d032930 commit f95c394
Show file tree
Hide file tree
Showing 17 changed files with 74 additions and 62 deletions.
2 changes: 1 addition & 1 deletion COPYRIGHT
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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)
14 changes: 8 additions & 6 deletions SPECS/dblink_plus_pg14.spec
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -76,9 +76,11 @@ rm -rf %{buildroot}

# History.
%changelog
* Thu Jan 18 2023 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.9-1
Support PG16.
* Thu Jan 12 2023 - NTT OSS Center <mitsuru.hinata.ck@hco.ntt.co.jp> 1.0.8-1
Support PG15.
* Thu Jan 12 2022 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.7-1
* Wed Jan 12 2022 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.7-1
Support PG14.
* Thu Jan 07 2021 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.6-1
Support PG13 and fix how to install bitcode.
Expand Down
14 changes: 8 additions & 6 deletions SPECS/dblink_plus_pg14_ora.spec
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -76,9 +76,11 @@ rm -rf %{buildroot}

# History.
%changelog
* Thu Jan 18 2023 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.9-1
Support PG16.
* Thu Jan 12 2023 - NTT OSS Center <mitsuru.hinata.ck@hco.ntt.co.jp> 1.0.8-1
Support PG15.
* Thu Jan 12 2022 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.7-1
* Wed Jan 12 2022 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.7-1
Support PG14.
* Thu Jan 07 2021 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.6-1
Support PG13 and fix how to install bitcode.
Expand Down
14 changes: 8 additions & 6 deletions SPECS/dblink_plus_pg15.spec
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -76,9 +76,11 @@ rm -rf %{buildroot}

# History.
%changelog
* Thu Jan 18 2023 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.9-1
Support PG16.
* Thu Jan 12 2023 - NTT OSS Center <mitsuru.hinata.ck@hco.ntt.co.jp> 1.0.8-1
Support PG15.
* Thu Jan 12 2022 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.7-1
* Wed Jan 12 2022 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.7-1
Support PG14.
* Thu Jan 07 2021 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.6-1
Support PG13 and fix how to install bitcode.
Expand Down
14 changes: 8 additions & 6 deletions SPECS/dblink_plus_pg15_ora.spec
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -76,9 +76,11 @@ rm -rf %{buildroot}

# History.
%changelog
* Thu Jan 18 2023 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.9-1
Support PG16.
* Thu Jan 12 2023 - NTT OSS Center <mitsuru.hinata.ck@hco.ntt.co.jp> 1.0.8-1
Support PG15.
* Thu Jan 12 2022 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.7-1
* Wed Jan 12 2022 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.7-1
Support PG14.
* Thu Jan 07 2021 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.6-1
Support PG13 and fix how to install bitcode.
Expand Down
24 changes: 13 additions & 11 deletions SPECS/dblink_plus_pg13.spec → SPECS/dblink_plus_pg16.spec
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -76,9 +76,11 @@ rm -rf %{buildroot}

# History.
%changelog
* Thu Jan 18 2023 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.9-1
Support PG16.
* Thu Jan 12 2023 - NTT OSS Center <mitsuru.hinata.ck@hco.ntt.co.jp> 1.0.8-1
Support PG15.
* Thu Jan 12 2022 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.7-1
* Wed Jan 12 2022 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.7-1
Support PG14.
* Thu Jan 07 2021 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.6-1
Support PG13 and fix how to install bitcode.
Expand Down
24 changes: 13 additions & 11 deletions SPECS/dblink_plus_pg13_ora.spec → SPECS/dblink_plus_pg16_ora.spec
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -76,9 +76,11 @@ rm -rf %{buildroot}

# History.
%changelog
* Thu Jan 18 2023 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.9-1
Support PG16.
* Thu Jan 12 2023 - NTT OSS Center <mitsuru.hinata.ck@hco.ntt.co.jp> 1.0.8-1
Support PG15.
* Thu Jan 12 2022 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.7-1
* Wed Jan 12 2022 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.7-1
Support PG14.
* Thu Jan 07 2021 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.6-1
Support PG13 and fix how to install bitcode.
Expand Down
2 changes: 1 addition & 1 deletion dblink.c
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion dblink.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading

0 comments on commit f95c394

Please sign in to comment.