Skip to content

Commit cb0efff

Browse files
goofy525goofy525
authored
Merge pull request #13 from hinatamitsuru/test_pg18
Support pg18
2 parents 045dc1b + fa9952b commit cb0efff

17 files changed

+78
-67
lines changed

‎COPYRIGHT‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2011-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
1+
Copyright (c) 2011-2025, NTT, Inc.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without
@@ -9,10 +9,9 @@ modification, are permitted provided that the following conditions are met:
99
* Redistributions in binary form must reproduce the above copyright
1010
notice, this list of conditions and the following disclaimer in the
1111
documentation and/or other materials provided with the distribution.
12-
* Neither the name of the NIPPON TELEGRAPH AND TELEPHONE CORPORATION
13-
(NTT) nor the names of its contributors may be used to endorse or
14-
promote products derived from this software without specific prior
15-
written permission.
12+
* Neither the name of the NTT nor the names of its contributors
13+
may be used to endorse or promote products derived from this software
14+
without specific prior written permission.
1615

1716
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
1817
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#
22
# dblink_plus: Makefile
33
#
4-
# Copyright (c) 2011-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
4+
# Copyright (c) 2011-2025, NTT, Inc.
55
#
66
MODULE_big = dblink_plus
7-
DATA_built = dblink_plus.sql dblink_plus--1.0.10.sql
7+
DATA_built = dblink_plus.sql dblink_plus--1.0.11.sql
88
DATA = uninstall_dblink_plus.sql
99
OBJS = dblink.o dblink_postgres.o
1010

@@ -51,8 +51,8 @@ SHLIB_LINK += -L$(ORACLE_HOME)/lib -lclntsh
5151
endif
5252
endif
5353

54-
dblink_plus--1.0.10.sql:
55-
head -n -2 dblink_plus.sql.in | tail -n +4 > dblink_plus--1.0.10.sql
54+
dblink_plus--1.0.11.sql:
55+
head -n -2 dblink_plus.sql.in | tail -n +4 > dblink_plus--1.0.11.sql
5656

5757
standbycheck: all
5858
$(pg_regress_installcheck) --schedule=standby_schedule --use-existing --dbname=contrib_regression --port=$(PGPORT)

‎SPECS/dblink_plus_pg16.spec‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPEC file for dblink_plus
2-
# Copyright(C) 2025 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
2+
# Copyright(C) 2025 NTT, Inc.
33

44
%define _pgdir /usr/pgsql-16
55
%define _bindir %{_pgdir}/bin
@@ -11,14 +11,14 @@
1111
## Set general information
1212
Summary: PostgreSQL module to connect PostgreSQL/Oracle
1313
Name: dblink_plus
14-
Version: 1.0.10
14+
Version: 1.0.11
1515
Release: 1%{?dist}
1616
License: BSD
1717
Group: Applications/Databases
1818
Source0: %{name}-%{version}.tar.gz
1919
URL: https://github.com/ossc-db/dblink_plus
2020
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
21-
Vendor: NIPPON TELEGRAPH AND TELEPHONE CORPORATION
21+
Vendor: NTT, Inc.
2222
#Following is needed to remove auto-discovery of oci library files(not under RPM package management)
2323
AutoReqProv: no
2424

@@ -35,11 +35,11 @@ Note that this package is available for only PostgreSQL 16.
3535

3636
%package llvmjit
3737
Requires: postgresql16-server, postgresql16-llvmjit
38-
Requires: dblink_plus = 1.0.10
38+
Requires: dblink_plus = 1.0.11
3939
Summary: Just-in-time compilation support for dblink_plus
4040

4141
%description llvmjit
42-
Just-in-time compilation support for dblink_plus 1.0.10
42+
Just-in-time compilation support for dblink_plus 1.0.11
4343

4444
## prework
4545
%prep
@@ -63,7 +63,7 @@ rm -rf %{buildroot}
6363
%{_libdir}/dblink_plus.so
6464
%defattr(0644,root,root)
6565
%{_datadir}/dblink_plus.sql
66-
%{_datadir}/dblink_plus--1.0.10.sql
66+
%{_datadir}/dblink_plus--1.0.11.sql
6767
%{_datadir}/dblink_plus.control
6868
%{_datadir}/uninstall_dblink_plus.sql
6969
%{_datadir}/COPYRIGHT_dblink_plus
@@ -76,6 +76,8 @@ rm -rf %{buildroot}
7676

7777
# History.
7878
%changelog
79+
* Thu Dec 25 2025 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.11-1
80+
Support PG18.
7981
* Fri Jan 17 2025 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.10-1
8082
Support PG17.
8183
* Thu Jan 18 2024 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.9-1

‎SPECS/dblink_plus_pg16_ora.spec‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPEC file for dblink_plus
2-
# Copyright(C) 2025 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
2+
# Copyright(C) 2025 NTT, Inc.
33

