Skip to content
New issue

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

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

Already on GitHub? # to your account

Test pg17 #12

Merged
merged 2 commits into from
Jan 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2011-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
Copyright (c) 2011-2025, 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-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
# Copyright (c) 2011-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
#
MODULE_big = dblink_plus
DATA_built = dblink_plus.sql dblink_plus--1.0.9.sql
DATA_built = dblink_plus.sql dblink_plus--1.0.10.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.9.sql:
head -n -2 dblink_plus.sql.in | tail -n +4 > dblink_plus--1.0.9.sql
dblink_plus--1.0.10.sql:
head -n -2 dblink_plus.sql.in | tail -n +4 > dblink_plus--1.0.10.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_pg15.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPEC file for dblink_plus
# Copyright(C) 2024 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
# Copyright(C) 2025 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.9
Version: 1.0.10
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.9
Requires: dblink_plus = 1.0.10
Summary: Just-in-time compilation support for dblink_plus

%description llvmjit
Just-in-time compilation support for dblink_plus 1.0.9
Just-in-time compilation support for dblink_plus 1.0.10

## 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.9.sql
%{_datadir}/dblink_plus--1.0.10.sql
%{_datadir}/dblink_plus.control
%{_datadir}/uninstall_dblink_plus.sql
%{_datadir}/COPYRIGHT_dblink_plus
Expand All @@ -76,7 +76,9 @@ rm -rf %{buildroot}

# History.
%changelog
* Thu Jan 18 2023 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.9-1
* Fri Jan 17 2025 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.10-1
Support PG17.
* Thu Jan 18 2024 - 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.
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) 2024 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
# Copyright(C) 2025 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.9
Version: 1.0.10
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.9
Requires: dblink_plus = 1.0.10
Summary: Just-in-time compilation support for dblink_plus

%description llvmjit
Just-in-time compilation support for dblink_plus 1.0.9
Just-in-time compilation support for dblink_plus 1.0.10

## 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.9.sql
%{_datadir}/dblink_plus--1.0.10.sql
%{_datadir}/dblink_plus.control
%{_datadir}/uninstall_dblink_plus.sql
%{_datadir}/COPYRIGHT_dblink_plus
Expand All @@ -76,7 +76,9 @@ rm -rf %{buildroot}

# History.
%changelog
* Thu Jan 18 2023 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.9-1
* Fri Jan 17 2025 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.10-1
Support PG17.
* Thu Jan 18 2024 - 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.
Expand Down
14 changes: 8 additions & 6 deletions SPECS/dblink_plus_pg16.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPEC file for dblink_plus
# Copyright(C) 2024 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
# Copyright(C) 2025 NIPPON TELEGRAPH AND TELEPHONE CORPORATION

%define _pgdir /usr/pgsql-16
%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.9
Version: 1.0.10
Release: 1%{?dist}
License: BSD
Group: Applications/Databases
Expand All @@ -35,11 +35,11 @@ Note that this package is available for only PostgreSQL 16.

%package llvmjit
Requires: postgresql16-server, postgresql16-llvmjit
Requires: dblink_plus = 1.0.9
Requires: dblink_plus = 1.0.10
Summary: Just-in-time compilation support for dblink_plus

%description llvmjit
Just-in-time compilation support for dblink_plus 1.0.9
Just-in-time compilation support for dblink_plus 1.0.10

## 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.9.sql
%{_datadir}/dblink_plus--1.0.10.sql
%{_datadir}/dblink_plus.control
%{_datadir}/uninstall_dblink_plus.sql
%{_datadir}/COPYRIGHT_dblink_plus
Expand All @@ -76,7 +76,9 @@ rm -rf %{buildroot}

# History.
%changelog
* Thu Jan 18 2023 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.9-1
* Fri Jan 17 2025 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.10-1
Support PG17.
* Thu Jan 18 2024 - 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.
Expand Down
14 changes: 8 additions & 6 deletions SPECS/dblink_plus_pg16_ora.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPEC file for dblink_plus
# Copyright(C) 2024 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
# Copyright(C) 2025 NIPPON TELEGRAPH AND TELEPHONE CORPORATION

%define _pgdir /usr/pgsql-16
%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.9
Version: 1.0.10
Release: 1%{?dist}
License: BSD
Group: Applications/Databases
Expand All @@ -35,11 +35,11 @@ Note that this package is available for only PostgreSQL 16.

