diff options
Diffstat (limited to 'src/sql/kernel/qsqlrecord.cpp')
| -rw-r--r-- | src/sql/kernel/qsqlrecord.cpp | 220 |
1 files changed, 145 insertions, 75 deletions
diff --git a/src/sql/kernel/qsqlrecord.cpp b/src/sql/kernel/qsqlrecord.cpp index 74f42b2e48..53b64c1464 100644 --- a/src/sql/kernel/qsqlrecord.cpp +++ b/src/sql/kernel/qsqlrecord.cpp @@ -8,42 +8,20 @@ #include "qlist.h" #include "qsqlfield.h" #include "qstring.h" -#include "qstringlist.h" QT_BEGIN_NAMESPACE -class QSqlRecordPrivate +class QSqlRecordPrivate : public QSharedData { public: - QSqlRecordPrivate(); - QSqlRecordPrivate(const QSqlRecordPrivate &other); - - inline bool contains(int index) { return index >= 0 && index < fields.size(); } - QString createField(int index, const QString &prefix) const; + inline bool contains(qsizetype index) const + { + return index >= 0 && index < fields.size(); + } QList<QSqlField> fields; - QAtomicInt ref; }; - -QSqlRecordPrivate::QSqlRecordPrivate() : ref(1) -{ -} - -QSqlRecordPrivate::QSqlRecordPrivate(const QSqlRecordPrivate &other): fields(other.fields), ref(1) -{ -} - -/*! \internal - Just for compat -*/ -QString QSqlRecordPrivate::createField(int index, const QString &prefix) const -{ - QString f; - if (!prefix.isEmpty()) - f = prefix + u'.'; - f += fields.at(index).name(); - return f; -} +QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QSqlRecordPrivate) /*! \class QSqlRecord @@ -86,8 +64,8 @@ QString QSqlRecordPrivate::createField(int index, const QString &prefix) const */ QSqlRecord::QSqlRecord() + : d(new QSqlRecordPrivate) { - d = new QSqlRecordPrivate(); } /*! @@ -97,11 +75,39 @@ QSqlRecord::QSqlRecord() of a record in \l{constant time}. */ -QSqlRecord::QSqlRecord(const QSqlRecord& other) -{ - d = other.d; - d->ref.ref(); -} +QSqlRecord::QSqlRecord(const QSqlRecord &other) + = default; + +/*! + \fn QSqlRecord::QSqlRecord(QSqlRecord &&other) + \since 6.6 + + Move-constructs a new QSqlRecord from \a other. + + \note The moved-from object \a other is placed in a partially-formed state, + in which the only valid operations are destruction and assignment of a new + value. +*/ + +/*! + \fn QSqlRecord &QSqlRecord::operator=(QSqlRecord &&other) + \since 6.6 + + Move-assigns \a other to this QSqlRecord instance. + + \note The moved-from object \a other is placed in a partially-formed state, + in which the only valid operations are destruction and assignment of a new + value. +*/ + +/*! + \fn void QSqlRecord::swap(QSqlRecord &other) + \since 6.6 + + Swaps SQL record \a other with this SQL record. This operation is very fast + and never fails. +*/ + /*! Sets the record equal to \a other. @@ -110,21 +116,16 @@ QSqlRecord::QSqlRecord(const QSqlRecord& other) of a record in \l{constant time}. */ -QSqlRecord& QSqlRecord::operator=(const QSqlRecord& other) -{ - qAtomicAssign(d, other.d); - return *this; -} +QSqlRecord& QSqlRecord::operator=(const QSqlRecord &other) + = default; /*! Destroys the object and frees any allocated resources. */ QSqlRecord::~QSqlRecord() -{ - if (!d->ref.deref()) - delete d; -} + = default; + /*! \fn bool QSqlRecord::operator!=(const QSqlRecord &other) const @@ -161,14 +162,21 @@ QVariant QSqlRecord::value(int index) const /*! \overload +*/ +QVariant QSqlRecord::value(const QString &name) const +{ + return value(QStringView(name)); +} + +/*! + \overload Returns the value of the field called \a name in the record. If field \a name does not exist an invalid variant is returned. - \sa indexOf() + \sa indexOf(), isNull() */ - -QVariant QSqlRecord::value(const QString& name) const +QVariant QSqlRecord::value(QStringView name) const { return value(indexOf(name)); } @@ -186,15 +194,22 @@ QString QSqlRecord::fieldName(int index) const } /*! + \overload +*/ +int QSqlRecord::indexOf(const QString &name) const +{ + return indexOf(QStringView(name)); +} + +/*! Returns the position of the field called \a name within the record, or -1 if it cannot be found. Field names are not case-sensitive. If more than one field matches, the first one is returned. \sa fieldName() -*/ - -int QSqlRecord::indexOf(const QString& name) const + */ +int QSqlRecord::indexOf(QStringView name) const { QStringView tableName; QStringView fieldName(name); @@ -228,11 +243,23 @@ QSqlField QSqlRecord::field(int index) const return d->fields.value(index); } -/*! \overload - Returns the field called \a name. +/*! + \overload */ QSqlField QSqlRecord::field(const QString &name) const { + return field(QStringView(name)); +} + +/*! + \overload + + Returns the field called \a name. If the field called + \a name is not found, function returns + a \l{default-constructed value}. + */ +QSqlField QSqlRecord::field(QStringView name) const +{ return field(indexOf(name)); } @@ -243,7 +270,7 @@ QSqlField QSqlRecord::field(const QString &name) const \sa insert(), replace(), remove() */ -void QSqlRecord::append(const QSqlField& field) +void QSqlRecord::append(const QSqlField &field) { detach(); d->fields.append(field); @@ -254,7 +281,7 @@ void QSqlRecord::append(const QSqlField& field) \sa append(), replace(), remove() */ -void QSqlRecord::insert(int pos, const QSqlField& field) +void QSqlRecord::insert(int pos, const QSqlField &field) { detach(); d->fields.insert(pos, field); @@ -267,7 +294,7 @@ void QSqlRecord::insert(int pos, const QSqlField& field) \sa append(), insert(), remove() */ -void QSqlRecord::replace(int pos, const QSqlField& field) +void QSqlRecord::replace(int pos, const QSqlField &field) { if (!d->contains(pos)) return; @@ -318,11 +345,18 @@ bool QSqlRecord::isEmpty() const /*! + \overload +*/ +bool QSqlRecord::contains(const QString &name) const +{ + return contains(QStringView(name)); +} + +/*! Returns \c true if there is a field in the record called \a name; otherwise returns \c false. */ - -bool QSqlRecord::contains(const QString& name) const +bool QSqlRecord::contains(QStringView name) const { return indexOf(name) >= 0; } @@ -337,12 +371,18 @@ bool QSqlRecord::contains(const QString& name) const void QSqlRecord::clearValues() { detach(); - int count = d->fields.size(); - for (int i = 0; i < count; ++i) - d->fields[i].clear(); + for (QSqlField &f : d->fields) + f.clear(); } /*! + \overload +*/ +void QSqlRecord::setGenerated(const QString &name, bool generated) +{ + setGenerated(QStringView(name), generated); +} +/*! Sets the generated flag for the field called \a name to \a generated. If the field does not exist, nothing happens. Only fields that have \a generated set to true are included in the SQL @@ -350,15 +390,12 @@ void QSqlRecord::clearValues() \sa isGenerated() */ - -void QSqlRecord::setGenerated(const QString& name, bool generated) +void QSqlRecord::setGenerated(QStringView name, bool generated) { setGenerated(indexOf(name), generated); } /*! - \overload - Sets the generated flag for the field \a index to \a generated. \sa isGenerated() @@ -373,10 +410,10 @@ void QSqlRecord::setGenerated(int index, bool generated) } /*! - \overload - Returns \c true if the field \a index is null or if there is no field at position \a index; otherwise returns \c false. + + \sa setNull() */ bool QSqlRecord::isNull(int index) const { @@ -384,12 +421,22 @@ bool QSqlRecord::isNull(int index) const } /*! + \overload +*/ +bool QSqlRecord::isNull(const QString &name) const +{ + return isNull(QStringView(name)); +} + +/*! + \overload + Returns \c true if the field called \a name is null or if there is no field called \a name; otherwise returns \c false. \sa setNull() */ -bool QSqlRecord::isNull(const QString& name) const +bool QSqlRecord::isNull(QStringView name) const { return isNull(indexOf(name)); } @@ -410,29 +457,45 @@ void QSqlRecord::setNull(int index) /*! \overload +*/ +void QSqlRecord::setNull(const QString &name) +{ + setNull(QStringView(name)); +} + +/*! + \overload Sets the value of the field called \a name to null. If the field does not exist, nothing happens. */ -void QSqlRecord::setNull(const QString& name) +void QSqlRecord::setNull(QStringView name) { setNull(indexOf(name)); } +/*! + \overload +*/ +bool QSqlRecord::isGenerated(const QString &name) const +{ + return isGenerated(QStringView(name)); +} /*! + \overload + Returns \c true if the record has a field called \a name and this field is to be generated (the default); otherwise returns \c false. \sa setGenerated() */ -bool QSqlRecord::isGenerated(const QString& name) const +bool QSqlRecord::isGenerated(QStringView name) const { return isGenerated(indexOf(name)); } -/*! \overload - +/*! Returns \c true if the record has a field at position \a index and this field is to be generated (the default); otherwise returns \c false. @@ -461,7 +524,7 @@ int QSqlRecord::count() const \sa setNull() */ -void QSqlRecord::setValue(int index, const QVariant& val) +void QSqlRecord::setValue(int index, const QVariant &val) { if (!d->contains(index)) return; @@ -469,15 +532,22 @@ void QSqlRecord::setValue(int index, const QVariant& val) d->fields[index].setValue(val); } - +/*! + \overload +*/ +void QSqlRecord::setValue(const QString &name, const QVariant &val) +{ + setValue(QStringView(name), val); +} /*! \overload Sets the value of the field called \a name to \a val. If the field does not exist, nothing happens. -*/ -void QSqlRecord::setValue(const QString& name, const QVariant& val) + \sa setNull() +*/ +void QSqlRecord::setValue(QStringView name, const QVariant &val) { setValue(indexOf(name), val); } @@ -487,7 +557,7 @@ void QSqlRecord::setValue(const QString& name, const QVariant& val) */ void QSqlRecord::detach() { - qAtomicDetach(d); + d.detach(); } #ifndef QT_NO_DEBUG_STREAM |