diff options
Diffstat (limited to 'src/sql/kernel/qsqlrecord.cpp')
| -rw-r--r-- | src/sql/kernel/qsqlrecord.cpp | 169 |
1 files changed, 96 insertions, 73 deletions
diff --git a/src/sql/kernel/qsqlrecord.cpp b/src/sql/kernel/qsqlrecord.cpp index c9f26e27a1..3c3b2b3390 100644 --- a/src/sql/kernel/qsqlrecord.cpp +++ b/src/sql/kernel/qsqlrecord.cpp @@ -11,23 +11,44 @@ QT_BEGIN_NAMESPACE -class QSqlRecordPrivate +class QSqlRecordPrivate : public QSharedData { public: - QSqlRecordPrivate() = default; - QSqlRecordPrivate(const QSqlRecordPrivate &other) - : fields(other.fields) + inline bool contains(qsizetype index) const { + return index >= 0 && index < fields.size(); } - inline bool contains(qsizetype index) const + template <typename T> + qsizetype indexOfImpl(T name) { - return index >= 0 && index < fields.size(); + T tableName; + T fieldName; + const auto it = std::find(name.begin(), name.end(), u'.'); + const auto idx = (it == name.end()) ? -1 : it - name.begin(); + if (idx != -1) { + tableName = name.left(idx); + fieldName = name.mid(idx + 1); + } + const auto cnt = fields.size(); + for (qsizetype i = 0; i < cnt; ++i) { + // Check the passed in name first in case it is an alias using a dot. + // Then check if both the table and field match when there is a table name specified. + const auto ¤tField = fields.at(i); + const auto ¤tFieldName = currentField.name(); + if (name.compare(currentFieldName, Qt::CaseInsensitive) == 0) + return i; + if (idx != -1 && + tableName.compare(currentField.tableName(), Qt::CaseInsensitive) == 0 && + fieldName.compare(currentFieldName, Qt::CaseInsensitive) == 0) + return i; + } + return -1; } QList<QSqlField> fields; - QAtomicInt ref{1}; }; +QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QSqlRecordPrivate) /*! \class QSqlRecord @@ -81,11 +102,8 @@ 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) @@ -125,21 +143,16 @@ QSqlRecord::QSqlRecord(const QSqlRecord& other) of a record in \l{constant time}. */ -QSqlRecord& QSqlRecord::operator=(const QSqlRecord& other) -{ - QSqlRecord(other).swap(*this); - return *this; -} +QSqlRecord& QSqlRecord::operator=(const QSqlRecord &other) + = default; /*! Destroys the object and frees any allocated resources. */ QSqlRecord::~QSqlRecord() -{ - if (d && !d->ref.deref()) - delete d; -} + = default; + /*! \fn bool QSqlRecord::operator!=(const QSqlRecord &other) const @@ -180,10 +193,12 @@ QVariant QSqlRecord::value(int index) const 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() -*/ + \note In Qt versions prior to 6.8, this function took QString, not + QAnyStringView. -QVariant QSqlRecord::value(const QString& name) const + \sa indexOf(), isNull() +*/ +QVariant QSqlRecord::value(QAnyStringView name) const { return value(indexOf(name)); } @@ -206,31 +221,17 @@ QString QSqlRecord::fieldName(int index) const case-sensitive. If more than one field matches, the first one is returned. - \sa fieldName() -*/ + \note In Qt versions prior to 6.8, this function took QString, not + QAnyStringView. -int QSqlRecord::indexOf(const QString& name) const + \sa fieldName() + */ +int QSqlRecord::indexOf(QAnyStringView name) const { - QStringView tableName; - QStringView fieldName(name); - const qsizetype idx = name.indexOf(u'.'); - if (idx != -1) { - tableName = fieldName.left(idx); - fieldName = fieldName.mid(idx + 1); - } - const int cnt = count(); - for (int i = 0; i < cnt; ++i) { - // Check the passed in name first in case it is an alias using a dot. - // Then check if both the table and field match when there is a table name specified. - const auto ¤tField = d->fields.at(i); - const auto ¤tFieldName = currentField.name(); - if (currentFieldName.compare(name, Qt::CaseInsensitive) == 0 - || (idx != -1 && currentFieldName.compare(fieldName, Qt::CaseInsensitive) == 0 - && currentField.tableName().compare(tableName, Qt::CaseInsensitive) == 0)) { - return i; - } - } - return -1; + return name.visit([&](auto v) + { + return d->indexOfImpl(v); + }); } /*! @@ -243,10 +244,17 @@ QSqlField QSqlRecord::field(int index) const return d->fields.value(index); } -/*! \overload - Returns the field called \a name. +/*! + \overload + + Returns the field called \a name. If the field called + \a name is not found, function returns + a \l{default-constructed value}. + + \note In Qt versions prior to 6.8, this function took QString, not + QAnyStringView. */ -QSqlField QSqlRecord::field(const QString &name) const +QSqlField QSqlRecord::field(QAnyStringView name) const { return field(indexOf(name)); } @@ -258,7 +266,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); @@ -269,7 +277,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); @@ -282,7 +290,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; @@ -331,13 +339,14 @@ bool QSqlRecord::isEmpty() const return d->fields.isEmpty(); } - /*! 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 + \note In Qt versions prior to 6.8, this function took QString, not + QAnyStringView. +*/ +bool QSqlRecord::contains(QAnyStringView name) const { return indexOf(name) >= 0; } @@ -362,17 +371,17 @@ void QSqlRecord::clearValues() fields that have \a generated set to true are included in the SQL that is generated by QSqlQueryModel for example. + \note In Qt versions prior to 6.8, this function took QString, not + QAnyStringView. + \sa isGenerated() */ - -void QSqlRecord::setGenerated(const QString& name, bool generated) +void QSqlRecord::setGenerated(QAnyStringView name, bool generated) { setGenerated(indexOf(name), generated); } /*! - \overload - Sets the generated flag for the field \a index to \a generated. \sa isGenerated() @@ -387,10 +396,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 { @@ -398,12 +407,17 @@ bool QSqlRecord::isNull(int index) const } /*! + \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. + \note In Qt versions prior to 6.8, this function took QString, not + QAnyStringView. + \sa setNull() */ -bool QSqlRecord::isNull(const QString& name) const +bool QSqlRecord::isNull(QAnyStringView name) const { return isNull(indexOf(name)); } @@ -427,26 +441,32 @@ void QSqlRecord::setNull(int index) Sets the value of the field called \a name to null. If the field does not exist, nothing happens. + + \note In Qt versions prior to 6.8, this function took QString, not + QAnyStringView. */ -void QSqlRecord::setNull(const QString& name) +void QSqlRecord::setNull(QAnyStringView name) { setNull(indexOf(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. + \note In Qt versions prior to 6.8, this function took QString, not + QAnyStringView. + \sa setGenerated() */ -bool QSqlRecord::isGenerated(const QString& name) const +bool QSqlRecord::isGenerated(QAnyStringView 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. @@ -475,7 +495,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; @@ -483,15 +503,18 @@ void QSqlRecord::setValue(int index, const QVariant& val) d->fields[index].setValue(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) + \note In Qt versions prior to 6.8, this function took QString, not + QAnyStringView. + + \sa setNull() +*/ +void QSqlRecord::setValue(QAnyStringView name, const QVariant &val) { setValue(indexOf(name), val); } @@ -501,7 +524,7 @@ void QSqlRecord::setValue(const QString& name, const QVariant& val) */ void QSqlRecord::detach() { - qAtomicDetach(d); + d.detach(); } #ifndef QT_NO_DEBUG_STREAM |