[5.x]: When merging entry types, the count includes drafts and revisions

[kennethormandy]

What happened?

Description

Best I can tell, the entry-types/merge command also includes drafts and revisions when counting entries. For example, I’m seeing:

craft entry-types/merge handle handle2

Which entry type should persist?

- handle (1 usage, 100 entries)
- handle2 (1 usage, 609 entries)

The handle section is 100 newly created entries, with no drafts or revisions, so that is all appearing as expected.

However, handle2 only has 34 entries. After clearing the revisions, the number is way lower, but I’m still not sure why it’s so high.

Steps to reproduce

1. Run craft entry-types/merge handle handle2 and see the results
2. Run craft utils/prune-revisions --max-revisions=0
3. Run craft entry-types/merge handle handle2 again, and see the results are different

Craft CMS version

5.4.1

PHP version

8.2

Operating system and version

No response

Database type and version

PostgreSQL

Image driver and version

No response

Installed plugins and versions

No response

[brandonkelly]

Is the handle2 entry type used by any Matrix or CKEditor fields? The query to fetch those counts is just this:

cms/src/console/controllers/EntryTypesController.php

Lines 65 to 69 in 5e56c6d

	$queryA = Entry::find()->typeId($entryTypeA->id)->status(null);
	$queryB = Entry::find()->typeId($entryTypeB->id)->status(null);
	$totalEntriesA = $queryA->count();
	$totalEntriesB = $queryB->count();

Drafts and revisions are not included in element queries by default, so those will not be included here.

[brandonkelly]

Might also be worth updating to Craft 5.4.2 and then running craft gc --delete-all-trashed.