rebase to latest upstream source
Version: 09.06.0200-1
This commit is contained in:
parent
e761b19d81
commit
422cc27dbf
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
/psqlodbc-09.06.0100.tar.gz
|
||||
/psqlodbc-09.06.0200.tar.gz
|
||||
|
@ -1,6 +1,6 @@
|
||||
From fb2a42483d318186079469576ce5991437d7a635 Mon Sep 17 00:00:00 2001
|
||||
From 56ca20671a9fb87d7c6ca011207e9628349c9301 Mon Sep 17 00:00:00 2001
|
||||
From: Pavel Raiskup <praiskup@redhat.com>
|
||||
Date: Mon, 18 Apr 2016 14:55:16 +0200
|
||||
Date: Mon, 13 Mar 2017 10:38:54 +0100
|
||||
Subject: [PATCH] Revert "Fix the bug about MONEY type."
|
||||
|
||||
This reverts commit d5374bcc4d58556eb5cc70241c44dcad4d9b441e.
|
||||
@ -9,14 +9,14 @@ 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(-)
|
||||
pgtypes.c | 4 ++++
|
||||
2 files changed, 12 insertions(+), 37 deletions(-)
|
||||
|
||||
diff --git a/convert.c b/convert.c
|
||||
index 830910a..f9eba76 100644
|
||||
index f118e30..00904d8 100644
|
||||
--- a/convert.c
|
||||
+++ b/convert.c
|
||||
@@ -5255,50 +5255,21 @@ cleanup:
|
||||
@@ -5363,50 +5363,21 @@ cleanup:
|
||||
static BOOL
|
||||
convert_money(const char *s, char *sout, size_t soutmax)
|
||||
{
|
||||
@ -76,21 +76,20 @@ index 830910a..f9eba76 100644
|
||||
}
|
||||
sout[out] = '\0';
|
||||
diff --git a/pgtypes.c b/pgtypes.c
|
||||
index d15b097..649a2f8 100644
|
||||
index a58925c..d42179c 100644
|
||||
--- a/pgtypes.c
|
||||
+++ b/pgtypes.c
|
||||
@@ -1282,6 +1282,11 @@ sqltype_to_bind_pgtype(const ConnectionClass *conn, SQLSMALLINT fSqlType)
|
||||
pgType = PG_TYPE_DATE;
|
||||
@@ -1273,6 +1273,10 @@ sqltype_to_pgcast(const ConnectionClass *conn, SQLSMALLINT fSqlType)
|
||||
case SQL_DATE:
|
||||
pgCast = "::date";
|
||||
break;
|
||||
|
||||
+ case SQL_DOUBLE:
|
||||
+ case SQL_FLOAT:
|
||||
+ pgType = PG_TYPE_FLOAT8;
|
||||
+ pgCast = "::float8";
|
||||
+ break;
|
||||
+
|
||||
case SQL_DECIMAL:
|
||||
case SQL_NUMERIC:
|
||||
pgType = PG_TYPE_NUMERIC;
|
||||
pgCast = "::numeric";
|
||||
--
|
||||
2.5.5
|
||||
2.9.3
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
Name: postgresql-odbc
|
||||
Summary: PostgreSQL ODBC driver
|
||||
Version: 09.06.0100
|
||||
Version: 09.06.0200
|
||||
Release: 1%{?dist}
|
||||
License: LGPLv2+
|
||||
Group: Applications/Databases
|
||||
@ -10,7 +10,7 @@ URL: http://%{upstream_name}.projects.postgresql.org/
|
||||
|
||||
Source0: http://ftp.postgresql.org/pub/odbc/versions/src/%{upstream_name}-%{version}.tar.gz
|
||||
|
||||
Patch0: postgresql-odbc-09.05.0210-revert-money-fix.patch
|
||||
Patch0: postgresql-odbc-09.06.0200-revert-money-fix.patch
|
||||
Patch1: postgresql-odbc-09.05.0400-revert-money-testsuite-fix.patch
|
||||
|
||||
BuildRequires: unixODBC-devel postgresql-devel
|
||||
@ -100,6 +100,10 @@ the PostgreSQL unixODBC driver.
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Mar 13 2017 Pavel Raiskup <praiskup@redhat.com> - 09.06.0200-1
|
||||
- rebase to latest upstream version, per release notes:
|
||||
https://odbc.postgresql.org/docs/release.html
|
||||
|
||||
* Mon Feb 06 2017 Pavel Raiskup <praiskup@redhat.com> - 09.06.0100-1
|
||||
- rebase to latest upstream version, per release notes:
|
||||
https://odbc.postgresql.org/docs/release.html
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (psqlodbc-09.06.0100.tar.gz) = 596de5fb8b9c4ddbd195197115f799dcd2df862a4428c8459d1c4aa6892d2d5040a2fe25a853e7398549ca1e1503399bda73cd4b6a6628e7cb6c2bfb88de4906
|
||||
SHA512 (psqlodbc-09.06.0200.tar.gz) = d8e3b6c13e657b4a3435ace94e6e1265a5a1a7bcd3a1f81348ca4edcb532b66036e3595ecd7224d3104f6a3f2e02704f73c1b62d94e9879528933edef7764552
|
||||
|
Loading…
Reference in New Issue
Block a user