diff options
Diffstat (limited to 'lib/VNDB/DB/Chars.pm')
-rw-r--r-- | lib/VNDB/DB/Chars.pm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/VNDB/DB/Chars.pm b/lib/VNDB/DB/Chars.pm index 7ee6d86b..6f1463c1 100644 --- a/lib/VNDB/DB/Chars.pm +++ b/lib/VNDB/DB/Chars.pm @@ -72,7 +72,7 @@ sub dbCharGet { my @select = (qw|c.id c.name c.original c.gender|); push @select, qw|c.hidden c.locked c.alias c.desc c.b_month c.b_day c.s_bust c.s_waist c.s_hip c.height c.weight c.bloodt c.cup_size c.age c.main c.main_spoil|, - 'coalesce((c.image).id,0) AS image' if $o{what} =~ /extended/; + 'coalesce(vndbid_num(c.image),0) AS image' if $o{what} =~ /extended/; my($r, $np) = $self->dbPage(\%o, q| SELECT !s @@ -95,7 +95,7 @@ sub dbCharGetRev { my $select = 'c.itemid AS id, ch.name, ch.original, ch.gender'; $select .= ', extract(\'epoch\' from c.added) as added, c.comments, c.rev, c.ihid, c.ilock, '.VNWeb::DB::sql_user(); $select .= ', c.id AS cid, NOT EXISTS(SELECT 1 FROM changes c2 WHERE c2.type = c.type AND c2.itemid = c.itemid AND c2.rev = c.rev+1) AS lastrev'; - $select .= ', ch.alias, ch.desc, coalesce((ch.image).id, 0) as image, ch.b_month, ch.b_day, ch.s_bust, ch.s_waist, ch.s_hip, ch.height, ch.weight, ch.bloodt, ch.cup_size, ch.age, ch.main, ch.main_spoil, co.hidden, co.locked' if $o{what} =~ /extended/; + $select .= ', ch.alias, ch.desc, coalesce(vndbid_num(ch.image), 0) as image, ch.b_month, ch.b_day, ch.s_bust, ch.s_waist, ch.s_hip, ch.height, ch.weight, ch.bloodt, ch.cup_size, ch.age, ch.main, ch.main_spoil, co.hidden, co.locked' if $o{what} =~ /extended/; my $r = $self->dbAll(q| SELECT !s @@ -179,8 +179,7 @@ sub dbCharRevisionInsert { my %set = map exists($o->{$_}) ? (qq|"$_" = ?|, $o->{$_}) : (), qw|name original alias desc b_month b_day s_bust s_waist s_hip height weight bloodt cup_size age gender main main_spoil|; - $set{'image = ROW(\'ch\',?)::image_id'} = $o->{image} if $o->{image}; - $set{'image = NULL'} = 1 if exists $o->{image} && !$o->{image}; + $set{'image = vndbid(\'ch\',?)'} = $o->{image}||undef if exists $o->{image}; $self->dbExec('UPDATE edit_chars !H', \%set) if keys %set; if($o->{traits}) { |