When clicking the Revisions tab of any of my custom blocks in order to restore a revision, I get:

PDOException: SQLSTATE[23000]: Integrity constraint violation: 1052 Column 'vid' in field list is ambiguous: SELECT vid, body, format, br.timestamp, br.log, u.uid, u.name FROM {boxes_revisions} br LEFT JOIN {users} u ON br.uid = u.uid WHERE br.bid = :bid ORDER BY timestamp DESC; Array ( [:bid] => 18 ) in block_revision_list() (line 149 of /home/mysampleuser/public_html/sites/all/modules/block_revisions/block_revisions.admin.inc).

"vid" exists in both the boxes_revisions and users tables, hence the ambiguity.
Working on a patch.

Maybe it should be:

SELECT br.vid, body, format, br.timestamp, br.log, u.uid, u.name FROM {boxes_revisions} br LEFT JOIN {users} u ON br.uid = u.uid WHERE br.bid = :bid ORDER BY timestamp DESC;

I tried this out in phpMyAdmin and it worked there...

CommentFileSizeAuthor
#5 block_revisions-integrity_constraint-2012254-9180495.patch736 bytescaspervoogt
#1 block_revisions-integrityfix--2012254.patch802 bytescaspervoogt

Comments

caspervoogt’s picture

caspervoogt commented
StatusFileSize
new block_revisions-integrityfix--2012254.patch802 bytes

Here's the patch.

dmitrit’s picture

dmitrit commented
Status: Active » Fixed

Commited.

Status: Fixed » Closed (fixed)

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

caspervoogt’s picture

caspervoogt commented
Issue summary: View changes

I encountered a very similar error when click "Revert", but on line 52 of block_revisions.module.
Changed this:
$query = 'SELECT bid, vid, body, format, br.timestamp, br.log, u.uid, u.name FROM {boxes_revisions} br LEFT JOIN {users} u ON br.uid = u.uid WHERE br.bid = :bid AND br.vid = :vid';

to this:

$query = 'SELECT bid, br.vid, body, format, br.timestamp, br.log, u.uid, u.name FROM {boxes_revisions} br LEFT JOIN {users} u ON br.uid = u.uid WHERE br.bid = :bid AND br.vid = :vid';

That solved it for me.

caspervoogt’s picture

caspervoogt commented
StatusFileSize
new block_revisions-integrity_constraint-2012254-9180495.patch736 bytes
caspervoogt’s picture

caspervoogt commented

see patch above. This solved it on my end.

caspervoogt’s picture

caspervoogt commented
Status: Closed (fixed) » Needs review

dmitrit’s picture

dmitrit commented
Status: Needs review » Fixed

Status: Fixed » Closed (fixed)

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