diff --git a/packages/tables/src/Actions/AssociateAction.php b/packages/tables/src/Actions/AssociateAction.php index 27d2ca5b45..96c2dd55e3 100644 --- a/packages/tables/src/Actions/AssociateAction.php +++ b/packages/tables/src/Actions/AssociateAction.php @@ -238,7 +238,10 @@ class AssociateAction extends Action } return $query->where( - $relationship->getParent()->getQualifiedKeyName(), + // https://github.com/filamentphp/filament/issues/8067 + $relationship->getParent()->getTable() === $relationship->getRelated()->getTable() ? + $relationship->getParent()->getKeyName() : + $relationship->getParent()->getQualifiedKeyName(), $relationship->getParent()->getKey(), ); }); diff --git a/packages/tables/src/Actions/AttachAction.php b/packages/tables/src/Actions/AttachAction.php index 85b619b55e..222cd91449 100644 --- a/packages/tables/src/Actions/AttachAction.php +++ b/packages/tables/src/Actions/AttachAction.php @@ -233,8 +233,11 @@ class AttachAction extends Action fn (Builder $query): Builder => $query->whereDoesntHave( $table->getInverseRelationship(), fn (Builder $query): Builder => $query->where( - $table->getRelationship()->getParent()->getQualifiedKeyName(), - $table->getRelationship()->getParent()->getKey(), + // https://github.com/filamentphp/filament/issues/8067 + $relationship->getParent()->getTable() === $relationship->getRelated()->getTable() ? + $relationship->getParent()->getKeyName() : + $relationship->getParent()->getQualifiedKeyName(), + $relationship->getParent()->getKey(), ), ), );