diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 13:22:37 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-10-28 10:32:06 +0100 |
commit | af3bd5037aeb9b842193f0e21cd5c03572b6dac6 (patch) | |
tree | 7ce55202a0d40b75b18da24722d373376142d206 /src/sql | |
parent | 5adbb9cc576546c42249099e549f1947cca54610 (diff) | |
parent | 2eb26c170920d28213b71e549d5dac4663febb14 (diff) |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/sql')
-rw-r--r-- | src/sql/kernel/qsqldatabase.cpp | 15 | ||||
-rw-r--r-- | src/sql/kernel/qsqlerror.cpp | 8 | ||||
-rw-r--r-- | src/sql/kernel/qsqlfield.cpp | 23 | ||||
-rw-r--r-- | src/sql/kernel/qsqlrecord.cpp | 13 |
4 files changed, 37 insertions, 22 deletions
diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index 31f0e2dc9e..dbc95dc5a8 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -1503,15 +1503,18 @@ QSql::NumericalPrecisionPolicy QSqlDatabase::numericalPrecisionPolicy() const #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QSqlDatabase &d) { + QDebugStateSaver saver(dbg); + dbg.nospace(); + dbg.noquote(); if (!d.isValid()) { - dbg.nospace() << "QSqlDatabase(invalid)"; - return dbg.space(); + dbg << "QSqlDatabase(invalid)"; + return dbg; } - dbg.nospace() << "QSqlDatabase(driver=\"" << d.driverName() << "\", database=\"" - << d.databaseName() << "\", host=\"" << d.hostName() << "\", port=" << d.port() - << ", user=\"" << d.userName() << "\", open=" << d.isOpen() << ")"; - return dbg.space(); + dbg << "QSqlDatabase(driver=\"" << d.driverName() << "\", database=\"" + << d.databaseName() << "\", host=\"" << d.hostName() << "\", port=" << d.port() + << ", user=\"" << d.userName() << "\", open=" << d.isOpen() << ')'; + return dbg; } #endif diff --git a/src/sql/kernel/qsqlerror.cpp b/src/sql/kernel/qsqlerror.cpp index b80b471dfc..470bf57d44 100644 --- a/src/sql/kernel/qsqlerror.cpp +++ b/src/sql/kernel/qsqlerror.cpp @@ -39,9 +39,11 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QSqlError &s) { - dbg.nospace() << "QSqlError(" << s.nativeErrorCode() << ", " << s.driverText() << - ", " << s.databaseText() << ')'; - return dbg.space(); + QDebugStateSaver saver(dbg); + dbg.nospace(); + dbg << "QSqlError(" << s.nativeErrorCode() << ", " << s.driverText() + << ", " << s.databaseText() << ')'; + return dbg; } #endif diff --git a/src/sql/kernel/qsqlfield.cpp b/src/sql/kernel/qsqlfield.cpp index 2022871432..a76e38b6f1 100644 --- a/src/sql/kernel/qsqlfield.cpp +++ b/src/sql/kernel/qsqlfield.cpp @@ -509,21 +509,24 @@ bool QSqlField::isValid() const #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QSqlField &f) { - dbg.nospace() << "QSqlField(" << f.name() << ", " << QMetaType::typeName(f.type()); + QDebugStateSaver saver(dbg); + dbg.nospace(); + dbg << "QSqlField(" << f.name() << ", " << QMetaType::typeName(f.type()); if (f.length() >= 0) - dbg.nospace() << ", length: " << f.length(); + dbg << ", length: " << f.length(); if (f.precision() >= 0) - dbg.nospace() << ", precision: " << f.precision(); + dbg << ", precision: " << f.precision(); if (f.requiredStatus() != QSqlField::Unknown) - dbg.nospace() << ", required: " - << (f.requiredStatus() == QSqlField::Required ? "yes" : "no"); - dbg.nospace() << ", generated: " << (f.isGenerated() ? "yes" : "no"); + dbg << ", required: " + << (f.requiredStatus() == QSqlField::Required ? "yes" : "no"); + dbg << ", generated: " << (f.isGenerated() ? "yes" : "no"); if (f.typeID() >= 0) - dbg.nospace() << ", typeID: " << f.typeID(); + dbg << ", typeID: " << f.typeID(); if (!f.defaultValue().isNull()) - dbg.nospace() << ", auto-value: \"" << f.defaultValue() << '\"'; - dbg.nospace() << ')'; - return dbg.space(); + dbg << ", defaultValue: \"" << f.defaultValue() << '\"'; + dbg << ", autoValue: " << f.isAutoValue() + << ", readOnly: " << f.isReadOnly() << ')'; + return dbg; } #endif diff --git a/src/sql/kernel/qsqlrecord.cpp b/src/sql/kernel/qsqlrecord.cpp index 7fd64d1307..668392bb5b 100644 --- a/src/sql/kernel/qsqlrecord.cpp +++ b/src/sql/kernel/qsqlrecord.cpp @@ -509,9 +509,16 @@ void QSqlRecord::detach() #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QSqlRecord &r) { - dbg << "QSqlRecord(" << r.count() << ')'; - for (int i = 0; i < r.count(); ++i) - dbg << '\n' << QString::fromLatin1("%1:").arg(i, 2) << r.field(i) << r.value(i).toString(); + QDebugStateSaver saver(dbg); + dbg.nospace(); + const int count = r.count(); + dbg << "QSqlRecord(" << count << ')'; + for (int i = 0; i < count; ++i) { + dbg.nospace(); + dbg << '\n' << qSetFieldWidth(2) << right << i << left << qSetFieldWidth(0) << ':'; + dbg.space(); + dbg << r.field(i) << r.value(i).toString(); + } return dbg; } #endif |