rebase: minor release
Version: 09.05.0400-1
This commit is contained in:
Petr Kubat
parent
edc7ea8a27
commit
060b443c75
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
/psqlodbc-09.05.0300.tar.gz
|
||||
/psqlodbc-09.05.0400.tar.gz
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From 1da4f790a11f281cce15a2d3cc16182c099b6d5c Mon Sep 17 00:00:00 2001
|
||||
From: Hiroshi Inoue <h-inoue@dream.email.ne.jp>
|
||||
Date: Sun, 24 Jul 2016 18:58:42 +0900
|
||||
Subject: [PATCH 1/2] Fix regression test failures on armv7hl. 'char' type
|
||||
seems to mean unsigned char on the platform. Though move_direction member of
|
||||
QResultClass takes negative values, QR_is_moving_backward() never returns
|
||||
TRUE. So ensure that move_direction is signed char on any platform.
|
||||
|
||||
---
|
||||
qresult.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/qresult.h b/qresult.h
|
||||
index 60f449a..b5d878b 100644
|
||||
--- a/qresult.h
|
||||
+++ b/qresult.h
|
||||
@@ -88,7 +88,7 @@ struct QResultClass_
|
||||
char pstatus; /* processing status */
|
||||
char aborted; /* was aborted ? */
|
||||
char flags; /* this result contains keyset etc ? */
|
||||
- char move_direction; /* must move before fetching this
|
||||
+ po_ind_t move_direction; /* must move before fetching this
|
||||
result set */
|
||||
SQLULEN count_keyset_allocated; /* m(re)alloced count */
|
||||
SQLULEN num_cached_keys; /* count of keys kept in backend_keys member */
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,96 +0,0 @@
|
||||
From fb2a42483d318186079469576ce5991437d7a635 Mon Sep 17 00:00:00 2001
|
||||
From: Pavel Raiskup <praiskup@redhat.com>
|
||||
Date: Mon, 18 Apr 2016 14:55:16 +0200
|
||||
Subject: [PATCH] Revert "Fix the bug about MONEY type."
|
||||
|
||||
This reverts commit d5374bcc4d58556eb5cc70241c44dcad4d9b441e.
|
||||
|
||||
Proposed upstream:
|
||||
http://www.postgresql.org/message-id/3259874.lgiBp3an9Y@nb.usersys.redhat.com
|
||||
---
|
||||
convert.c | 45 ++++++++-------------------------------------
|
||||
pgtypes.c | 5 +++++
|
||||
2 files changed, 13 insertions(+), 37 deletions(-)
|
||||
|
||||
diff --git a/convert.c b/convert.c
|
||||
index 830910a..f9eba76 100644
|
||||
--- a/convert.c
|
||||
+++ b/convert.c
|
||||
@@ -5255,50 +5255,21 @@ cleanup:
|
||||
static BOOL
|
||||
convert_money(const char *s, char *sout, size_t soutmax)
|
||||
{
|
||||
- char in, decp = 0;
|
||||
size_t i = 0,
|
||||
out = 0;
|
||||
- int num_in = -1, period_in = -1, comma_in = -1;
|
||||
|
||||
for (i = 0; s[i]; i++)
|
||||
{
|
||||
- switch (in = s[i])
|
||||
+ if (s[i] == '$' || s[i] == ',' || s[i] == ')')
|
||||
+ ; /* skip these characters */
|
||||
+ else
|
||||
{
|
||||
- case '.':
|
||||
- if (period_in < 0)
|
||||
- period_in = i;
|
||||
- break;
|
||||
- case ',':
|
||||
- if (comma_in < 0)
|
||||
- comma_in = i;
|
||||
- break;
|
||||
- default:
|
||||
- if ('0' <= in && '9' >= in)
|
||||
- num_in = i;
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
- if (period_in > comma_in)
|
||||
- {
|
||||
- if ( period_in >= num_in - 2)
|
||||
- decp = '.';
|
||||
- }
|
||||
- else if (comma_in >= 0 &&
|
||||
- comma_in >= num_in - 2)
|
||||
- decp = ',';
|
||||
- for (i = 0; s[i] && out + 1 < soutmax; i++)
|
||||
- {
|
||||
- switch (in = s[i])
|
||||
- {
|
||||
- case '(':
|
||||
- case '-':
|
||||
+ if (out + 1 >= soutmax)
|
||||
+ return FALSE; /* sout is too short */
|
||||
+ if (s[i] == '(')
|
||||
sout[out++] = '-';
|
||||
- break;
|
||||
- default:
|
||||
- if (in >= '0' && in <= '9')
|
||||
- sout[out++] = in;
|
||||
- else if (in == decp)
|
||||
- sout[out++] = '.';
|
||||
+ else
|
||||
+ sout[out++] = s[i];
|
||||
}
|
||||
}
|
||||
sout[out] = '\0';
|
||||
diff --git a/pgtypes.c b/pgtypes.c
|
||||
index d15b097..649a2f8 100644
|
||||
--- a/pgtypes.c
|
||||
+++ b/pgtypes.c
|
||||
@@ -1282,6 +1282,11 @@ sqltype_to_bind_pgtype(const ConnectionClass *conn, SQLSMALLINT fSqlType)
|
||||
pgType = PG_TYPE_DATE;
|
||||
break;
|
||||
|
||||
+ case SQL_DOUBLE:
|
||||
+ case SQL_FLOAT:
|
||||
+ pgType = PG_TYPE_FLOAT8;
|
||||
+ break;
|
||||
+
|
||||
case SQL_DECIMAL:
|
||||
case SQL_NUMERIC:
|
||||
pgType = PG_TYPE_NUMERIC;
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 186b42c74ea05431745c171327d97ffec4d7d5bb Mon Sep 17 00:00:00 2001
|
||||
From: Hiroshi Inoue <h-inoue@dream.email.ne.jp>
|
||||
Date: Mon, 25 Jul 2016 07:13:19 +0900
|
||||
Subject: [PATCH 2/2] Fix regression test failures in result-conversions-test
|
||||
on big-endian platforms. expected/result-conversions_1.out lacks 3 lines.
|
||||
|
||||
---
|
||||
test/expected/result-conversions_1.out | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/test/expected/result-conversions_1.out b/test/expected/result-conversions_1.out
|
||||
index 31f55a4..2ce8e53 100644
|
||||
--- a/test/expected/result-conversions_1.out
|
||||
+++ b/test/expected/result-conversions_1.out
|
||||
@@ -1320,6 +1320,9 @@ Executed: SET bytea_output=hex
|
||||
'2011-02-15 15:49:18' (timestamp) as SQL_C_TIMESTAMP: y: 2011 m: 2 d: 15 h: 15 m: 49 s: 18 f: 0
|
||||
'2011-02-16 17:49:18+03' (timestamptz) as SQL_C_DATE: y: 2011 m: 2 d: 16
|
||||
'2011-02-16 17:49:18+03' (timestamptz) as SQL_C_TIMESTAMP: y: 2011 m: 2 d: 16 h: 6 m: 49 s: 18 f: 0
|
||||
+'' (text) as SQL_C_TYPE_DATE: y: 0 m: 0 d: 0
|
||||
+'' (text) as SQL_C_TYPE_TIME: h: 0 m: 0 s: 0
|
||||
+'' (text) as SQL_C_TYPE_TIMESTAMP: y: 0 m: 0 d: 0 h: 0 m: 0 s: 0 f: 0
|
||||
'foobar' (text) as SQL_C_CHAR: foob (truncated)
|
||||
'foobar' (text) as SQL_C_CHAR: fooba (truncated)
|
||||
'foobar' (text) as SQL_C_CHAR: foobar
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Name: postgresql-odbc
|
||||
Summary: PostgreSQL ODBC driver
|
||||
Version: 09.05.0300
|
||||
Release: 2%{?dist}
|
||||
Version: 09.05.0400
|
||||
Release: 1%{?dist}
|
||||
License: LGPLv2+
|
||||
Group: Applications/Databases
|
||||
URL: http://psqlodbc.projects.postgresql.org/
|
||||
@ -11,10 +11,6 @@ Source0: http://ftp.postgresql.org/pub/odbc/versions/src/psqlodbc-%{version}.tar
|
||||
Source1: postgres-testing.sh
|
||||
|
||||
|
||||
Patch0: postgresql-odbc-09.05.0210-revert-money-fix.patch
|
||||
Patch1: postgresql-odbc-09.05.0210-arm-testsuite-fix.patch
|
||||
Patch2: postgresql-odbc-09.05.0210-sec-arch-testsuite-fix.patch
|
||||
|
||||
BuildRequires: unixODBC-devel postgresql-devel
|
||||
BuildRequires: postgresql-server
|
||||
|
||||
@ -101,6 +97,10 @@ the PostgreSQL unixODBC driver.
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Aug 11 2016 Petr Kubat <pkubat@redhat.com> - 09.05.0400-1
|
||||
- rebase to latest upstream version, per release notes:
|
||||
https://odbc.postgresql.org/docs/release.html
|
||||
|
||||
* Tue Jul 26 2016 Pavel Raiskup <praiskup@redhat.com> - 09.05.0300-2
|
||||
- backport upstream fixes for testsuite failures (rhbz#1350486)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user