diff options
| author | François Andriot <francois.andriot@free.fr> | 2020-06-10 00:09:59 +0200 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-06-11 23:21:15 +0900 |
| commit | 401e94a34c8adc7a0f6b771ad70187ba00fb72c5 (patch) | |
| tree | efe47c9122cd4dc0ead167964f20ad77ef5f7dfe | |
| parent | 9b24b3b16d2a9b70675d0981fb41bf9a37bb39c8 (diff) | |
| download | koffice-401e94a34c8adc7a0f6b771ad70187ba00fb72c5.tar.gz koffice-401e94a34c8adc7a0f6b771ad70187ba00fb72c5.zip | |
Fix kexi build with libpqxx 7
Signed-off-by: François Andriot <francois.andriot@free.fr>
(cherry picked from commit 73d1fecdcfcb4cb62d506ffbbf9f079800f0be86)
| -rw-r--r-- | kexi/migration/pqxx/pqxxmigrate.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kexi/migration/pqxx/pqxxmigrate.cpp b/kexi/migration/pqxx/pqxxmigrate.cpp index 119f2f65..5b62ffcc 100644 --- a/kexi/migration/pqxx/pqxxmigrate.cpp +++ b/kexi/migration/pqxx/pqxxmigrate.cpp @@ -92,7 +92,11 @@ bool PqxxMigrate::drv_readTableSchema( for (uint i = 0; i < (uint)m_res->columns(); i++) { TQString fldName(m_res->column_name(i)); +#if PQXX_VERSION_MAJOR < 7 KexiDB::Field::Type fldType = type(m_res->column_type(i), fldName); +#else + KexiDB::Field::Type fldType = type(m_res->column_type(m_res->column_name(i)), fldName); +#endif TQString fldID( KexiUtils::string2Identifier(fldName) ); const pqxx::oid toid = tableOid(originalName); if (toid==0) @@ -249,7 +253,9 @@ bool PqxxMigrate::drv_disconnect() { if (m_conn) { +#if PQXX_VERSION_MAJOR < 7 m_conn->disconnect(); +#endif delete m_conn; m_conn = 0; } |