diff options
Diffstat (limited to 'kexi/migration/pqxx/pqxxmigrate.cpp')
| -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; } |