%package llvmjit
Requires: postgresql16-server, postgresql16-llvmjit
Requires: dblink_plus = 1.0.9
Requires: dblink_plus = 1.0.10
Summary: Just-in-time compilation support for dblink_plus

%description llvmjit
Just-in-time compilation support for dblink_plus 1.0.9
Just-in-time compilation support for dblink_plus 1.0.10

## 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.9.sql
%{_datadir}/dblink_plus--1.0.10.sql
%{_datadir}/dblink_plus.control
%{_datadir}/uninstall_dblink_plus.sql
%{_datadir}/COPYRIGHT_dblink_plus
Expand All @@ -76,7 +76,9 @@ rm -rf %{buildroot}

# History.
%changelog
* Thu Jan 18 2023 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.9-1
* Fri Jan 17 2025 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.10-1
Support PG17.
* Thu Jan 18 2024 - 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.
Expand Down
24 changes: 13 additions & 11 deletions SPECS/dblink_plus_pg14.spec → SPECS/dblink_plus_pg17.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPEC file for dblink_plus
# Copyright(C) 2024 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
# Copyright(C) 2025 NIPPON TELEGRAPH AND TELEPHONE CORPORATION

%define _pgdir /usr/pgsql-14
%define _pgdir /usr/pgsql-17
%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.9
Version: 1.0.10
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: postgresql14-devel
Requires: postgresql14-libs
BuildRequires: postgresql17-devel
Requires: postgresql17-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 14.
Note that this package is available for only PostgreSQL 17.

%package llvmjit
Requires: postgresql14-server, postgresql14-llvmjit
Requires: dblink_plus = 1.0.9
Requires: postgresql17-server, postgresql17-llvmjit
Requires: dblink_plus = 1.0.10
Summary: Just-in-time compilation support for dblink_plus

%description llvmjit
Just-in-time compilation support for dblink_plus 1.0.9
Just-in-time compilation support for dblink_plus 1.0.10

## 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.9.sql
%{_datadir}/dblink_plus--1.0.10.sql
%{_datadir}/dblink_plus.control
%{_datadir}/uninstall_dblink_plus.sql
%{_datadir}/COPYRIGHT_dblink_plus
Expand All @@ -76,7 +76,9 @@ rm -rf %{buildroot}

# History.
%changelog
* Thu Jan 18 2023 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.9-1
* Fri Jan 17 2025 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.10-1
Support PG17.
* Thu Jan 18 2024 - 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.
Expand Down
24 changes: 13 additions & 11 deletions SPECS/dblink_plus_pg14_ora.spec → SPECS/dblink_plus_pg17_ora.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPEC file for dblink_plus
# Copyright(C) 2024 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
# Copyright(C) 2025 NIPPON TELEGRAPH AND TELEPHONE CORPORATION

%define _pgdir /usr/pgsql-14
%define _pgdir /usr/pgsql-17
%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.9
Version: 1.0.10
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: postgresql14-devel
Requires: postgresql14-libs
BuildRequires: postgresql17-devel
Requires: postgresql17-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 14.
Note that this package is available for only PostgreSQL 17.

%package llvmjit
Requires: postgresql14-server, postgresql14-llvmjit
Requires: dblink_plus = 1.0.9
Requires: postgresql17-server, postgresql17-llvmjit
Requires: dblink_plus = 1.0.10
Summary: Just-in-time compilation support for dblink_plus

%description llvmjit
Just-in-time compilation support for dblink_plus 1.0.9
Just-in-time compilation support for dblink_plus 1.0.10

## 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.9.sql
%{_datadir}/dblink_plus--1.0.10.sql
%{_datadir}/dblink_plus.control
%{_datadir}/uninstall_dblink_plus.sql
%{_datadir}/COPYRIGHT_dblink_plus
Expand All @@ -76,7 +76,9 @@ rm -rf %{buildroot}

# History.
%changelog
* Thu Jan 18 2023 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.9-1
* Fri Jan 17 2025 - NTT OSS Center <mitsuru.hinata@ntt.com> 1.0.10-1
Support PG17.
* Thu Jan 18 2024 - 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.
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-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
* Copyright (c) 2011-2025, 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-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
* Copyright (c) 2011-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
*/
#ifndef DBLINK_H
#define DBLINK_H
Expand Down
2 changes: 1 addition & 1 deletion dblink_internal.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* dblink_internal.h
*
* Copyright (c) 2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
* Copyright (c) 2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
*/
#ifndef DBLINK_INTERNAL_H
#define DBLINK_INTERNAL_H
Expand Down
Loading