[neon/extras/kdb/Neon/release-lts] debian/patches: patch from master for postgres 12

[Jonathan Riddell]

Git commit a8b03489b079091bb2012a8757b04d40d29fd03e by Jonathan Riddell.
Committed on 26/10/2020 at 14:28.
Pushed by jriddell into branch 'Neon/release-lts'.

patch from master for postgres 12

A  +31   -0    debian/patches/postgres12.diff
A  +1    -0    debian/patches/series

https://invent.kde.org/neon/extras/kdb/commit/a8b03489b079091bb2012a8757b04d40d29fd03e

diff --git a/debian/patches/postgres12.diff b/debian/patches/postgres12.diff
new file mode 100644
index 0000000..d0ee32b
--- /dev/null
+++ b/debian/patches/postgres12.diff
@@ -0,0 +1,31 @@
+commit 40cdaea4d7824cc1b0d26e6ad2dcb61fa2077911
+Author: Pino Toscano <pino at kde.org>
+Date:   Tue Oct 29 07:52:32 2019 +0100
+
+    PgSQL driver: fix build with PostgreSQL 12+
+    
+    ABSTIMEOID and RELTIMEOID were removed, as their data types were dropped.
+
+diff --git a/src/drivers/postgresql/PostgresqlTypes.cpp b/src/drivers/postgresql/PostgresqlTypes.cpp
+index ea576d69..0697129e 100644
+--- a/src/drivers/postgresql/PostgresqlTypes.cpp
++++ b/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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0570496
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+postgres12.diff