Skip to content

Commit 69eebef

Browse files
committed
IBX-10458: Const table names
1 parent 0ccf16c commit 69eebef

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/ContainsFieldDefinitionId.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Ibexa\Contracts\Core\Persistence\Content\Type\CriterionHandlerInterface;
1515
use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\Criterion\ContainsFieldDefinitionId as ContainsFieldDefinitionIdCriterion;
1616
use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\CriterionInterface;
17+
use Ibexa\Core\Persistence\Legacy\Content\Type\Gateway;
1718
use Ibexa\Core\Persistence\Legacy\Content\Type\Gateway\CriterionVisitor\CriterionVisitor;
1819

1920
/**
@@ -47,7 +48,7 @@ public function apply(
4748

4849
$subQuery
4950
->select('f_def.contentclass_id')
50-
->from('ezcontentclass_attribute', 'f_def')
51+
->from(Gateway::FIELD_DEFINITION_TABLE, 'f_def')
5152
->where($whereClause)
5253
->andWhere('f_def.contentclass_id = c.id');
5354

src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/ContentTypeGroupId.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Ibexa\Contracts\Core\Persistence\Content\Type\CriterionHandlerInterface;
1515
use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\Criterion\ContentTypeGroupId as ContentTypeGroupIdCriterion;
1616
use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\CriterionInterface;
17+
use Ibexa\Core\Persistence\Legacy\Content\Type\Gateway;
1718
use Ibexa\Core\Persistence\Legacy\Content\Type\Gateway\CriterionVisitor\CriterionVisitor;
1819

1920
/**
@@ -46,7 +47,7 @@ public function apply(
4647

4748
$subQuery
4849
->select('c_group.contentclass_id')
49-
->from('ezcontentclass_classgroup', 'c_group')
50+
->from(Gateway::CONTENT_TYPE_TO_GROUP_ASSIGNMENT_TABLE, 'c_group')
5051
->andWhere($whereClause)
5152
->andWhere('c_group.contentclass_id = c.id');
5253

src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/IsSystem.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Ibexa\Contracts\Core\Persistence\Content\Type\CriterionHandlerInterface;
1414
use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\Criterion\IsSystem as IsSystemCriterion;
1515
use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\CriterionInterface;
16+
use Ibexa\Core\Persistence\Legacy\Content\Type\Gateway;
1617
use Ibexa\Core\Persistence\Legacy\Content\Type\Gateway\CriterionVisitor\CriterionVisitor;
1718

1819
/**
@@ -36,8 +37,8 @@ public function apply(
3637
$subQuery = $qb->getConnection()->createQueryBuilder();
3738
$subQuery
3839
->select('g.contentclass_id')
39-
->from('ezcontentclassgroup', 'ctg')
40-
->leftJoin('ctg', 'ezcontentclass_classgroup', 'c_group', 'ctg.id = c_group.group_id')
40+
->from(Gateway::CONTENT_TYPE_GROUP_TABLE, 'ctg')
41+
->leftJoin('ctg', Gateway::CONTENT_TYPE_TO_GROUP_ASSIGNMENT_TABLE, 'c_group', 'ctg.id = c_group.group_id')
4142
->andWhere($subQuery->expr()->eq(
4243
'ctg.is_system',
4344
$qb->createNamedParameter($criterion->getValue(), ParameterType::BOOLEAN)

0 commit comments

Comments
 (0)