From a7a8dea9445c41ad4fc63b5eb75e1225f53db070 Mon Sep 17 00:00:00 2001 From: silverqx Date: Thu, 15 Dec 2022 10:31:09 +0100 Subject: [PATCH] used << instead of append() for lists everywhere --- include/orm/query/querybuilder.hpp | 2 +- include/orm/tiny/concerns/guardsattributes.hpp | 12 ++++++------ include/orm/tiny/model.hpp | 2 +- include/orm/tiny/relations/belongstomany.hpp | 2 +- .../concerns/interactswithpivottable.hpp | 2 +- include/orm/tiny/relations/hasoneormany.hpp | 2 +- src/orm/query/grammars/grammar.cpp | 2 +- src/orm/query/processors/mysqlprocessor.cpp | 2 +- src/orm/query/processors/postgresprocessor.cpp | 2 +- src/orm/query/processors/sqliteprocessor.cpp | 2 +- src/orm/query/querybuilder.cpp | 10 +++++----- src/orm/schema/blueprint.cpp | 2 +- .../orm/tiny/softdeletes/tst_softdeletes.cpp | 16 ++++++++-------- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/include/orm/query/querybuilder.hpp b/include/orm/query/querybuilder.hpp index b515b7263..154557c77 100644 --- a/include/orm/query/querybuilder.hpp +++ b/include/orm/query/querybuilder.hpp @@ -1271,7 +1271,7 @@ namespace Orm::Query Builder::crossJoin(T &&table) { // No need to call joinInternal() because no bindings - m_joins.append(newJoinClause(*this, CROSS, std::forward(table))); + m_joins << newJoinClause(*this, CROSS, std::forward(table)); return *this; } diff --git a/include/orm/tiny/concerns/guardsattributes.hpp b/include/orm/tiny/concerns/guardsattributes.hpp index b8f0a66f3..514cfd350 100644 --- a/include/orm/tiny/concerns/guardsattributes.hpp +++ b/include/orm/tiny/concerns/guardsattributes.hpp @@ -127,7 +127,7 @@ namespace Orm::Tiny::Concerns for (const auto &value : fillable) if (!fillable_.contains(value)) - fillable_.append(value); + fillable_ << value; return model(); } @@ -140,7 +140,7 @@ namespace Orm::Tiny::Concerns for (auto &value : fillable) if (!fillable_.contains(value)) - fillable_.append(std::move(value)); + fillable_ << std::move(value); return model(); } @@ -178,7 +178,7 @@ namespace Orm::Tiny::Concerns for (const auto &value : guarded) if (!guarded_.contains(value)) - guarded_.append(value); + guarded_ << value; return model(); } @@ -191,7 +191,7 @@ namespace Orm::Tiny::Concerns for (auto &value : guarded) if (!guarded_.contains(value)) - guarded_.append(std::move(value)); + guarded_ << std::move(value); return model(); } @@ -288,7 +288,7 @@ namespace Orm::Tiny::Concerns for (const auto &attribute : attributes) if (fillable.contains(attribute.key)) - result.append(attribute); + result << attribute; return result; } @@ -307,7 +307,7 @@ namespace Orm::Tiny::Concerns for (auto &attribute : attributes) if (fillable.contains(attribute.key)) - result.append(std::move(attribute)); + result << std::move(attribute); return result; } diff --git a/include/orm/tiny/model.hpp b/include/orm/tiny/model.hpp index 51c51a5dd..da8c1c7a7 100644 --- a/include/orm/tiny/model.hpp +++ b/include/orm/tiny/model.hpp @@ -1809,7 +1809,7 @@ namespace Orm::Tiny template void Model::appendToUserDates(const QString &column) { - const_cast(Derived::u_dates).append(column); + const_cast(Derived::u_dates) << column; } } // namespace Orm::Tiny diff --git a/include/orm/tiny/relations/belongstomany.hpp b/include/orm/tiny/relations/belongstomany.hpp index 2bdccd19c..e0cf7e1b2 100644 --- a/include/orm/tiny/relations/belongstomany.hpp +++ b/include/orm/tiny/relations/belongstomany.hpp @@ -476,7 +476,7 @@ namespace Orm::Tiny::Relations ->getAttribute(m_foreignPivotKey) .template value(); - dictionary[foreignPivotKey].append(std::move(result)); + dictionary[foreignPivotKey] << std::move(result); } return dictionary; diff --git a/include/orm/tiny/relations/concerns/interactswithpivottable.hpp b/include/orm/tiny/relations/concerns/interactswithpivottable.hpp index c9b2e1fb5..c2048b2d9 100644 --- a/include/orm/tiny/relations/concerns/interactswithpivottable.hpp +++ b/include/orm/tiny/relations/concerns/interactswithpivottable.hpp @@ -786,7 +786,7 @@ namespace Concerns // FEATURE pivot, withPivotValues silverqx // for (auto &[column, value] as m_pivotValues) -// record.append(column, value); +// record << column, value; return record; } diff --git a/include/orm/tiny/relations/hasoneormany.hpp b/include/orm/tiny/relations/hasoneormany.hpp index 7830ab309..239f0c2d9 100644 --- a/include/orm/tiny/relations/hasoneormany.hpp +++ b/include/orm/tiny/relations/hasoneormany.hpp @@ -384,7 +384,7 @@ namespace Orm::Tiny::Relations .template value(); std::is_same_v> ) - dictionary[foreign].append(std::move(result)); + dictionary[foreign] << std::move(result); else // Moves to the std::optional dictionary.insert(foreign, std::move(result)); diff --git a/src/orm/query/grammars/grammar.cpp b/src/orm/query/grammars/grammar.cpp index cfc673c1f..954d88874 100644 --- a/src/orm/query/grammars/grammar.cpp +++ b/src/orm/query/grammars/grammar.cpp @@ -658,7 +658,7 @@ Grammar::flatBindingsForUpdateDelete(const BindingsMap &bindings, continue; else for (const auto &binding : itBindings.value()) - cleanBindingsFlatten.append(std::cref(binding)); + cleanBindingsFlatten << std::cref(binding); return cleanBindingsFlatten; } diff --git a/src/orm/query/processors/mysqlprocessor.cpp b/src/orm/query/processors/mysqlprocessor.cpp index b43f173cd..a2b3fa104 100644 --- a/src/orm/query/processors/mysqlprocessor.cpp +++ b/src/orm/query/processors/mysqlprocessor.cpp @@ -17,7 +17,7 @@ QStringList MySqlProcessor::processColumnListing(SqlQuery &query) const columns.reserve(QueryUtils::queryResultSize(query)); while (query.next()) - columns.append(query.value("column_name").value()); + columns << query.value("column_name").value(); return columns; } diff --git a/src/orm/query/processors/postgresprocessor.cpp b/src/orm/query/processors/postgresprocessor.cpp index 12e855de2..27d68f68a 100644 --- a/src/orm/query/processors/postgresprocessor.cpp +++ b/src/orm/query/processors/postgresprocessor.cpp @@ -16,7 +16,7 @@ QStringList PostgresProcessor::processColumnListing(SqlQuery &query) const columns.reserve(QueryUtils::queryResultSize(query)); while (query.next()) - columns.append(query.value("column_name").value()); + columns << query.value("column_name").value(); return columns; } diff --git a/src/orm/query/processors/sqliteprocessor.cpp b/src/orm/query/processors/sqliteprocessor.cpp index 887715c1e..8ed24055b 100644 --- a/src/orm/query/processors/sqliteprocessor.cpp +++ b/src/orm/query/processors/sqliteprocessor.cpp @@ -16,7 +16,7 @@ QStringList SQLiteProcessor::processColumnListing(SqlQuery &query) const columns.reserve(QueryUtils::queryResultSize(query)); while (query.next()) - columns.append(query.value(NAME).value()); + columns << query.value(NAME).value(); return columns; } diff --git a/src/orm/query/querybuilder.cpp b/src/orm/query/querybuilder.cpp index ec1327e4e..a712f72fe 100644 --- a/src/orm/query/querybuilder.cpp +++ b/src/orm/query/querybuilder.cpp @@ -972,7 +972,7 @@ Builder &Builder::groupBy(const Column &group) Builder &Builder::groupByRaw(const QString &sql, const QVector &bindings) { - m_groups.append(Expression(sql)); + m_groups << Expression(sql); addBinding(bindings, BindingType::GROUPBY); @@ -1246,7 +1246,7 @@ QVector Builder::getBindings() const for (const auto &bindings : std::as_const(m_bindings)) for (const auto &binding : bindings) - flattenBindings.append(binding); + flattenBindings << binding; return flattenBindings; } @@ -1258,7 +1258,7 @@ Builder &Builder::addBinding(const QVariant &binding, const BindingType type) checkBindingType(type); #endif - m_bindings[type].append(binding); + m_bindings[type] << binding; return *this; } @@ -1270,7 +1270,7 @@ Builder &Builder::addBinding(QVariant &&binding, const BindingType type) checkBindingType(type); #endif - m_bindings[type].append(std::move(binding)); + m_bindings[type] << std::move(binding); return *this; } @@ -1689,7 +1689,7 @@ Builder &Builder::joinInternal(std::shared_ptr &&join) const auto &joinRef = *join; // Move ownership - m_joins.append(std::move(join)); + m_joins << std::move(join); addBinding(joinRef.getBindings(), BindingType::JOIN); diff --git a/src/orm/schema/blueprint.cpp b/src/orm/schema/blueprint.cpp index 8da732178..848e2fbc5 100644 --- a/src/orm/schema/blueprint.cpp +++ b/src/orm/schema/blueprint.cpp @@ -597,7 +597,7 @@ void Blueprint::defaultStringLength(const int length) noexcept ColumnDefinitionReference<> Blueprint::addColumnDefinition(ColumnDefinition &&definition) { - m_columns.append(std::move(definition)); + m_columns << std::move(definition); auto &definitionRef = m_columns.last(); // clazy:exclude=detaching-member diff --git a/tests/auto/functional/orm/tiny/softdeletes/tst_softdeletes.cpp b/tests/auto/functional/orm/tiny/softdeletes/tst_softdeletes.cpp index ed5bbc8d9..fb3eafa58 100644 --- a/tests/auto/functional/orm/tiny/softdeletes/tst_softdeletes.cpp +++ b/tests/auto/functional/orm/tiny/softdeletes/tst_softdeletes.cpp @@ -388,7 +388,7 @@ void tst_SoftDeletes::restore_remove_OnTinyBuilder() const QCOMPARE(user.getAttribute(DELETED_AT).value(), QDateTime()); QVERIFY(!user.trashed()); - actualIds.append(user.getAttribute(ID).value()); + actualIds << user.getAttribute(ID).value(); } QCOMPARE(actualIds, expectedIds); @@ -428,7 +428,7 @@ void tst_SoftDeletes::restore_remove_OnTinyBuilder() const timeBeforeRemove); QVERIFY(user.trashed()); - actualIds.append(user.getAttribute(ID).value()); + actualIds << user.getAttribute(ID).value(); } QCOMPARE(actualIds, expectedIds); @@ -606,7 +606,7 @@ void tst_SoftDeletes::restore_Trashed_OnTinyBuilder() const QCOMPARE(user.getAttribute(DELETED_AT).value(), QDateTime()); QVERIFY(!user.trashed()); - actualIds.append(user.getAttribute(ID).value()); + actualIds << user.getAttribute(ID).value(); } QCOMPARE(actualIds, expectedIds); @@ -771,7 +771,7 @@ void tst_SoftDeletes::restore_NotTrashed_OnTinyBuilder() const QCOMPARE(user.getAttribute(DELETED_AT).value(), QDateTime()); QVERIFY(!user.trashed()); - actualIds.append(user.getAttribute(ID).value()); + actualIds << user.getAttribute(ID).value(); } QCOMPARE(actualIds, expectedIds); @@ -811,7 +811,7 @@ void tst_SoftDeletes::restore_NotTrashed_OnTinyBuilder() const QCOMPARE(user.getAttribute(DELETED_AT).value(), QDateTime()); QVERIFY(!user.trashed()); - actualIds.append(user.getAttribute(ID).value()); + actualIds << user.getAttribute(ID).value(); } QCOMPARE(actualIds, expectedIds); @@ -996,7 +996,7 @@ void tst_SoftDeletes::remove_Trashed_OnTinyBuilder() const timeBeforeRemove); QVERIFY(user.trashed()); - actualIds.append(user.getAttribute(ID).value()); + actualIds << user.getAttribute(ID).value(); } QCOMPARE(actualIds, expectedIds); @@ -1160,7 +1160,7 @@ void tst_SoftDeletes::remove_NotTrashed_OnTinyBuilder() const QCOMPARE(user.getAttribute(DELETED_AT).value(), QDateTime()); QVERIFY(!user.trashed()); - actualIds.append(user.getAttribute(ID).value()); + actualIds << user.getAttribute(ID).value(); } QCOMPARE(actualIds, expectedIds); @@ -1201,7 +1201,7 @@ void tst_SoftDeletes::remove_NotTrashed_OnTinyBuilder() const timeBeforeRemove); QVERIFY(user.trashed()); - actualIds.append(user.getAttribute(ID).value()); + actualIds << user.getAttribute(ID).value(); } QCOMPARE(actualIds, expectedIds);