Skip to content

A free open source IT asset/license management system

Use addSelect to query scopes so we don’t drop the original leftJoin

snipe730a3f0d3623
diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php
index c0e81fa823..29cd5581f3 100755
--- a/app/Models/Accessory.php
+++ b/app/Models/Accessory.php
@@ -544,7 +544,7 @@ class Accessory extends SnipeModel
*/
public function scopeOrderByCreatedByName($query, $order)
{
- return $query->leftJoin('users as admin_sort', 'accessories.created_by', '=', 'admin_sort.id')->select('accessories.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+ return $query->leftJoin('users as admin_sort', 'accessories.created_by', '=', 'admin_sort.id')->addSelect('accessories.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
}
/**
diff --git a/app/Models/Actionlog.php b/app/Models/Actionlog.php
index 0b511d4949..4499a3964f 100755
--- a/app/Models/Actionlog.php
+++ b/app/Models/Actionlog.php
@@ -773,7 +773,7 @@ class Actionlog extends SnipeModel
public function scopeOrderByCreatedBy($query, $order)
{
- return $query->leftJoin('users as admin_sort', 'action_logs.created_by', '=', 'admin_sort.id')->select('action_logs.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+ return $query->leftJoin('users as admin_sort', 'action_logs.created_by', '=', 'admin_sort.id')->addSelect('action_logs.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
}
// Audit report (issue #9430): the frontend has advertised location
@@ -784,7 +784,7 @@ class Actionlog extends SnipeModel
public function scopeOrderByLocation($query, $order)
{
return $query->leftJoin('locations as location_sort', 'action_logs.location_id', '=', 'location_sort.id')
- ->select('action_logs.*')
+ ->addSelect('action_logs.*')
->orderBy('location_sort.name', $order);
}
@@ -798,7 +798,7 @@ class Actionlog extends SnipeModel
$join->on('action_logs.item_id', '=', 'asset_sort.id')
->where('action_logs.item_type', '=', Asset::class);
})
- ->select('action_logs.*')
+ ->addSelect('action_logs.*')
->orderBy('asset_sort.next_audit_date', $order);
}
@@ -816,7 +816,7 @@ class Actionlog extends SnipeModel
$join->on('action_logs.item_id', '=', 'asset_item_sort.id')
->where('action_logs.item_type', '=', Asset::class);
})
- ->select('action_logs.*')
+ ->addSelect('action_logs.*')
->orderBy('asset_item_sort.name', $order);
}
}
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index beae8ce1c5..b84d3b8f31 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -282,7 +282,6 @@ class Asset extends Depreciable
'rtd_location' => 'defaultLoc',
];
-
protected $searchableRelationColumns = [
'jobtitle' => ['relation' => 'assignedTo', 'column' => 'jobtitle', 'types' => [\App\Models\User::class]],
'employee_num' => ['relation' => 'assignedTo', 'column' => 'employee_num', 'types' => [\App\Models\User::class]],
@@ -2234,7 +2233,15 @@ class Asset extends Depreciable
*/
public function scopeOrderByCreatedByName($query, $order)
{
- return $query->leftJoin('users as admin_sort', 'assets.created_by', '=', 'admin_sort.id')->select('assets.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+ // addSelect rather than select, so prior withCount subqueries
+ // (which append their count-expressions to the select list)
+ // don't get wiped by the join and trigger an N+1 on the
+ // reload.
+ return $query
+ ->leftJoin('users as admin_sort', 'assets.created_by', '=', 'admin_sort.id')
+ ->addSelect('assets.*')
+ ->orderBy('admin_sort.first_name', $order)
+ ->orderBy('admin_sort.last_name', $order);
}
/**
diff --git a/app/Models/AssetModel.php b/app/Models/AssetModel.php
index c721c7a179..48fbe4b6f3 100755
--- a/app/Models/AssetModel.php
+++ b/app/Models/AssetModel.php
@@ -476,7 +476,7 @@ class AssetModel extends SnipeModel
*/
public function scopeOrderByCreatedByName($query, $order)
{
- return $query->leftJoin('users as admin_sort', 'models.created_by', '=', 'admin_sort.id')->select('models.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+ return $query->leftJoin('users as admin_sort', 'models.created_by', '=', 'admin_sort.id')->addSelect('models.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
}
/**
diff --git a/app/Models/Category.php b/app/Models/Category.php
index 0d16c13771..590252c0f4 100755
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -370,6 +370,6 @@ class Category extends SnipeModel
public function scopeOrderByCreatedBy($query, $order)
{
- return $query->leftJoin('users as admin_sort', 'categories.created_by', '=', 'admin_sort.id')->select('categories.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+ return $query->leftJoin('users as admin_sort', 'categories.created_by', '=', 'admin_sort.id')->addSelect('categories.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
}
}
diff --git a/app/Models/Component.php b/app/Models/Component.php
index 9fbb37ae3b..59dd317556 100644
--- a/app/Models/Component.php
+++ b/app/Models/Component.php
@@ -572,7 +572,7 @@ class Component extends SnipeModel
public function scopeOrderByCreatedBy($query, $order)
{
- return $query->leftJoin('users as admin_sort', 'components.created_by', '=', 'admin_sort.id')->select('components.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+ return $query->leftJoin('users as admin_sort', 'components.created_by', '=', 'admin_sort.id')->addSelect('components.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
}
/**
diff --git a/app/Models/ComponentAssignment.php b/app/Models/ComponentAssignment.php
index 34fb737323..0d3e4b4886 100644
--- a/app/Models/ComponentAssignment.php
+++ b/app/Models/ComponentAssignment.php
@@ -69,11 +69,11 @@ class ComponentAssignment extends Model
public function scopeOrderByCreatedByName($query, $order)
{
- return $query->leftJoin('users as checkout_users_sort', 'components_assets.created_by', '=', 'checkout_users_sort.id')->select('components_assets.*')->orderBy('checkout_users_sort.first_name', $order)->orderBy('checkout_users_sort.last_name', $order);
+ return $query->leftJoin('users as checkout_users_sort', 'components_assets.created_by', '=', 'checkout_users_sort.id')->addSelect('components_assets.*')->orderBy('checkout_users_sort.first_name', $order)->orderBy('checkout_users_sort.last_name', $order);
}
public function scopeOrderByComponentName($query, $order)
{
- return $query->leftJoin('components as component_sort', 'components_assets.id', '=', 'component_sort.id')->select('components_assets.*')->orderBy('component_sort.name', $order);
+ return $query->leftJoin('components as component_sort', 'components_assets.id', '=', 'component_sort.id')->addSelect('components_assets.*')->orderBy('component_sort.name', $order);
}
}
diff --git a/app/Models/Consumable.php b/app/Models/Consumable.php
index 7cbc1712c7..1f68449a32 100644
--- a/app/Models/Consumable.php
+++ b/app/Models/Consumable.php
@@ -552,7 +552,7 @@ class Consumable extends SnipeModel
public function scopeOrderByCreatedBy($query, $order)
{
- return $query->leftJoin('users as users_sort', 'consumables.created_by', '=', 'users_sort.id')->select('consumables.*')->orderBy('users_sort.first_name', $order)->orderBy('users_sort.last_name', $order);
+ return $query->leftJoin('users as users_sort', 'consumables.created_by', '=', 'users_sort.id')->addSelect('consumables.*')->orderBy('users_sort.first_name', $order)->orderBy('users_sort.last_name', $order);
}
/**
diff --git a/app/Models/Department.php b/app/Models/Department.php
index 8c1b01ffb6..45011f477a 100644
--- a/app/Models/Department.php
+++ b/app/Models/Department.php
@@ -229,6 +229,6 @@ class Department extends SnipeModel
public function scopeOrderByCreatedBy($query, $order)
{
- return $query->leftJoin('users as admin_sort', 'departments.created_by', '=', 'admin_sort.id')->select('departments.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+ return $query->leftJoin('users as admin_sort', 'departments.created_by', '=', 'admin_sort.id')->addSelect('departments.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
}
}
diff --git a/app/Models/Depreciation.php b/app/Models/Depreciation.php
index fc1939bd4e..2eac2f3d36 100755
--- a/app/Models/Depreciation.php
+++ b/app/Models/Depreciation.php
@@ -138,6 +138,6 @@ class Depreciation extends SnipeModel
**/
public function scopeOrderByCreatedBy($query, $order)
{
- return $query->leftJoin('users as admin_sort', 'depreciations.created_by', '=', 'admin_sort.id')->select('depreciations.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+ return $query->leftJoin('users as admin_sort', 'depreciations.created_by', '=', 'admin_sort.id')->addSelect('depreciations.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
}
}
diff --git a/app/Models/Group.php b/app/Models/Group.php
index ff558862cf..c655ff2a33 100755
--- a/app/Models/Group.php
+++ b/app/Models/Group.php
@@ -141,6 +141,6 @@ class Group extends SnipeModel
**/
public function scopeOrderByCreatedBy($query, $order)
{
- return $query->leftJoin('users as admin_sort', 'permission_groups.created_by', '=', 'admin_sort.id')->select('permission_groups.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+ return $query->leftJoin('users as admin_sort', 'permission_groups.created_by', '=', 'admin_sort.id')->addSelect('permission_groups.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
}
}
diff --git a/app/Models/License.php b/app/Models/License.php
index e8d4707e18..27bd6c0185 100755
--- a/app/Models/License.php
+++ b/app/Models/License.php
@@ -1013,7 +1013,7 @@ class License extends Depreciable
*/
public function scopeOrderManufacturer($query, $order)
{
- return $query->leftJoin('manufacturers', 'licenses.manufacturer_id', '=', 'manufacturers.id')->select('licenses.*')
+ return $query->leftJoin('manufacturers', 'licenses.manufacturer_id', '=', 'manufacturers.id')->addSelect('licenses.*')
->orderBy('manufacturers.name', $order);
}
@@ -1026,7 +1026,7 @@ class License extends Depreciable
*/
public function scopeOrderSupplier($query, $order)
{
- return $query->leftJoin('suppliers', 'licenses.supplier_id', '=', 'suppliers.id')->select('licenses.*')
+ return $query->leftJoin('suppliers', 'licenses.supplier_id', '=', 'suppliers.id')->addSelect('licenses.*')
->orderBy('suppliers.name', $order);
}
@@ -1039,7 +1039,7 @@ class License extends Depreciable
*/
public function scopeOrderCompany($query, $order)
{
- return $query->leftJoin('companies as companies', 'licenses.company_id', '=', 'companies.id')->select('licenses.*')
+ return $query->leftJoin('companies as companies', 'licenses.company_id', '=', 'companies.id')->addSelect('licenses.*')
->orderBy('companies.name', $order);
}
@@ -1048,7 +1048,7 @@ class License extends Depreciable
*/
public function scopeOrderByCreatedBy($query, $order)
{
- return $query->leftJoin('users as admin_sort', 'licenses.created_by', '=', 'admin_sort.id')->select('licenses.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+ return $query->leftJoin('users as admin_sort', 'licenses.created_by', '=', 'admin_sort.id')->addSelect('licenses.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
}
/**
diff --git a/app/Models/Location.php b/app/Models/Location.php
index 009926639a..1e9ec38bb4 100755
--- a/app/Models/Location.php
+++ b/app/Models/Location.php
@@ -479,6 +479,6 @@ class Location extends SnipeModel
*/
public function scopeOrderByCreatedByName($query, $order)
{
- return $query->leftJoin('users as admin_sort', 'locations.created_by', '=', 'admin_sort.id')->select('locations.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+ return $query->leftJoin('users as admin_sort', 'locations.created_by', '=', 'admin_sort.id')->addSelect('locations.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
}
}
diff --git a/app/Models/Manufacturer.php b/app/Models/Manufacturer.php
index cac36fd3f7..d334043dd0 100755
--- a/app/Models/Manufacturer.php
+++ b/app/Models/Manufacturer.php
@@ -148,6 +148,6 @@ class Manufacturer extends SnipeModel
*/
public function scopeOrderByCreatedBy($query, $order)
{
- return $query->leftJoin('users as admin_sort', 'manufacturers.created_by', '=', 'admin_sort.id')->select('manufacturers.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+ return $query->leftJoin('users as admin_sort', 'manufacturers.created_by', '=', 'admin_sort.id')->addSelect('manufacturers.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
}
}
diff --git a/app/Models/PredefinedKit.php b/app/Models/PredefinedKit.php
index df8c749d20..db578d6c21 100644
--- a/app/Models/PredefinedKit.php
+++ b/app/Models/PredefinedKit.php
@@ -199,6 +199,6 @@ class PredefinedKit extends SnipeModel
**/
public function scopeOrderByCreatedBy($query, $order)
{
- return $query->leftJoin('users as admin_sort', 'kits.created_by', '=', 'admin_sort.id')->select('kits.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+ return $query->leftJoin('users as admin_sort', 'kits.created_by', '=', 'admin_sort.id')->addSelect('kits.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
}
}
diff --git a/app/Models/Statuslabel.php b/app/Models/Statuslabel.php
index 8799b3a0e1..8b9c9541d2 100755
--- a/app/Models/Statuslabel.php
+++ b/app/Models/Statuslabel.php
@@ -56,7 +56,7 @@ class Statuslabel extends SnipeModel
protected function color(): Attribute
{
return Attribute::make(
- get: fn(?string $value) => CssColor::sanitize($value, ''),
+ get: fn (?string $value) => CssColor::sanitize($value, ''),
);
}
@@ -249,6 +249,6 @@ class Statuslabel extends SnipeModel
public function scopeOrderByCreatedBy($query, $order)
{
- return $query->leftJoin('users as admin_sort', 'status_labels.created_by', '=', 'admin_sort.id')->select('status_labels.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+ return $query->leftJoin('users as admin_sort', 'status_labels.created_by', '=', 'admin_sort.id')->addSelect('status_labels.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
}
}
diff --git a/app/Models/Supplier.php b/app/Models/Supplier.php
index 45e49de942..7b370f64d0 100755
--- a/app/Models/Supplier.php
+++ b/app/Models/Supplier.php
@@ -293,6 +293,6 @@ class Supplier extends SnipeModel
*/
public function scopeOrderByCreatedByName($query, $order)
{
- return $query->leftJoin('users as admin_sort', 'suppliers.created_by', '=', 'admin_sort.id')->select('suppliers.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+ return $query->leftJoin('users as admin_sort', 'suppliers.created_by', '=', 'admin_sort.id')->addSelect('suppliers.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
}
}