Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow custom tag table name and primary key for scoped queries #529

Merged
merged 4 commits into from
Jan 31, 2025
Merged

Allow custom tag table name and primary key for scoped queries #529

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc49187
Added customizable tag table and primary key through config file
gtmassey Jan 29, 2025
dbf5413
updated default config file
gtmassey Jan 29, 2025
582f9ed
removed redundant config options
gtmassey Jan 29, 2025
bb04d45
Update HasTags.php
freekmurze Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions src/HasTags.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,24 @@ public static function getTagClassName(): string
return config('tags.tag_model', Tag::class);
}

public static function getTagTableName(): string
{
$tagInstance = new (self::getTagClassName());

return $tagInstance->getTable();
}

public static function getTagTablePrimaryKeyName(): string
{
return self::getTagTableName() . '.' . self::getTagPrimaryKey();
}

public static function getTagPrimaryKey(): string
{
$tagInstance = new (self::getTagClassName());
return $tagInstance->getKeyName();
}

public function getTaggableMorphName(): string
{
return config('tags.taggable.morph_name', 'taggable');
Expand Down Expand Up @@ -95,7 +113,7 @@ public function scopeWithAllTags(

collect($tags)->each(function ($tag) use ($query) {
$query->whereHas('tags', function (Builder $query) use ($tag) {
$query->where('tags.id', $tag->id ?? 0);
$query->where(self::getTagTablePrimaryKeyName(), $tag->id ?? 0);
});
});

Expand All @@ -113,7 +131,7 @@ public function scopeWithAnyTags(
->whereHas('tags', function (Builder $query) use ($tags) {
$tagIds = collect($tags)->pluck('id');

$query->whereIn('tags.id', $tagIds);
$query->whereIn(self::getTagTablePrimaryKeyName(), $tagIds);
});
}

Expand All @@ -128,7 +146,7 @@ public function scopeWithoutTags(
->whereDoesntHave('tags', function (Builder $query) use ($tags) {
$tagIds = collect($tags)->pluck('id');

$query->whereIn('tags.id', $tagIds);
$query->whereIn(self::getTagTablePrimaryKeyName(), $tagIds);
});
}

Expand All @@ -140,7 +158,7 @@ public function scopeWithAllTagsOfAnyType(Builder $query, $tags): Builder
->each(function ($tag) use ($query) {
$query->whereHas(
'tags',
fn (Builder $query) => $query->where('tags.id', $tag ? $tag->id : 0)
fn (Builder $query) => $query->where(self::getTagTablePrimaryKeyName(), $tag ? $tag->id : 0)
);
});

Expand All @@ -155,7 +173,7 @@ public function scopeWithAnyTagsOfAnyType(Builder $query, $tags): Builder

return $query->whereHas(
'tags',
fn (Builder $query) => $query->whereIn('tags.id', $tagIds)
fn (Builder $query) => $query->whereIn(self::getTagTablePrimaryKeyName(), $tagIds)
);
}

Expand Down