summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTobias Koenig <tobias.koenig.qnx@kdab.com>2013-11-30 20:22:28 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-01 14:47:10 +0100
commit6a6f1e3c7efc3614a4160852ccdc7534252dcdd4 (patch)
tree1c5b73a7859bc894e5aa5c3823c6f83afb815a97 /src
parent1c47627aa022ebaffdefe1da18cb7ff8146550cc (diff)
Support custom port number in IBASE SQL driver
Let the IBASE SQL driver use the custom port number that is set via QSqlDatabase::setPort(). Task-number: QTBUG-33345 Change-Id: Ib55b32c8a318d82038d66e8645b416e36dad3edf [ChangeLog][QtSql][QIBASE] Support custom port number Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'src')
-rw-r--r--src/sql/drivers/ibase/qsql_ibase.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/sql/drivers/ibase/qsql_ibase.cpp b/src/sql/drivers/ibase/qsql_ibase.cpp
index 05e9a4aac8..fefdf38bbd 100644
--- a/src/sql/drivers/ibase/qsql_ibase.cpp
+++ b/src/sql/drivers/ibase/qsql_ibase.cpp
@@ -1445,7 +1445,7 @@ bool QIBaseDriver::open(const QString & db,
const QString & user,
const QString & password,
const QString & host,
- int /*port*/,
+ int port,
const QString & connOpts)
{
Q_D(QIBaseDriver);
@@ -1513,9 +1513,13 @@ bool QIBaseDriver::open(const QString & db,
i += role.length();
}
+ QString portString;
+ if (port != -1)
+ portString = QStringLiteral("/%1").arg(port);
+
QString ldb;
if (!host.isEmpty())
- ldb += host + QLatin1Char(':');
+ ldb += host + portString + QLatin1Char(':');
ldb += db;
isc_attach_database(d->status, 0, const_cast<char *>(ldb.toLocal8Bit().constData()),
&d->ibase, i, ba.data());