Hello community,
here is the log from the commit of package octave-forge-database for
openSUSE:Leap:15.2 checked in at 2020-05-13 13:47:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/octave-forge-database (Old)
and /work/SRC/openSUSE:Leap:15.2/.octave-forge-database.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave-forge-database"
Wed May 13 13:47:56 2020 rev:14 rq:804888 version:2.4.4
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.2/octave-forge-database/octave-forge-database.changes
2020-01-15 15:34:55.658922896 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.octave-forge-database.new.2738/octave-forge-database.changes
2020-05-13 13:48:01.501396764 +0200
@@ -1,0 +2,9 @@
+Mon Nov 25 22:49:13 UTC 2019 - Stefan Brüns <[email protected]>
+
+- Update to version 2.4.4
+ * Build fixes. Builds with Octave 5.1.
+ * Works now also with a postgresql server owned by a different user
+ than postgres
+- Rebase add_missing_iostream_include.patch
+
+-------------------------------------------------------------------
Old:
----
database-2.4.3.tar.gz
New:
----
database-2.4.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ octave-forge-database.spec ++++++
--- /var/tmp/diff_new_pack.JTnZAN/_old 2020-05-13 13:48:01.913397651 +0200
+++ /var/tmp/diff_new_pack.JTnZAN/_new 2020-05-13 13:48:01.917397660 +0200
@@ -1,7 +1,7 @@
#
# spec file for package octave-forge-database
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,23 +18,23 @@
%define octpkg database
Name: octave-forge-%{octpkg}
-Version: 2.4.3
+Version: 2.4.4
Release: 0
Summary: Octave plugin interfacing PostgreSQL
License: GPL-3.0-or-later
Group: Productivity/Scientific/Math
-Url: http://octave.sourceforge.net
-Source0:
http://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz
+URL: https://octave.sourceforge.io
+Source0:
https://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM
Patch0: add_missing_iostream_include.patch
# PATCH-FIX-OPENSUSE -- boo#1120035, pg_config is no longer in the
postgresql-devel package, use pkg-config instead
Patch1: 0001-Use-pkg-config-instead-of-pg_config.patch
BuildRequires: gcc-c++
BuildRequires: hdf5-devel
-BuildRequires: octave-devel
+BuildRequires: octave-devel >= 4.0.0
BuildRequires: pkg-config
BuildRequires: postgresql-devel >= 8.3
-Requires: octave-cli >= 3.6.2
+Requires: octave-cli >= 4.0.0
Requires: octave-forge-struct >= 1.0.12
%description
@@ -43,8 +43,8 @@
%prep
%setup -q -c %{name}-%{version}
-%patch0 -p1
pushd %{octpkg}-%{version}
+%patch0 -p1
%patch1 -p1
popd
%octave_pkg_src
++++++ 0001-Use-pkg-config-instead-of-pg_config.patch ++++++
--- /var/tmp/diff_new_pack.JTnZAN/_old 2020-05-13 13:48:01.937397702 +0200
+++ /var/tmp/diff_new_pack.JTnZAN/_new 2020-05-13 13:48:01.937397702 +0200
@@ -10,7 +10,7 @@
3 files changed, 7 insertions(+), 50 deletions(-)
diff --git a/src/Makefile.in b/src/Makefile.in
-index 509d9ac..ef91bf2 100644
+index fd9882a..9efb1a5 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -39,7 +39,7 @@ endif
@@ -22,7 +22,7 @@
#
CANONICAL_HOST_TYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE))
-@@ -82,18 +82,18 @@ pq_interface.oct: $(IFOBJECTS)
+@@ -82,11 +82,11 @@ pq_interface.oct: $(IFOBJECTS)
$(MKOCTFILE) $< error-helpers.o
converters.o: converters.cc converters.h wrap_endian.h config.h
error-helpers.h
@@ -36,6 +36,7 @@
error-helpers.o: error-helpers.cc error-helpers.h config.h
CXXFLAGS="$(CXXFLAGS)" $(MKOCTFILE) -c error-helpers.cc
+@@ -96,7 +96,7 @@ pkglock.o: pkglock.cc
# be on the safe side with respect to include files
%.o: %.cc converters.h pq_connection.h command.h config.h error-helpers.h
@@ -44,7 +45,7 @@
doc: $(INFOFILE)
-@@ -133,7 +133,7 @@ RDEFUNX_DLD := DEFUNX_DLD_REPLACEMENT_FOR_PACKAGE_DOCS
+@@ -136,7 +136,7 @@ RDEFUNX_DLD := DEFUNX_DLD_REPLACEMENT_FOR_PACKAGE_DOCS
%.bin: %.cc
if grep -q $(RDEFUN_DLD) $<; then echo "The string '$(RDEFUN_DLD)' must
not be present in source code, but is in $<."; exit 1; fi
if grep -q $(RDEFUNX_DLD) $<; then echo "The string '$(RDEFUNX_DLD)'
must not be present in source code, but is in $<."; exit 1; fi
@@ -54,10 +55,10 @@
clean:
$(RM) *.o octave-core *.oct *.cc.docstrings MFDOCSTRINGS *~
diff --git a/src/configure b/src/configure
-index 8a6ad6a..b6a706b 100755
+index 4a57240..50bafe9 100755
--- a/src/configure
+++ b/src/configure
-@@ -2014,46 +2014,7 @@ fi
+@@ -2216,46 +2216,7 @@ fi
if test -z "$OCTAVE_CONFIG"; then
as_fn_error 1 "octave-config not found" "$LINENO" 5;
fi
@@ -104,7 +105,7 @@
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with
args.
-@@ -3447,7 +3408,7 @@ fi
+@@ -3649,7 +3610,7 @@ fi
# Check for PostgreSQL version.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether PostgreSQL version
>= 8.3" >&5
$as_echo_n "checking whether PostgreSQL version >= 8.3... " >&6; }
@@ -114,7 +115,7 @@
$as_echo "no" >&6; }
as_fn_error 1 "package \"database\" does not work with PostgreSQL version <
8.3" "$LINENO" 5;
diff --git a/src/configure.ac b/src/configure.ac
-index 45fa5fb..1a1df1e 100644
+index 143b4ac..65c5bda 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -37,10 +37,6 @@ AC_CHECK_PROG(OCTAVE_CONFIG, octave-config, octave-config)
++++++ add_missing_iostream_include.patch ++++++
--- /var/tmp/diff_new_pack.JTnZAN/_old 2020-05-13 13:48:01.953397737 +0200
+++ /var/tmp/diff_new_pack.JTnZAN/_new 2020-05-13 13:48:01.953397737 +0200
@@ -1,5 +1,5 @@
---- a/database-2.4.3/src/error-helpers.cc 2019-03-05 14:28:24.967487038
+0100
-+++ b/database-2.4.3/src/error-helpers.cc 2019-03-05 14:40:09.977597631
+0100
+--- a/src/error-helpers.cc 2019-03-05 14:28:24.967487038 +0100
++++ b/src/error-helpers.cc 2019-03-05 14:40:09.977597631 +0100
@@ -19,6 +19,8 @@
#include <octave/oct.h>
++++++ database-2.4.3.tar.gz -> database-2.4.4.tar.gz ++++++
++++ 1602 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/DESCRIPTION new/database-2.4.4/DESCRIPTION
--- old/database-2.4.3/DESCRIPTION 2018-05-18 17:48:08.969994292 +0200
+++ new/database-2.4.4/DESCRIPTION 2019-03-21 16:22:28.436457526 +0100
@@ -1,11 +1,11 @@
Name: database
-Version: 2.4.3
-Date: 2018-05-18
+Version: 2.4.4
+Date: 2019-03-13
Author: Olaf Till <[email protected]>
Maintainer: Olaf Till <[email protected]>
Title: Database.
Description: Interface to SQL databases, currently only postgresql using libpq.
-Depends: octave (>= 3.6.2), struct (>= 1.0.12)
+Depends: octave (>= 4.0.0), struct (>= 1.0.12)
BuildRequires: Postgresql (>= 8.3)
Autoload: no
License: GPLv3+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/Makefile new/database-2.4.4/Makefile
--- old/database-2.4.3/Makefile 2018-05-18 17:48:08.969994292 +0200
+++ new/database-2.4.4/Makefile 2019-03-21 16:22:28.464224151 +0100
@@ -207,7 +207,7 @@
## Test package.
octave_test_commands = \
' args = {"inst", "src"}; \
- args(cellfun (@ (x) ! isdir (x), args)) = []; \
+ args(cellfun (@ (x) isempty (a = stat (x)) || ! S_ISDIR (a.mode), args)) =
[]; \
if (isempty (args)) error ("no \"inst\" or \"src\" directory"); exit (1); \
else cellfun(@runtests, args); endif '
check: $(install_stamp)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/NEWS new/database-2.4.4/NEWS
--- old/database-2.4.3/NEWS 2018-05-18 17:48:08.969994292 +0200
+++ new/database-2.4.4/NEWS 2019-03-21 16:22:28.464224151 +0100
@@ -1,3 +1,11 @@
+database 2.4.4
+--------------
+
+ ** Build fixes. Builds with Octave 5.1.
+
+ ** Works now also with a postgresql server owned by a different user
+ than postgres.
+
datatase 2.4.3
--------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/doc/database.info new/database-2.4.4/doc/database.info
--- old/database-2.4.3/doc/database.info 2018-05-18 17:48:42.310757901
+0200
+++ new/database-2.4.4/doc/database.info 2019-03-21 16:23:22.559046558
+0100
@@ -25,7 +25,7 @@
General documentation for the database package for Octave
*********************************************************
-This documentation applies to version 2.4.3 of the database package.
+This documentation applies to version 2.4.4 of the database package.
The database package enables accessing SQL databases from Octave.
Differences between database implementations will inevitably cause some
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/doc/database.texi new/database-2.4.4/doc/database.texi
--- old/database-2.4.3/doc/database.texi 2018-05-18 17:48:41.950749525
+0200
+++ new/database-2.4.4/doc/database.texi 2019-03-21 16:23:22.086987512
+0100
@@ -60,7 +60,7 @@
installation, from the Octave commandline with @code{database_doc()}.
@end ifhtml
-This documentation applies to version 2.4.3 of the database
+This documentation applies to version 2.4.4 of the database
package.
The database package enables accessing SQL databases from
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/doc/html/index.html new/database-2.4.4/doc/html/index.html
--- old/database-2.4.3/doc/html/index.html 2018-05-18 17:48:42.646765718
+0200
+++ new/database-2.4.4/doc/html/index.html 2019-03-21 16:23:23.143116602
+0100
@@ -92,7 +92,7 @@
<p>The info version of this document is accessible, after package
installation, from the Octave commandline with <code>database_doc()</code>.
</p>
-<p>This documentation applies to version 2.4.3 of the database
+<p>This documentation applies to version 2.4.4 of the database
package.
</p>
<p>The database package enables accessing SQL databases from
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/inst/database_doc.m new/database-2.4.4/inst/database_doc.m
--- old/database-2.4.3/inst/database_doc.m 2018-05-18 17:48:08.973994381
+0200
+++ new/database-2.4.4/inst/database_doc.m 2019-03-21 16:22:28.539590704
+0100
@@ -1,4 +1,4 @@
-## Copyright (C) 2014-2018 Olaf Till
+## Copyright (C) 2014-2019 Olaf Till <[email protected]>
##
## This program is free software; you can redistribute it and/or modify it
under
## the terms of the GNU General Public License as published by the Free
Software
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/inst/pq_connect.m new/database-2.4.4/inst/pq_connect.m
--- old/database-2.4.3/inst/pq_connect.m 2018-05-18 17:48:08.973994381
+0200
+++ new/database-2.4.4/inst/pq_connect.m 2019-03-21 16:22:28.543557365
+0100
@@ -1,4 +1,4 @@
-## Copyright (C) 2012-2018 Olaf Till <[email protected]>
+## Copyright (C) 2012-2019 Olaf Till <[email protected]>
##
## This program is free software; you can redistribute it and/or modify it
under
## the terms of the GNU General Public License as published by the Free
Software
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/inst/pq_exec_params.m
new/database-2.4.4/inst/pq_exec_params.m
--- old/database-2.4.3/inst/pq_exec_params.m 2018-05-18 17:48:08.973994381
+0200
+++ new/database-2.4.4/inst/pq_exec_params.m 2019-03-21 16:22:28.547524025
+0100
@@ -1,4 +1,4 @@
-## Copyright (C) 2013-2018 Olaf Till <[email protected]>
+## Copyright (C) 2013-2019 Olaf Till <[email protected]>
##
## This program is free software; you can redistribute it and/or modify it
under
## the terms of the GNU General Public License as published by the Free
Software
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/inst/pq_lo_view.m new/database-2.4.4/inst/pq_lo_view.m
--- old/database-2.4.3/inst/pq_lo_view.m 2018-05-18 17:48:08.973994381
+0200
+++ new/database-2.4.4/inst/pq_lo_view.m 2019-03-21 16:22:28.547524025
+0100
@@ -1,4 +1,4 @@
-## Copyright (C) 2013-2018 Olaf Till <[email protected]>
+## Copyright (C) 2013-2019 Olaf Till <[email protected]>
##
## This program is free software; you can redistribute it and/or modify it
under
## the terms of the GNU General Public License as published by the Free
Software
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/__pq_connect__.cc
new/database-2.4.4/src/__pq_connect__.cc
--- old/database-2.4.3/src/__pq_connect__.cc 2018-05-18 17:48:08.977994472
+0200
+++ new/database-2.4.4/src/__pq_connect__.cc 2019-03-21 16:22:28.559424007
+0100
@@ -1,6 +1,6 @@
/*
-Copyright (C) 2012-2018 Olaf Till <[email protected]>
+Copyright (C) 2012-2019 Olaf Till <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/__pq_internal_exit__.cc
new/database-2.4.4/src/__pq_internal_exit__.cc
--- old/database-2.4.3/src/__pq_internal_exit__.cc 2018-05-18
17:48:08.977994472 +0200
+++ new/database-2.4.4/src/__pq_internal_exit__.cc 2019-03-21
16:22:28.559424007 +0100
@@ -1,4 +1,4 @@
-// Copyright (C) 2008-2018 Olaf Till <[email protected]>
+// Copyright (C) 2008-2019 Olaf Till <[email protected]>
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/bytea2var.cc new/database-2.4.4/src/bytea2var.cc
--- old/database-2.4.3/src/bytea2var.cc 2018-05-18 17:48:08.977994472 +0200
+++ new/database-2.4.4/src/bytea2var.cc 2019-03-21 16:22:28.591157293 +0100
@@ -1,6 +1,6 @@
/*
-Copyright (C) 2016-2018 Olaf Till <[email protected]>
+Copyright (C) 2016-2019 Olaf Till <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -56,7 +56,7 @@
octave_value val;
CHECK_ERROR (m = args(i).uint8_array_value (), retval,
- "%s: could not convert argument %i to uint8 array",
+ "%s: could not convert argument %li to uint8 array",
fname.c_str (), i + 1);
octave_idx_type nel = m.numel ();
@@ -136,7 +136,7 @@
}
if (err)
- error ("%s: could not load variable %i", fname.c_str (), i + 1);
+ error ("%s: could not load variable %li", fname.c_str (), i + 1);
return retval;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/command.cc new/database-2.4.4/src/command.cc
--- old/database-2.4.3/src/command.cc 2018-05-18 17:48:08.977994472 +0200
+++ new/database-2.4.4/src/command.cc 2019-03-21 16:22:28.591157293 +0100
@@ -1,6 +1,6 @@
/*
-Copyright (C) 2012-2018 Olaf Till <[email protected]>
+Copyright (C) 2012-2019 Olaf Till <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -33,8 +33,9 @@
#define COUT_RESIZE_STEP 1000 // resize result only after this number of rows
+// This constructor is currently not used and probably broken.
command::command (octave_pq_connection_rep &connection, std::string &cmd,
- Cell &rtypes,std::string &who)
+ Cell &rtypes, std::string &who)
: res (NULL), all_fetched (0), valid (1), conn (connection),
rettypes (rtypes), caller (who)
{
@@ -823,7 +824,7 @@
if (conversion_failed)
{
valid = 0;
- error ("could not convert data(%i, %i) for copy-in",
+ error ("could not convert data(%li, %li) for
copy-in",
i, j);
}
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/command.h new/database-2.4.4/src/command.h
--- old/database-2.4.3/src/command.h 2018-05-18 17:48:08.977994472 +0200
+++ new/database-2.4.4/src/command.h 2019-03-21 16:22:28.595123954 +0100
@@ -1,6 +1,6 @@
/*
-Copyright (C) 2012-2018 Olaf Till <[email protected]>
+Copyright (C) 2012-2019 Olaf Till <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@
{
public:
+ // This constructor is currently not used and probably broken.
command (octave_pq_connection_rep &connection, std::string &cmd, Cell
&rtypes,
std::string &who);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/config.h.in new/database-2.4.4/src/config.h.in
--- old/database-2.4.3/src/config.h.in 2018-05-18 17:48:10.870037149 +0200
+++ new/database-2.4.4/src/config.h.in 2019-03-21 16:22:30.238745329 +0100
@@ -2,16 +2,46 @@
#include "undef-ah-octave.h"
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
/* Define to 1 if you have the `pq' library (-lpq). */
#undef HAVE_LIBPQ
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
/* Define as 1 if liboctinterp is old enough to provide error_state. */
#undef HAVE_OCTAVE_ERROR_STATE
+/* Define to 1 if you have the <octave/interpreter.h> header file. */
+#undef HAVE_OCTAVE_INTERPRETER_H
+
/* Define as 1 if liboctinterp has 'verror (octave(_|::)execution_exception&,
const char *, va_list)'. */
#undef HAVE_OCTAVE_VERROR_ARG_EXC
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
/* macro for alternative Octave symbols */
#undef OCTAVE__EXECUTION_EXCEPTION
@@ -22,6 +52,9 @@
#undef OCTAVE__MACH_INFO
/* macro for alternative Octave symbols */
+#undef OCTAVE__VFORMAT
+
+/* macro for alternative Octave symbols */
#undef OV_ISCELL
/* macro for alternative Octave symbols */
@@ -54,4 +87,7 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
#include "oct-alt-includes.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/configure.ac new/database-2.4.4/src/configure.ac
--- old/database-2.4.3/src/configure.ac 2018-05-18 17:48:08.981994561 +0200
+++ new/database-2.4.4/src/configure.ac 2019-03-21 16:22:28.595123954 +0100
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
#
-### Copyright (C) 2015-2018 Olaf Till <[email protected]>
+### Copyright (C) 2015-2019 Olaf Till <[email protected]>
###
### This program is free software; you can redistribute it and/or
### modify it under the terms of the GNU General Public License as
@@ -18,7 +18,7 @@
### <http://www.gnu.org/licenses/>.
AC_PREREQ([2.67])
-AC_INIT([database], [2.4.3], [[email protected]])
+AC_INIT([database], [2.4.4], [[email protected]])
AC_CONFIG_SRCDIR([__pq_connect__.cc])
AC_CONFIG_HEADERS([config.h])
@@ -117,6 +117,8 @@
[AC_DEFINE([HAVE_OCTAVE_VERROR_ARG_EXC], 1,
[Define as 1 if liboctinterp has 'verror
(octave(_|::)execution_exception&, const char *, va_list)'.])])])
+AC_CHECK_HEADERS([octave/interpreter.h])
+
## Simple symbol alternatives of different Octave versions.
OF_OCTAVE_LIST_ALT_SYMS([
[dnl
@@ -189,6 +191,17 @@
[OCTAVE__EXECUTION_EXCEPTION],
[],
[]
+],
+
+[dnl
+ [octave_vformat],
+ [octave::vformat],
+ [[std::ostringstream obuf;]
+ [va_list args;]
+ [octave::vformat (obuf, "dummy", args);]],
+ [OCTAVE__VFORMAT],
+ [],
+ []
]
],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/converters.cc new/database-2.4.4/src/converters.cc
--- old/database-2.4.3/src/converters.cc 2018-05-18 17:48:08.981994561
+0200
+++ new/database-2.4.4/src/converters.cc 2019-03-21 16:22:28.603057275
+0100
@@ -1,6 +1,6 @@
/*
-Copyright (C) 2012-2018 Olaf Till <[email protected]>
+Copyright (C) 2012-2019 Olaf Till <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/converters.h new/database-2.4.4/src/converters.h
--- old/database-2.4.3/src/converters.h 2018-05-18 17:48:08.981994561 +0200
+++ new/database-2.4.4/src/converters.h 2019-03-21 16:22:28.603057275 +0100
@@ -1,6 +1,6 @@
/*
-Copyright (C) 2012-2018 Olaf Till <[email protected]>
+Copyright (C) 2012-2019 Olaf Till <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/converters_arr_comp.cc
new/database-2.4.4/src/converters_arr_comp.cc
--- old/database-2.4.3/src/converters_arr_comp.cc 2018-05-18
17:48:08.981994561 +0200
+++ new/database-2.4.4/src/converters_arr_comp.cc 2019-03-21
16:22:28.607023936 +0100
@@ -1,6 +1,6 @@
/*
-Copyright (C) 2012-2018 Olaf Till <[email protected]>
+Copyright (C) 2012-2019 Olaf Till <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/error-helpers.cc new/database-2.4.4/src/error-helpers.cc
--- old/database-2.4.3/src/error-helpers.cc 2018-05-18 17:48:08.981994561
+0200
+++ new/database-2.4.4/src/error-helpers.cc 2019-03-21 16:22:28.607023936
+0100
@@ -1,6 +1,6 @@
/*
-Copyright (C) 2016-2018 Olaf Till <[email protected]>
+Copyright (C) 2016-2019 Olaf Till <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
std::ostringstream output_buf;
- octave_vformat (output_buf, fmt, args);
+ OCTAVE__VFORMAT (output_buf, fmt, args);
std::string msg = output_buf.str ();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/error-helpers.h new/database-2.4.4/src/error-helpers.h
--- old/database-2.4.3/src/error-helpers.h 2018-05-18 17:48:08.981994561
+0200
+++ new/database-2.4.4/src/error-helpers.h 2019-03-21 16:22:28.610990596
+0100
@@ -1,6 +1,6 @@
/*
-Copyright (C) 2016-2018 Olaf Till <[email protected]>
+Copyright (C) 2016-2019 Olaf Till <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,6 +19,8 @@
#include "config.h"
+#include <iostream>
+
// Octaves non-static verror functions: The elder all set error_state,
// the newer, present from the time on at which error started to throw
// an exception, all throw, too.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/m4/octave-forge.m4
new/database-2.4.4/src/m4/octave-forge.m4
--- old/database-2.4.3/src/m4/octave-forge.m4 2018-05-18 17:48:08.981994561
+0200
+++ new/database-2.4.4/src/m4/octave-forge.m4 2019-03-21 16:22:28.634790561
+0100
@@ -1,4 +1,5 @@
# Copyright (C) 2017 Olaf Till <[email protected]>
+# Modifications to print what is searching for by JohnD
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -26,6 +27,7 @@
# $7: name of generated include file with alternatives of Octave headers
# (arg7 is $2 of OF_OCTAVE_LIST_ALT_SYMS)
AC_DEFUN([OF_OCTAVE_ALT_SYMS], [
+AC_MSG_CHECKING([$1 or $2])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[#include <octave/oct.h>]
$6],
@@ -33,10 +35,12 @@
[AC_DEFINE($4,
[[$2]],
[macro for alternative Octave symbols])
+ AC_MSG_RESULT([$2])
echo '$6' >> $7],
[AC_DEFINE($4,
[[$1]],
[macro for alternative Octave symbols])
+ AC_MSG_RESULT([$1])
echo '$5' >> $7]
)
])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/oct-alt-includes.h
new/database-2.4.4/src/oct-alt-includes.h
--- old/database-2.4.3/src/oct-alt-includes.h 2018-05-18 17:48:39.402690337
+0200
+++ new/database-2.4.4/src/oct-alt-includes.h 2019-03-21 16:23:19.514559015
+0100
@@ -17,3 +17,5 @@
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/pkglock.cc new/database-2.4.4/src/pkglock.cc
--- old/database-2.4.3/src/pkglock.cc 1970-01-01 01:00:00.000000000 +0100
+++ new/database-2.4.4/src/pkglock.cc 2019-03-21 16:22:28.638757221 +0100
@@ -0,0 +1,50 @@
+// Copyright (C) 2019 John Donoghue <[email protected]>
+//
+// This program is free software; you can redistribute it and/or modify it
under
+// the terms of the GNU General Public License as published by the Free
Software
+// Foundation; either version 3 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, see <http://www.gnu.org/licenses/>.
+
+// slightly modified by Olaf Till <[email protected]>
+
+// to have Octaves config.h included before config.h of 'database'
+#include <octave/oct.h>
+
+#include "config.h"
+
+#ifdef HAVE_OCTAVE_INTERPRETER_H
+#include <octave/interpreter.h>
+#endif
+
+// PKG_ADD: autoload ("__database_pkg_lock__", "pq_interface.oct");
+// PKG_ADD: __database_pkg_lock__(1);
+// PKG_DEL: __database_pkg_lock__(0);
+// PKG_DEL: autoload ("__database_pkg_lock__", "pq_interface.oct", "remove");
+#ifdef DEFMETHOD_DLD
+DEFMETHOD_DLD (__database_pkg_lock__, interp, args, , "internal function")
+{
+ octave_value retval;
+ if (args.length () >= 1)
+ {
+ if (args(0).int_value () == 1)
+ interp.mlock();
+ else if (args(0).int_value () == 0 &&
interp.mislocked("__database_pkg_lock__"))
+ interp.munlock("__database_pkg_lock__");
+ }
+ return retval;
+}
+#else
+DEFUN_DLD(__database_pkg_lock__, args, , "internal function")
+{
+ octave_value retval;
+ return retval;
+}
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/pq_close.cc new/database-2.4.4/src/pq_close.cc
--- old/database-2.4.3/src/pq_close.cc 2018-05-18 17:48:08.985994652 +0200
+++ new/database-2.4.4/src/pq_close.cc 2019-03-21 16:22:28.638757221 +0100
@@ -1,6 +1,6 @@
/*
-Copyright (C) 2012-2018 Olaf Till <[email protected]>
+Copyright (C) 2012-2019 Olaf Till <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/pq_connection.cc new/database-2.4.4/src/pq_connection.cc
--- old/database-2.4.3/src/pq_connection.cc 2018-05-18 17:48:08.985994652
+0200
+++ new/database-2.4.4/src/pq_connection.cc 2019-03-21 16:22:28.638757221
+0100
@@ -1,6 +1,6 @@
/*
-Copyright (C) 2012-2018 Olaf Till <[email protected]>
+Copyright (C) 2012-2019 Olaf Till <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@
}
octave_pq_connection_rep::octave_pq_connection_rep (std::string &arg)
-: conv_map (), name_conv_map (&map_str_cmp), conn (NULL), postgres (0)
+: conv_map (), name_conv_map (&map_str_cmp), conn (NULL)
{
BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
conn = PQconnectdb (arg.c_str ());
@@ -82,8 +82,7 @@
name_conv_map[conv_ptrs[i]->name.c_str () + pq_bpl] = conv_ptrs[i];
}
- if (octave_pq_get_postgres_oid () ||
- octave_pq_fill_base_types () ||
+ if (octave_pq_fill_base_types () ||
octave_pq_get_composite_types () ||
octave_pq_get_enum_types ())
{
@@ -181,47 +180,14 @@
name_conv_map.erase (*it);
}
-int octave_pq_connection_rep::octave_pq_get_postgres_oid (void)
-{
- Cell p, pt, rt (1, 1);
-
- rt(0) = octave_value ("oid");
-
- std::string cmd ("select oid from pg_roles where rolname = 'postgres';"),
- caller ("octave_pq_get_postgres_oid");
-
- command c (*this, cmd, p, pt, rt, caller);
- if (! c.good ())
- {
- _p_error ("could not read pg_roles");
- return 1;
- }
-
- octave_value res = c.process_single_result ();
- if (! c.good ())
- return 1;
-
- bool err;
- SET_ERR (postgres = res.scalar_map_value ().contents ("data").cell_value
()(0).int_value (), err);
- if (err)
- return 1;
-
- return 0;
-}
-
int octave_pq_connection_rep::octave_pq_fill_base_types (void)
{
- // assert postgres oid had been determined
- if (! postgres.int_value ()) return 1;
-
- Cell p (1, 1), pt (1, 1), rt (3, 1);
- p(0) = postgres;
- pt(0) = octave_value ("oid");
+ Cell p (0, 0), pt (0, 0), rt (3, 1);
rt(0) = octave_value ("oid");
rt(1) = octave_value ("name");
rt(2) = octave_value ("oid");
- std::string cmd ("select oid, typname, typarray from pg_type where (typowner
= $1 AND typtype = 'b' AND typarray != 0) OR typname = 'record' OR typname =
'unknown';"),
+ std::string cmd ("select oid, typname, typarray from pg_type where (typtype
= 'b' AND typarray != 0) OR typname = 'record' OR typname = 'unknown';"),
caller ("octave_pq_fill_base_types");
command c (*this, cmd, p, pt, rt, caller);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/pq_connection.h new/database-2.4.4/src/pq_connection.h
--- old/database-2.4.3/src/pq_connection.h 2018-05-18 17:48:08.985994652
+0200
+++ new/database-2.4.4/src/pq_connection.h 2019-03-21 16:22:28.642723882
+0100
@@ -1,6 +1,6 @@
/*
-Copyright (C) 2012-2018 Olaf Till <[email protected]>
+Copyright (C) 2012-2019 Olaf Till <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -52,16 +52,9 @@
PGconn *conn;
- // Oid of postgres_user, needed to distinguish base types from
- // others.
- octave_value postgres;
-
void octave_pq_delete_non_constant_types (void);
// returns zero on success
- int octave_pq_get_postgres_oid (void);
-
- // returns zero on success
int octave_pq_fill_base_types (void);
// returns zero on success
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/pq_conninfo.cc new/database-2.4.4/src/pq_conninfo.cc
--- old/database-2.4.3/src/pq_conninfo.cc 2018-05-18 17:48:08.985994652
+0200
+++ new/database-2.4.4/src/pq_conninfo.cc 2019-03-21 16:22:28.642723882
+0100
@@ -1,6 +1,6 @@
/*
-Copyright (C) 2013-2018 Olaf Till <[email protected]>
+Copyright (C) 2013-2019 Olaf Till <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/pq_exec.cc new/database-2.4.4/src/pq_exec.cc
--- old/database-2.4.3/src/pq_exec.cc 2018-05-18 17:48:08.985994652 +0200
+++ new/database-2.4.4/src/pq_exec.cc 2019-03-21 16:22:28.642723882 +0100
@@ -1,6 +1,6 @@
/*
-Copyright (C) 2012-2018 Olaf Till <[email protected]>
+Copyright (C) 2012-2019 Olaf Till <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -186,7 +186,8 @@
"%s: could not convert third argument to cell-array",
fname.c_str ());
CHECK_ERROR (settings = args(3).scalar_map_value (), retval,
- "%s: could not convert fourth argument to scalar
structure");
+ "%s: could not convert fourth argument to scalar structure",
+ fname.c_str ());
}
int nparams = params.numel ();
@@ -250,7 +251,7 @@
CHECK_ERROR (f_ret = OCTAVE__FEVAL ("getdbopts", f_args, 1), retval,
"%s: error calling getdbopts", fname.c_str ());
- bool cin_with_oids;
+ bool cin_with_oids = false;
CHECK_ERROR (cin_with_oids = f_ret(0).bool_value (), retval,
"%s: could not convert copy_in_with_oids to bool",
fname.c_str ());
@@ -269,7 +270,7 @@
CHECK_ERROR (f_ret = OCTAVE__FEVAL ("getdbopts", f_args, 1), retval,
"%s: error calling getdbopts", fname.c_str ());
- bool cin_from_variable;
+ bool cin_from_variable = false;
CHECK_ERROR (cin_from_variable = f_ret(0).bool_value (), retval,
"%s: could not convert copy_in_from_variable to bool",
fname.c_str ());
@@ -297,7 +298,8 @@
cin_types.resize (dim_vector (1, cind_dv(1)));
if (cin_types.numel () != cind_dv(1))
{
- error ("%s: copy_in_types has wrong number of elements");
+ error ("%s: copy_in_types has wrong number of elements",
+ fname.c_str ());
return retval;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/pq_lo.cc new/database-2.4.4/src/pq_lo.cc
--- old/database-2.4.3/src/pq_lo.cc 2018-05-18 17:48:08.985994652 +0200
+++ new/database-2.4.4/src/pq_lo.cc 2019-03-21 16:22:28.646690543 +0100
@@ -1,6 +1,6 @@
/*
-Copyright (C) 2013-2018 Olaf Till <[email protected]>
+Copyright (C) 2013-2019 Olaf Till <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -510,7 +510,7 @@
to_pipe = true;
}
- Oid oid;
+ Oid oid = 0;
CHECK_ERROR (oid = args(1).uint_value (), retval,
"%s: second argument can not be converted to an oid",
fname.c_str ());
@@ -634,7 +634,7 @@
return retval;
}
- Oid oid;
+ Oid oid = 0;
CHECK_ERROR (oid = args(1).uint_value (), retval,
"%s: second argument can not be converted to an oid",
fname.c_str ());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/pq_update_types.cc
new/database-2.4.4/src/pq_update_types.cc
--- old/database-2.4.3/src/pq_update_types.cc 2018-05-18 17:48:08.985994652
+0200
+++ new/database-2.4.4/src/pq_update_types.cc 2019-03-21 16:22:28.646690543
+0100
@@ -1,6 +1,6 @@
/*
-Copyright (C) 2013-2018 Olaf Till <[email protected]>
+Copyright (C) 2013-2019 Olaf Till <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/database-2.4.3/src/var2bytea.cc new/database-2.4.4/src/var2bytea.cc
--- old/database-2.4.3/src/var2bytea.cc 2018-05-18 17:48:08.989994741 +0200
+++ new/database-2.4.4/src/var2bytea.cc 2019-03-21 16:22:28.650657203 +0100
@@ -1,6 +1,6 @@
/*
-Copyright (C) 2016-2018 Olaf Till <[email protected]>
+Copyright (C) 2016-2019 Olaf Till <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -98,7 +98,7 @@
bool save_as_floats = false;
if (! val.save_binary (os, save_as_floats) || ! os)
{
- error ("%s: could not save variable %i", fname.c_str (), i + 1);
+ error ("%s: could not save variable %li", fname.c_str (), i + 1);
return retval;
}