44
%define _pgdir /usr/pgsql-16
55
%define _bindir %{_pgdir}/bin
@@ -11,14 +11,14 @@
1111
## Set general information
1212
Summary: PostgreSQL module to connect PostgreSQL/Oracle
1313
Name: dblink_plus
14-
Version: 1.0.10
14+
Version: 1.0.11
1515
Release: 1%{?dist}
1616
License: BSD
1717
Group: Applications/Databases
1818
Source0: %{name}-%{version}.tar.gz
1919
URL: https://github.com/ossc-db/dblink_plus
2020
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
21-
Vendor: NIPPON TELEGRAPH AND TELEPHONE CORPORATION
21+
Vendor: NTT, Inc.
2222
#Following is needed to remove auto-discovery of oci library files(not under RPM package management)
2323
AutoReqProv: no
2424

@@ -35,11 +35,11 @@ Note that this package is available for only PostgreSQL 16.
3535

3636
%package llvmjit
3737
Requires: postgresql16-server, postgresql16-llvmjit
38-
Requires: dblink_plus = 1.0.10
38+
Requires: dblink_plus = 1.0.11
3939
Summary: Just-in-time compilation support for dblink_plus
4040

4141
%description llvmjit
42-
Just-in-time compilation support for dblink_plus 1.0.10
42+
Just-in-time compilation support for dblink_plus 1.0.11
4343

4444
## prework
4545
%prep
@@ -63,7 +63,7 @@ rm -rf %{buildroot}
6363
%{_libdir}/dblink_plus.so
6464
%defattr(0644,root,root)
6565
%{_datadir}/dblink_plus.sql
66-
%{_datadir}/dblink_plus--1.0.10.sql
66+
%{_datadir}/dblink_plus--1.0.11.sql
6767
%{_datadir}/dblink_plus.control
6868
%{_datadir}/uninstall_dblink_plus.sql
6969
%{_datadir}/COPYRIGHT_dblink_plus
@@ -76,6 +76,8 @@ rm -rf %{buildroot}
7676

7777
# History.
7878
%changelog
79+
* Thu Dec 25 2025 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.11-1
80+
Support PG18.
7981
* Fri Jan 17 2025 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.10-1
8082
Support PG17.
8183
* Thu Jan 18 2024 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.9-1

‎SPECS/dblink_plus_pg17.spec‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPEC file for dblink_plus
2-
# Copyright(C) 2025 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
2+
# Copyright(C) 2025 NTT, Inc.
33

44
%define _pgdir /usr/pgsql-17
55
%define _bindir %{_pgdir}/bin
@@ -11,14 +11,14 @@
1111
## Set general information
1212
Summary: PostgreSQL module to connect PostgreSQL/Oracle
1313
Name: dblink_plus
14-
Version: 1.0.10
14+
Version: 1.0.11
1515
Release: 1%{?dist}
1616
License: BSD
1717
Group: Applications/Databases
1818
Source0: %{name}-%{version}.tar.gz
1919
URL: https://github.com/ossc-db/dblink_plus
2020
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
21-
Vendor: NIPPON TELEGRAPH AND TELEPHONE CORPORATION
21+
Vendor: NTT, Inc.
2222
#Following is needed to remove auto-discovery of oci library files(not under RPM package management)
2323
AutoReqProv: no
2424

@@ -35,11 +35,11 @@ Note that this package is available for only PostgreSQL 17.
3535

3636
%package llvmjit
3737
Requires: postgresql17-server, postgresql17-llvmjit
38-
Requires: dblink_plus = 1.0.10
38+
Requires: dblink_plus = 1.0.11
3939
Summary: Just-in-time compilation support for dblink_plus
4040

4141
%description llvmjit
42-
Just-in-time compilation support for dblink_plus 1.0.10
42+
Just-in-time compilation support for dblink_plus 1.0.11
4343

4444
## prework
4545
%prep
@@ -63,7 +63,7 @@ rm -rf %{buildroot}
6363
%{_libdir}/dblink_plus.so
6464
%defattr(0644,root,root)
6565
%{_datadir}/dblink_plus.sql
66-
%{_datadir}/dblink_plus--1.0.10.sql
66+
%{_datadir}/dblink_plus--1.0.11.sql
6767
%{_datadir}/dblink_plus.control
6868
%{_datadir}/uninstall_dblink_plus.sql
6969
%{_datadir}/COPYRIGHT_dblink_plus
@@ -76,6 +76,8 @@ rm -rf %{buildroot}
7676

7777
# History.
7878
%changelog
79+
* Thu Dec 25 2025 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.11-1
80+
Support PG18.
7981
* Fri Jan 17 2025 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.10-1
8082
Support PG17.
8183
* Thu Jan 18 2024 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.9-1

‎SPECS/dblink_plus_pg17_ora.spec‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPEC file for dblink_plus
2-
# Copyright(C) 2025 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
2+
# Copyright(C) 2025 NTT, Inc.
33

