Skip to content

Commit 196e115

Browse files
kiskkkiskk
authored
Merge pull request #3 from keisukekuroda3862/dev_dblink_plus_1.0.5
Dev dblink plus 1.0.5
2 parents 3d94711 + 55fad4e commit 196e115

17 files changed

+115
-282
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ regression.out
66
regression.diffs
77
results
88
results/*
9+
*.bc

‎COPYRIGHT‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2011-2017, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
1+
Copyright (c) 2011-2020, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

‎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-2019, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
4+
# Copyright (c) 2011-2020, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
55
#
66
MODULE_big = dblink_plus
7-
DATA_built = dblink_plus.sql dblink_plus--1.0.4.sql
7+
DATA_built = dblink_plus.sql dblink_plus--1.0.5.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.4.sql:
55-
head -n -2 dblink_plus.sql.in | tail -n +4 > dblink_plus--1.0.4.sql
54+
dblink_plus--1.0.5.sql:
55+
head -n -2 dblink_plus.sql.in | tail -n +4 > dblink_plus--1.0.5.sql
5656

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

‎SPECS/dblink_plus_pg10.spec‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
## Set general information
1010
Summary: PostgreSQL module to connect PostgreSQL/Oracle
1111
Name: dblink_plus
12-
Version: 1.0.4
12+
Version: 1.0.5
1313
Release: 1%{?dist}
1414
License: BSD
1515
Group: Applications/Databases
@@ -45,7 +45,7 @@ install -d %{buildroot}%{_libdir}
4545
install -m 755 dblink_plus.so %{buildroot}%{_libdir}/dblink_plus.so
4646
install -d %{buildroot}%{_datadir}
4747
install -m 755 dblink_plus.sql %{buildroot}%{_datadir}/dblink_plus.sql
48-
install -m 755 dblink_plus--1.0.4.sql %{buildroot}%{_datadir}/dblink_plus--1.0.4.sql
48+
install -m 755 dblink_plus--1.0.5.sql %{buildroot}%{_datadir}/dblink_plus--1.0.5.sql
4949
install -m 755 dblink_plus.control %{buildroot}%{_datadir}/dblink_plus.control
5050
install -m 755 uninstall_dblink_plus.sql %{buildroot}%{_datadir}/uninstall_dblink_plus.sql
5151
install -m 755 COPYRIGHT %{buildroot}%{_datadir}/COPYRIGHT_dblink_plus
@@ -58,12 +58,14 @@ rm -rf %{buildroot}
5858
%defattr(755,root,root)
5959
%{_libdir}/dblink_plus.so
6060
%{_datadir}/dblink_plus.sql
61-
%{_datadir}/dblink_plus--1.0.4.sql
61+
%{_datadir}/dblink_plus--1.0.5.sql
6262
%{_datadir}/dblink_plus.control
6363
%{_datadir}/uninstall_dblink_plus.sql
6464
%{_datadir}/COPYRIGHT_dblink_plus
6565

6666
# History.
6767
%changelog
68+
* Mon Nov 25 2019 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.5-1
69+
Support PG12.
6870
* Tue Jan 22 2019 - NTT OSS Center <tatsuro.yamada@lab.ntt.co.jp> 1.0.4-1
6971
initial packaging

‎SPECS/dblink_plus_pg10_ora.spec‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
## Set general information
1010
Summary: PostgreSQL module to connect PostgreSQL/Oracle
1111
Name: dblink_plus
12-
Version: 1.0.4
12+
Version: 1.0.5
1313
Release: 1%{?dist}
1414
License: BSD
1515
Group: Applications/Databases
@@ -45,7 +45,7 @@ install -d %{buildroot}%{_libdir}
4545
install -m 755 dblink_plus.so %{buildroot}%{_libdir}/dblink_plus.so
4646
install -d %{buildroot}%{_datadir}
4747
install -m 755 dblink_plus.sql %{buildroot}%{_datadir}/dblink_plus.sql
48-
install -m 755 dblink_plus--1.0.4.sql %{buildroot}%{_datadir}/dblink_plus--1.0.4.sql
48+
install -m 755 dblink_plus--1.0.5.sql %{buildroot}%{_datadir}/dblink_plus--1.0.5.sql
4949
install -m 755 dblink_plus.control %{buildroot}%{_datadir}/dblink_plus.control
5050
install -m 755 uninstall_dblink_plus.sql %{buildroot}%{_datadir}/uninstall_dblink_plus.sql
5151
install -m 755 COPYRIGHT %{buildroot}%{_datadir}/COPYRIGHT_dblink_plus
@@ -58,12 +58,14 @@ rm -rf %{buildroot}
5858
%defattr(755,root,root)
5959
%{_libdir}/dblink_plus.so
6060
%{_datadir}/dblink_plus.sql
61-
%{_datadir}/dblink_plus--1.0.4.sql
61+
%{_datadir}/dblink_plus--1.0.5.sql
6262
%{_datadir}/dblink_plus.control
6363
%{_datadir}/uninstall_dblink_plus.sql
6464
%{_datadir}/COPYRIGHT_dblink_plus
6565

6666
# History.
6767
%changelog
68+
* Mon Nov 25 2019 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.5-1
69+
Support PG12.
6870
* Tue Jan 22 2019 - NTT OSS Center <tatsuro.yamada@lab.ntt.co.jp> 1.0.4-1
6971
initial packaging

‎SPECS/dblink_plus_pg11.spec‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
## Set general information
1212
Summary: PostgreSQL module to connect PostgreSQL/Oracle
1313
Name: dblink_plus
14-
Version: 1.0.4
14+
Version: 1.0.5
1515
Release: 1%{?dist}
1616
License: BSD
1717
Group: Applications/Databases
@@ -35,11 +35,11 @@ Note that this package is available for only PostgreSQL 11.
3535

3636
%package llvmjit
3737
Requires: postgresql11-server, postgresql11-llvmjit
38-
Requires: dblink_plus = 1.0.4
38+
Requires: dblink_plus = 1.0.5
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.4
42+
Just-in-time compilation support for dblink_plus 1.0.5
4343

4444
## prework
4545
%prep
@@ -57,7 +57,7 @@ install -d %{buildroot}%{_libdir}
5757
install -m 755 dblink_plus.so %{buildroot}%{_libdir}/dblink_plus.so
5858
install -d %{buildroot}%{_datadir}
5959
install -m 755 dblink_plus.sql %{buildroot}%{_datadir}/dblink_plus.sql
60-
install -m 755 dblink_plus--1.0.4.sql %{buildroot}%{_datadir}/dblink_plus--1.0.4.sql
60+
install -m 755 dblink_plus--1.0.5.sql %{buildroot}%{_datadir}/dblink_plus--1.0.5.sql
6161
install -m 755 dblink_plus.control %{buildroot}%{_datadir}/dblink_plus.control
6262
install -m 755 uninstall_dblink_plus.sql %{buildroot}%{_datadir}/uninstall_dblink_plus.sql
6363
install -m 755 COPYRIGHT %{buildroot}%{_datadir}/COPYRIGHT_dblink_plus
@@ -73,7 +73,7 @@ rm -rf %{buildroot}
7373
%defattr(755,root,root)
7474
%{_libdir}/dblink_plus.so
7575
%{_datadir}/dblink_plus.sql
76-
%{_datadir}/dblink_plus--1.0.4.sql
76+
%{_datadir}/dblink_plus--1.0.5.sql
7777
%{_datadir}/dblink_plus.control
7878
%{_datadir}/uninstall_dblink_plus.sql
7979
%{_datadir}/COPYRIGHT_dblink_plus
@@ -90,5 +90,7 @@ rm -rf %{buildroot}
9090

9191
# History.
9292
%changelog
93+
* Mon Nov 25 2019 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.5-1
94+
Support PG12.
9395
* Tue Jan 22 2019 - NTT OSS Center <tatsuro.yamada@lab.ntt.co.jp> 1.0.4-1
9496
Support PG11.

‎SPECS/dblink_plus_pg11_ora.spec‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
## Set general information
1212
Summary: PostgreSQL module to connect PostgreSQL/Oracle
1313
Name: dblink_plus
14-
Version: 1.0.4
14+
Version: 1.0.5
1515
Release: 1%{?dist}
1616
License: BSD
1717
Group: Applications/Databases
@@ -35,11 +35,11 @@ Note that this package is available for only PostgreSQL 11.
3535

3636
%package llvmjit
3737
Requires: postgresql11-server, postgresql11-llvmjit
38-
Requires: dblink_plus = 1.0.4
38+
Requires: dblink_plus = 1.0.5
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.4
42+
Just-in-time compilation support for dblink_plus 1.0.5
4343

4444
## prework
4545
%prep
@@ -57,7 +57,7 @@ install -d %{buildroot}%{_libdir}
5757
install -m 755 dblink_plus.so %{buildroot}%{_libdir}/dblink_plus.so
5858
install -d %{buildroot}%{_datadir}
5959
install -m 755 dblink_plus.sql %{buildroot}%{_datadir}/dblink_plus.sql
60-
install -m 755 dblink_plus--1.0.4.sql %{buildroot}%{_datadir}/dblink_plus--1.0.4.sql
60+
install -m 755 dblink_plus--1.0.5.sql %{buildroot}%{_datadir}/dblink_plus--1.0.5.sql
6161
install -m 755 dblink_plus.control %{buildroot}%{_datadir}/dblink_plus.control
6262
install -m 755 uninstall_dblink_plus.sql %{buildroot}%{_datadir}/uninstall_dblink_plus.sql
6363
install -m 755 COPYRIGHT %{buildroot}%{_datadir}/COPYRIGHT_dblink_plus
@@ -74,7 +74,7 @@ rm -rf %{buildroot}
7474
%defattr(755,root,root)
7575
%{_libdir}/dblink_plus.so
7676
%{_datadir}/dblink_plus.sql
77-
%{_datadir}/dblink_plus--1.0.4.sql
77+
%{_datadir}/dblink_plus--1.0.5.sql
7878
%{_datadir}/dblink_plus.control
7979
%{_datadir}/uninstall_dblink_plus.sql
8080
%{_datadir}/COPYRIGHT_dblink_plus
@@ -93,5 +93,7 @@ rm -rf %{buildroot}
9393

9494
# History.
9595
%changelog
96+
* Mon Nov 25 2019 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.5-1
97+
Support PG12.
9698
* Tue Jan 22 2019 - NTT OSS Center <tatsuro.yamada@lab.ntt.co.jp> 1.0.4-1
9799
Support PG11.

SPECS/dblink_plus_pg96.spec renamed to SPECS/dblink_plus_pg12.spec

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
# SPEC file for dblink_plus
2-
# Copyright(C) 2016 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
2+
# Copyright(C) 2019 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
33

4-
%define _pgdir /usr/pgsql-9.6
4+
%define _pgdir /usr/pgsql-12
55
%define _bindir %{_pgdir}/bin
66
%define _libdir %{_pgdir}/lib
77
%define _datadir %{_pgdir}/share/extension
8+
%define _bcdir %{_libdir}/bitcode/dblink_plus
9+
%define _bc_ind_dir %{_libdir}/bitcode
810

911
## Set general information
1012
Summary: PostgreSQL module to connect PostgreSQL/Oracle
1113
Name: dblink_plus
12-
Version: 1.0.2
14+
Version: 1.0.5
1315
Release: 1%{?dist}
1416
License: BSD
1517
Group: Applications/Databases
@@ -21,21 +23,31 @@ Vendor: NIPPON TELEGRAPH AND TELEPHONE CORPORATION
2123
AutoReqProv: no
2224

2325
## We use postgresql-devel package
24-
BuildRequires: postgresql96-devel
25-
Requires: postgresql96-libs
26+
BuildRequires: postgresql12-devel
27+
Requires: postgresql12-libs
2628

2729
## Description
2830
%description
2931
dblink_plus is a PostgreSQL module which supports connections to other databases.
3032
It is similar to contrib/dblink except that it can connect to Oracle, MySQL and sqlite3.
3133

34+
Note that this package is available for only PostgreSQL 12.
35+
36+
%package llvmjit
37+
Requires: postgresql11-server, postgresql12-llvmjit
38+
Requires: dblink_plus = 1.0.5
39+
Summary: Just-in-time compilation support for dblink_plus
40+
41+
%description llvmjit
42+
Just-in-time compilation support for dblink_plus 1.0.5
43+
3244
## prework
3345
%prep
3446
%setup -q -n %{name}-%{version}
3547

3648
## Set variables for build environment
3749
%build
38-
USE_PGXS=1 make %{?_smp_mflags} MYSQL=0 SQLITE3=0
50+
USE_PGXS=1 make %{?_smp_mflags} MYSQL=0 SQLITE3=0 ORACLE=0
3951

4052
## Set variables for install
4153
%install
@@ -45,11 +57,14 @@ install -d %{buildroot}%{_libdir}
4557
install -m 755 dblink_plus.so %{buildroot}%{_libdir}/dblink_plus.so
4658
install -d %{buildroot}%{_datadir}
4759
install -m 755 dblink_plus.sql %{buildroot}%{_datadir}/dblink_plus.sql
48-
install -m 755 dblink_plus--1.0.2.sql %{buildroot}%{_datadir}/dblink_plus--1.0.2.sql
60+
install -m 755 dblink_plus--1.0.5.sql %{buildroot}%{_datadir}/dblink_plus--1.0.5.sql
4961
install -m 755 dblink_plus.control %{buildroot}%{_datadir}/dblink_plus.control
5062
install -m 755 uninstall_dblink_plus.sql %{buildroot}%{_datadir}/uninstall_dblink_plus.sql
5163
install -m 755 COPYRIGHT %{buildroot}%{_datadir}/COPYRIGHT_dblink_plus
52-
64+
install -d %{buildroot}%{_bcdir}
65+
install -m 644 dblink.bc %{buildroot}%{_bcdir}/dblink.bc
66+
install -m 644 dblink_postgres.bc %{buildroot}%{_bcdir}/dblink_postgres.bc
67+
install -m 644 dblink_plus.index.bc %{buildroot}%{_bc_ind_dir}/dblink_plus.index.bc
5368

5469
%clean
5570
rm -rf %{buildroot}
@@ -58,12 +73,20 @@ rm -rf %{buildroot}
5873
%defattr(755,root,root)
5974
%{_libdir}/dblink_plus.so
6075
%{_datadir}/dblink_plus.sql
61-
%{_datadir}/dblink_plus--1.0.2.sql
76+
%{_datadir}/dblink_plus--1.0.5.sql
6277
%{_datadir}/dblink_plus.control
6378
%{_datadir}/uninstall_dblink_plus.sql
6479
%{_datadir}/COPYRIGHT_dblink_plus
6580

81+
%files llvmjit
82+
%defattr(0644,root,root,0755)
83+
%{_bcdir}
84+
%defattr(0644,root,root)
85+
%{_bc_ind_dir}/dblink_plus.index.bc
86+
6687
# History.
6788
%changelog
68-
* Thu Oct 13 2016 - NTT OSS Center <furutani.kaname@lab.ntt.co.jp> 1.0.2-1
69-
initial packaging
89+
* Mon Nov 25 2019 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.5-1
90+
Support PG12.
91+
* Tue Jan 22 2019 - NTT OSS Center <tatsuro.yamada@lab.ntt.co.jp> 1.0.4-1
92+
Support PG11.

0 commit comments

Comments
 (0)