diff options
| author | Robert Szefner <r.szefner@hydro-partner.pl> | 2017-10-20 22:51:07 +0200 |
|---|---|---|
| committer | Robert Szefner <robertsz27@interia.pl> | 2017-11-04 20:57:42 +0000 |
| commit | 435c4b2ccbbb7284918dd2d4a14f8e44c3977d98 (patch) | |
| tree | 07437bd3b78f898c899426e5014b26b6d8612b8e /src/plugins/sqldrivers/psql/qsql_psql_p.h | |
| parent | ad36da8ff416501e249beb098e5b84eaa2fba43d (diff) | |
QPSQL: Fix detection of PostreSQL version 9.x and later
Fixed parsing version string for PostgreSQL.
PostgreSQL versioning changed since version 10, see link:
https://www.postgresql.org/support/versioning
Extended QPSQLDriver::Protocol enum for PostreSQL 9.x and later,
added underscore to item names to separate major and minor version.
Changed long switch-case statements to if-else.
Change-Id: Ib19ae7ba426f262e80c52670e7ecb3532ff460a0
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'src/plugins/sqldrivers/psql/qsql_psql_p.h')
| -rw-r--r-- | src/plugins/sqldrivers/psql/qsql_psql_p.h | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/plugins/sqldrivers/psql/qsql_psql_p.h b/src/plugins/sqldrivers/psql/qsql_psql_p.h index 8468b9af93..f5cb2e9bd0 100644 --- a/src/plugins/sqldrivers/psql/qsql_psql_p.h +++ b/src/plugins/sqldrivers/psql/qsql_psql_p.h @@ -76,15 +76,23 @@ public: VersionUnknown = -1, Version6 = 6, Version7 = 7, - Version71 = 8, - Version73 = 9, - Version74 = 10, + Version7_1 = 8, + Version7_3 = 9, + Version7_4 = 10, Version8 = 11, - Version81 = 12, - Version82 = 13, - Version83 = 14, - Version84 = 15, - Version9 = 16 + Version8_1 = 12, + Version8_2 = 13, + Version8_3 = 14, + Version8_4 = 15, + Version9 = 16, + Version9_1 = 17, + Version9_2 = 18, + Version9_3 = 19, + Version9_4 = 20, + Version9_5 = 21, + Version9_6 = 22, + Version10 = 23, + UnknownLaterVersion = 100000 }; explicit QPSQLDriver(QObject *parent=0); |