As explained in #140860, for consistency we need all tables to be in singular.

Here is a patch that renames block.module tables so {blocks} becomes {block}, {blocks_roles} becomes {block_role} and {boxes} becomes {box}.

This needs testing.

CommentFileSizeAuthor
#4 drupal_singular_block_tables.patch25 KBrecidive
#3 drupal_singular_block_tables.patch25 KBrecidive
#2 drupal_singular_block_tables.patch24.99 KBrecidive
drupal_singular_block_tables.patch24.99 KBrecidive

Comments

dries’s picture

dries commented
Status: Needs review » Needs work

If you apply this patch, the simpletests will report many errors.

recidive’s picture

recidive commented
Status: Needs work » Needs review
StatusFileSize
new drupal_singular_block_tables.patch24.99 KB

Re-rolled. All tests pass:

7232 passes, 0 fails, and 0 exceptions.

recidive’s picture

recidive commented
StatusFileSize
new drupal_singular_block_tables.patch25 KB

Re-rolling.

Once we get this one in, I'll work renaming remaining tables.

recidive’s picture

recidive commented
StatusFileSize
new drupal_singular_block_tables.patch25 KB

Re-rolling.

cburschka’s picture

cburschka
they
commented
Status: Needs review » Reviewed & tested by the community

Looks good and passes. I've grepped the patched codebase for blocks, boxes (-checkboxes) and blocks_roles to see if anything got overlooked, but I didn't find anything.

I also tried to upgrade an existing D6 site to D7 to see the table get renamed, but this failed completely for unrelated reasons (may file a separate bug report for that - D7 refuses to acknowledge the existing site directory and instead tries unsuccessfully to install a new site on top of it).

The only way that renaming would fail would be a serious bug in db_rename_table, though, and that would have been caught by now.

dries’s picture

dries commented
Status: Reviewed & tested by the community » Fixed

Committed to CVS HEAD. Thanks.

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for two weeks with no activity.