44
%define _pgdir /usr/pgsql-17
55
%define _bindir %{_pgdir}/bin
@@ -11,14 +11,14 @@
1111
## Set general information
1212
Summary: PostgreSQL module to connect PostgreSQL/Oracle
1313
Name: dblink_plus
14-
Version: 1.0.10
14+
Version: 1.0.11
1515
Release: 1%{?dist}
1616
License: BSD
1717
Group: Applications/Databases
1818
Source0: %{name}-%{version}.tar.gz
1919
URL: https://github.com/ossc-db/dblink_plus
2020
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
21-
Vendor: NIPPON TELEGRAPH AND TELEPHONE CORPORATION
21+
Vendor: NTT, Inc.
2222
#Following is needed to remove auto-discovery of oci library files(not under RPM package management)
2323
AutoReqProv: no
2424

@@ -35,11 +35,11 @@ Note that this package is available for only PostgreSQL 17.
3535

3636
%package llvmjit
3737
Requires: postgresql17-server, postgresql17-llvmjit
38-
Requires: dblink_plus = 1.0.10
38+
Requires: dblink_plus = 1.0.11
3939
Summary: Just-in-time compilation support for dblink_plus
4040

4141
%description llvmjit
42-
Just-in-time compilation support for dblink_plus 1.0.10
42+
Just-in-time compilation support for dblink_plus 1.0.11
4343

4444
## prework
4545
%prep
@@ -63,7 +63,7 @@ rm -rf %{buildroot}
6363
%{_libdir}/dblink_plus.so
6464
%defattr(0644,root,root)
6565
%{_datadir}/dblink_plus.sql
66-
%{_datadir}/dblink_plus--1.0.10.sql
66+
%{_datadir}/dblink_plus--1.0.11.sql
6767
%{_datadir}/dblink_plus.control
6868
%{_datadir}/uninstall_dblink_plus.sql
6969
%{_datadir}/COPYRIGHT_dblink_plus
@@ -76,6 +76,8 @@ rm -rf %{buildroot}
7676

7777
# History.
7878
%changelog
79+
* Thu Dec 25 2025 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.11-1
80+
Support PG18.
7981
* Fri Jan 17 2025 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.10-1
8082
Support PG17.
8183
* Thu Jan 18 2024 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.9-1

SPECS/dblink_plus_pg15.spec renamed to SPECS/dblink_plus_pg18.spec

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPEC file for dblink_plus
2-
# Copyright(C) 2025 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
2+
# Copyright(C) 2025 NTT, Inc.
33

4-
%define _pgdir /usr/pgsql-15
4+
%define _pgdir /usr/pgsql-18
55
%define _bindir %{_pgdir}/bin
66
%define _libdir %{_pgdir}/lib
77
%define _datadir %{_pgdir}/share/extension
@@ -11,35 +11,35 @@
1111
## Set general information
1212
Summary: PostgreSQL module to connect PostgreSQL/Oracle
1313
Name: dblink_plus
14-
Version: 1.0.10
14+
Version: 1.0.11
1515
Release: 1%{?dist}
1616
License: BSD
1717
Group: Applications/Databases
1818
Source0: %{name}-%{version}.tar.gz
1919
URL: https://github.com/ossc-db/dblink_plus
2020
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
21-
Vendor: NIPPON TELEGRAPH AND TELEPHONE CORPORATION
21+
Vendor: NTT, Inc.
2222
#Following is needed to remove auto-discovery of oci library files(not under RPM package management)
2323
AutoReqProv: no
2424

2525
## We use postgresql-devel package
26-
BuildRequires: postgresql15-devel
27-
Requires: postgresql15-libs
26+
BuildRequires: postgresql18-devel
27+
Requires: postgresql18-libs
2828

2929
## Description
3030
%description
3131
dblink_plus is a PostgreSQL module which supports connections to other databases.
3232
It is similar to contrib/dblink except that it can connect to Oracle, MySQL and sqlite3.
3333

34-
Note that this package is available for only PostgreSQL 15.
34+
Note that this package is available for only PostgreSQL 18.
3535

3636
%package llvmjit
37-
Requires: postgresql15-server, postgresql15-llvmjit
38-
Requires: dblink_plus = 1.0.10
37+
Requires: postgresql18-server, postgresql18-llvmjit
38+
Requires: dblink_plus = 1.0.11
3939
Summary: Just-in-time compilation support for dblink_plus
4040

4141
%description llvmjit
42-
Just-in-time compilation support for dblink_plus 1.0.10
42+
Just-in-time compilation support for dblink_plus 1.0.11
4343

4444
## prework
4545
%prep
@@ -63,7 +63,7 @@ rm -rf %{buildroot}
6363
%{_libdir}/dblink_plus.so
6464
%defattr(0644,root,root)
6565
%{_datadir}/dblink_plus.sql
66-
%{_datadir}/dblink_plus--1.0.10.sql
66+
%{_datadir}/dblink_plus--1.0.11.sql
6767
%{_datadir}/dblink_plus.control
6868
%{_datadir}/uninstall_dblink_plus.sql
6969
%{_datadir}/COPYRIGHT_dblink_plus
@@ -76,6 +76,8 @@ rm -rf %{buildroot}
7676

7777
# History.
7878
%changelog
79+
* Thu Dec 25 2025 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.11-1
80+
Support PG18.
7981
* Fri Jan 17 2025 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.10-1
8082
Support PG17.
8183
* Thu Jan 18 2024 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.9-1

0 commit comments

Comments
 (0)