summaryrefslogtreecommitdiff
path: root/databases/kdb/files/patch-cgit40cdaea
diff options
context:
space:
mode:
authorDima Panov <fluffy@FreeBSD.org>2019-11-18 02:05:19 +0000
committerDima Panov <fluffy@FreeBSD.org>2019-11-18 02:05:19 +0000
commit523fb157ce9b32ce43b6cb60e91d60e6fa295cca (patch)
tree15896cefb89dd4265e682b5864565c5262197ec0 /databases/kdb/files/patch-cgit40cdaea
parentnet/bwping: Update to 1.16 (diff)
- Support PostgreSQL 12
- Fix QCOMPARE for QString,const char* and QByteArrya,const char * Obtained from: KDE git MFH: 2019Q4
Notes
Notes: svn path=/head/; revision=517854
Diffstat (limited to 'databases/kdb/files/patch-cgit40cdaea')
-rw-r--r--databases/kdb/files/patch-cgit40cdaea36
1 files changed, 36 insertions, 0 deletions
diff --git a/databases/kdb/files/patch-cgit40cdaea b/databases/kdb/files/patch-cgit40cdaea
new file mode 100644
index 000000000000..e83d9cfee71d
--- /dev/null
+++ b/databases/kdb/files/patch-cgit40cdaea
@@ -0,0 +1,36 @@
+From 40cdaea4d7824cc1b0d26e6ad2dcb61fa2077911 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Tue, 29 Oct 2019 07:52:32 +0100
+Subject: PgSQL driver: fix build with PostgreSQL 12+
+
+ABSTIMEOID and RELTIMEOID were removed, as their data types were dropped.
+---
+ src/drivers/postgresql/PostgresqlTypes.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/drivers/postgresql/PostgresqlTypes.cpp b/src/drivers/postgresql/PostgresqlTypes.cpp
+index ea576d6..0697129 100644
+--- ./src/drivers/postgresql/PostgresqlTypes.cpp
++++ ./src/drivers/postgresql/PostgresqlTypes.cpp
+@@ -36,6 +36,7 @@
+ #endif
+ #include <libpq-fe.h>
+ #include <catalog/pg_type.h> // needed for BOOLOID, etc.
++#include <pg_config.h> // needed for PG_VERSION_NUM
+
+ #ifdef _MSC_VER
+ #pragma warning( pop )
+@@ -70,8 +71,10 @@ void PostgresqlDriver::initPgsqlToKDbMap()
+ //! @todo POLYGONOID geometric polygon '(pt1,...)'
+ m_pgsqlToKDbTypes.insert(FLOAT4OID, KDbField::Double);
+ m_pgsqlToKDbTypes.insert(FLOAT8OID, KDbField::Double);
++#if PG_VERSION_NUM < 120000
+ m_pgsqlToKDbTypes.insert(ABSTIMEOID, KDbField::Date);
+ m_pgsqlToKDbTypes.insert(RELTIMEOID, KDbField::Date);
++#endif
+ //! @todo TINTERVALOID (abstime,abstime), time interval
+ //! @todo CIRCLEOID geometric circle '(center,radius)'
+ //! @todo CASHOID monetary amounts, $d,ddd.cc
+--
+cgit v1.1
+