* primary key:
      declared: array('entity_id')
      actual: array('entity_id', 'entity_type')

added around line 234...

    if ($type == 'other') {
      // Need the entity type also in the pkey for multiple entities in one table.
      $schema[$type]['primary key'][] = 'entity_type';
    }
    if ($type == 'apachesolr_index_entities') { // added
      $schema[$type]['primary key'][] = 'entity_type';// added
    }// added
CommentFileSizeAuthor
#6 1441066-6.patch1.54 KBnick_vh
#1 1441066-1.patch1.78 KBpwolanin

Comments

pwolanin’s picture

pwolanin commented
Status: Active » Needs review
StatusFileSize
new 1441066-1.patch1.78 KB
nick_vh’s picture

nick_vh
he/him
Location Ghent
commented
Status: Needs review » Needs work

I think we need an update function for this patch? that changes the type to the table for those that have already installed update 7012?

pwolanin’s picture

pwolanin commented

I think the only change is that some people had the wrong pkey.

We might want to drop and re-add the key if it's wrong.

pwolanin’s picture

pwolanin commented
Status: Needs work » Needs review

apachesolr_update_7013() already fixes this pkey.

http://drupalcode.org/project/apachesolr.git/commit/5bd31b31f6c5531ca2e1...

so anyone who has installed -dev since 2012-02-02 will need to fix by hand I think.

pwolanin’s picture

pwolanin commented
Version: 7.x-1.0-beta16 » 6.x-3.x-dev
Status: Needs review » Patch (to be ported)

committed.

not sure if 6 has this bug too, if so it need to be fixed also.

nick_vh’s picture

nick_vh
he/him
Location Ghent
commented
Status: Patch (to be ported) » Fixed
StatusFileSize
new 1441066-6.patch1.54 KB

Committed to 6.x-3.x. It was still valid for 6.x-3.x

nick_vh’s picture

nick_vh
he/him
Location Ghent
commented
Status: Fixed » Closed (fixed)