Changeset 406

Show
Ignore:
Timestamp:
02/08/08 02:44:39 (22 months ago)
Author:
eevee
Message:

Database refactoring. Renamed columns and tables to be more consistent and more readable. (#58)

Location:
veekun/trunk
Files:
1 removed
78 modified
3 moved

Legend:

Unmodified
Added
Removed

  • veekun/trunk/lib/Vee/Authorization.pm

    r385 r406  
    3434    return 0 unless $c->user; 
    3535 
    36     my @usergroups = $c->model('UserGroups')->search({ userid => [ 0, $c->user->obj->id ] })->get_column('groupid')->all; 
     36    my @usergroups = $c->model('UserGroups')->search({ user_id => [ 0, $c->user->obj->id ] })->get_column('group_id')->all; 
    3737#    my %seen; 
    3838 
    3939    # TODO: get group parents! 
    4040    my @groupperms = $c->model('GroupPermissions')->search({ 
    41         groupid => { -in => \@usergroups }, 
     41        group_id => { -in => \@usergroups }, 
    4242        permission => [ $permission, 'splat' ], 
    4343        scope => $scope, 

  • veekun/trunk/lib/Vee/Bot.pm

    r262 r406  
    7373        my $ability = $schema->resultset('Abilities')->find($hashref->{id}); 
    7474        return sprintf "%s: %s", 
    75             $ability->name, $ability->effect; 
     75            $ability->name, $ability->description; 
    7676 
    7777    } else { 
    … …  
    204204    } 
    205205 
    206     my @pm = $schema->resultset('PokeMoves')->search({ 
    207         pokeid => $pokemon_id, 
    208         moveid => $move_id, 
    209         -nest  => \ "FIND_IN_SET('$ver', version)", 
     206    my @pm = $schema->resultset('PokemonMoves')->search({ 
     207        pokemon_id => $pokemon_id, 
     208        move_id    => $move_id, 
     209        -nest      => \ "FIND_IN_SET('$ver', versions)", 
    210210    }); 
    211211 

  • veekun/trunk/lib/Vee/Controller/Dex.pm

    r400 r406  
    281281        group_by  => 'me.id', 
    282282        join      => 'pokemon_abilities', 
    283         '+select' => 'COUNT(DISTINCT pokemon_abilities.pokeid)', 
     283        '+select' => 'COUNT(DISTINCT pokemon_abilities.pokemon_id)', 
    284284        '+as'     => 'pokemon_count', 
    285285    }); 
    … …  
    353353     
    354354    # check to see if there is only one move, ever, that corresponds to this TM 
    355     my %set = map { $_->moveid => 1 } @tms; 
     355    my %set = map { $_->move_id => 1 } @tms; 
    356356 
    357357    if (!@tms) { 
    … …  
    359359    } elsif (1 == scalar keys %set) { 
    360360        # TODO: remove this? 
    361         $c->res->redirect( $c->uri('Dex', 'moves', lc $MoveData[ $tms[0]->moveid ]->name) ); 
     361        $c->res->redirect( $c->uri('Dex', 'moves', lc $MoveData[ $tms[0]->move_id ]->name) ); 
    362362    } 
    363363 
    … …  
    453453        %query, 
    454454    }, { 
    455         join     => { evchain => 'pokemon' }, 
     455        join     => { evo_chain => 'pokemon' }, 
    456456        prefetch => { pokemon_abilities => 'ability' }, 
    457         group_by => [ 'me.id', 'pokemon_abilities.abilityid' ], 
     457        group_by => [ 'me.id', 'pokemon_abilities.ability_id' ], 
    458458        order_by => [ @extra_order, "pokemon.id ASC", "FIND_IN_SET('baby', me.flags) DESC", 'me.id ASC' ], 
    459459    }); 
    … …  
    482482    delete $c->session->{last_pokemon_view}; 
    483483 
    484     $s->{page_title}  = $row->name . ' - Pokémon #' . $row->real_id; 
     484    $s->{page_title}  = $row->name . ' - Pokémon #' . $row->real_pokemon_id; 
    485485    $s->{page_header} = $row->name; 
    486486    $s->{extra_js}    = ['dexutils']; 
    … …  
    507507    $s->{this}       = $row; 
    508508    $s->{pid}        = Vee::Utils::pad($row->id, 3); 
    509     $s->{generation} = my $generation = ( grep { $Generations[$_]{maxid} >= $row->real_id } 0 .. $#Generations )[0]; 
     509    $s->{generation} = my $generation = ( grep { $Generations[$_]{maxid} >= $row->real_pokemon_id } 0 .. $#Generations )[0]; 
    510510 
    511511    # alt forms 
    … …  
    513513        my @alts; 
    514514        my $alt_rs = $c->model('DBIC::Pokemon')->search({ 
    515             real_id  => $row->real_id, 
     515            real_pokemon_id  => $row->real_pokemon_id, 
    516516        }, { 
    517517            columns  => ['alt_form'], 
    … …  
    525525         
    526526    # evolution chain 
    527     my @family = $row->evchain->pokemon( \'id = real_id', { columns => [qw/id evparent evmethod evparam/] } ); 
     527    my @family = $row->evo_chain->pokemon( \'id = real_pokemon_id', { columns => [qw/id evo_parent_id evo_method evo_param/] } ); 
    528528    my %evtrees; 
    529     $evtrees{$_->id} = { id => $_->id, parent => $_->evparent, method => $_->evmethod, param => $_->evparam, children => [] } for @family; 
     529    $evtrees{$_->id} = { id => $_->id, parent => $_->evo_parent_id, method => $_->evo_method, param => $_->evo_param, children => [] } for @family; 
    530530    push @{ $evtrees{ $_->{parent} }{children} }, $_ for sort { $a->{id} <=> $b->{id} } grep { $_->{parent} } values %evtrees; 
    531     for my $node (values %evtrees) { add_evolution_desc($node, $row->evchain) } 
     531    for my $node (values %evtrees) { add_evolution_desc($node, $row->evo_chain) } 
    532532    $s->{evtree} = ( grep { !$_->{parent} } values %evtrees )[0];  # should only be one with no parent: the root 
    533533    calculate_tree_width($s->{evtree}); 
    … …  
    547547    $s->{compatibility}{all}  = $compat_rs->count; 
    548548    # TODO: this is actually wrong; fix when bug #88 is fixed please 
    549     $s->{compatibility}{base} = $compat_rs->search({ evparent => 0 })->count; 
     549    $s->{compatibility}{base} = $compat_rs->search({ evo_parent_id => 0 })->count; 
    550550 
    551551    # held items 
    … …  
    563563    # moves from here down 
    564564    # slurp everything this Pokemon can learn, complete with egg moves if necessary 
    565     my $moves_rs = $c->model('DBIC::PokeMoves')->search( { 
    566         pokeid => $row->id, 
    567     }, { 
    568         columns => [qw/moveid method level version/] 
     565    my $moves_rs = $c->model('DBIC::PokemonMoves')->search( { 
     566        pokemon_id => $row->id, 
    569567    } ); 
    570568     
    … …  
    578576    while (my $move_row = $moves_rs->next) { 
    579577        my $table_row = { 
    580             moveid => $move_row->moveid, 
     578            move_id => $move_row->move_id, 
    581579            level => $move_row->level, 
    582             versions => { map { $_ => $move_row->level || 1 } split /,/, $move_row->version }, 
     580            versions => { map { $_ => $move_row->level || 1 } split /,/, $move_row->versions }, 
    583581        }; 
    584582 
    … …  
    595593    @{ $moves{$_} } = sort { 
    596594        $a->{level} <=> $b->{level} or 
    597         $MoveData[ $a->{moveid} ]->name cmp $MoveData[ $b->{moveid} ]->name 
     595        $MoveData[ $a->{move_id} ]->name cmp $MoveData[ $b->{move_id} ]->name 
    598596    } @{ $moves{$_} } for qw/ level egg machine /; 
    599597     
    … …  
    633631        my $i = -1; 
    634632        while (++$i <= $#$lev_moves) {  # shouldn't use a for since the size of the array changes 
    635             # find the next row index with the same moveid 
    636             my $next_idx = first { $lev_moves->[$_]{moveid} == $lev_moves->[$i]{moveid} } $i + 1 .. $#$lev_moves; 
     633            # find the next row index with the same move id 
     634            my $next_idx = first { $lev_moves->[$_]{move_id} == $lev_moves->[$i]{move_id} } $i + 1 .. $#$lev_moves; 
    637635            next if not defined $next_idx; 
    638636 
    … …  
    673671            } 
    674672            if (scalar keys %{ $from->{versions} } == 0) {   
    675                 # only moveid left, so delete this row and redo to hit the next one 
     673                # only move id left, so delete this row and redo to hit the next one 
    676674                splice @$lev_moves, $from_idx, 1; 
    677675                redo; 
    … …  
    704702        map { $_->generation => $_->text } $row->flavors 
    705703    }; 
    706     $s->{generation} = ( grep { $Generations[$_]{maxid} >= $row->real_id } 0 .. $#Generations )[0]; 
     704    $s->{generation} = ( grep { $Generations[$_]{maxid} >= $row->real_pokemon_id } 0 .. $#Generations )[0]; 
    707705 
    708706    $s->{page_title} = $row->name . ' - Flavor Text and Images'; 
    … …  
    785783        ? Vee::Utils::round( $c->model('DBIC::Moves')->count({ power => { '!=' => undef, '<' => $row->power } }) / $DamagingMoveCount * 100, 1 ) 
    786784        :'n/a'; 
    787     $s->{tm_info} = { map { $_->generation => $_ } $c->model('DBIC::Machines')->search({ moveid => $row->id }) }; 
     785    $s->{tm_info} = { map { $_->generation => $_ } $c->model('DBIC::Machines')->search({ move_id => $row->id }) }; 
    788786 
    789787    # status effect 
    … …  
    805803 
    806804    # contest stuffs 
    807     my $contest_family_rs = $c->model('DBIC::Moves')->search({ coneffect => $row->coneffect, id => { '!=', $row->id } }, { columns => [qw/id name contype/], order_by => 'name ASC' }); 
     805    my $contest_family_rs = $c->model('DBIC::Moves')->search({ contest_effect_id => $row->contest_effect_id, id => { '!=', $row->id } }, { columns => [qw/id name contest_type/], order_by => 'name ASC' }); 
    808806    my %contest_family; 
    809807    $s->{contest_family_count} = 0; 
    810808    while (my $move = $contest_family_rs->next) { 
    811         push @{ $contest_family{ $move->contype } }, $move; 
     809        push @{ $contest_family{ $move->contest_type } }, $move; 
    812810        $s->{contest_family_count}++; 
    813811    } 
    … …  
    818816    my %pokemon_count; 
    819817    my %valid_methods = map { $_ => 1 } qw/level egg tutor machine/; 
    820     my $pokemoves_rs = $c->model('DBIC::PokeMoves')->search({ moveid => $row->id }); 
     818    my $pokemoves_rs = $c->model('DBIC::PokemonMoves')->search({ move_id => $row->id }); 
    821819    my %pokemon_hash;  # method => pokemon id => version => level 
    822820    while (my $pm = $pokemoves_rs->next) { 
    … …  
    829827            @versions = ('all'); 
    830828        } else { 
    831             @versions = split /,/, $pm->version; 
     829            @versions = split /,/, $pm->versions; 
    832830        } 
    833831 
    834832        for my $ver (@versions) { 
    835             $pokemon_hash{$method}{$pm->pokeid}{pokemon} ||= $pm->pokemon; 
    836             $pokemon_hash{$method}{$pm->pokeid}{$ver} = $pm->level || 1; 
    837         } 
    838         $pokemon_count{ $pm->pokeid } = 1; 
     833            $pokemon_hash{$method}{$pm->pokemon_id}{pokemon} ||= $pm->pokemon; 
     834            $pokemon_hash{$method}{$pm->pokemon_id}{$ver} = $pm->level || 1; 
     835        } 
     836        $pokemon_count{ $pm->pokemon_id } = 1; 
    839837    } 
    840838 
    … …  
    903901    $c->forward('/cache', [ $row->id ]); 
    904902 
    905     $s->{hid}         = $row->internalid + 1; 
     903    $s->{hid}         = $row->internal_id + 1; 
    906904    $s->{generation}  = ($row->name eq 'dark' || $row->name eq 'steel') ? 1 : 0; 
    907905 
    … …  
    11901188    my @extra; 
    11911189    # n.b.: can ONLY prefetch one has_many here; DBIx::Class will refuse more due to cross-product effect 
    1192     if ($table eq 'Pokemon') { @extra = ( prefetch => [qw/evchain pokemoves/], order_by => 'pokemoves.moveid ASC' ) } 
    1193     elsif ($table eq 'Moves') { @extra = ( prefetch => 'pokemoves', order_by => 'pokemoves.pokeid ASC' ) } 
     1190    if ($table eq 'Pokemon') { @extra = ( prefetch => [qw/evo_chain pokemon_moves/], order_by => 'pokemon_moves.move_id ASC' ) } 
     1191    elsif ($table eq 'Moves') { @extra = ( prefetch => 'pokemon_moves', order_by => 'pokemon_moves.pokemon_id ASC' ) } 
    11941192     
    11951193    if ($id eq 'random') { 

  • veekun/trunk/lib/Vee/Controller/Dex/Search.pm

    r348 r406  
    4949    breed       => { type => 'select', options => [ [ 0 => 'n/a' ], map { [ $_ => ($_ ? "$_: " : '') . $BreedingGroups[$_] ] } 1 .. $#BreedingGroups ], count => 2 }, 
    5050    breed_mode  => { type => 'select', options => [ [ and => 'exactly' ], [ or => 'either of' ] ], default => 'or' }, 
    51     gender      => { type => 'select', options => [ [ any => 'anything' ], [ 255 => 'no gender' ], [ not255 => 'any gender' ], map { [ $_ => lc gender_text($_) ] } qw/0 31 63 127 191 254/ ] }, 
     51    gender_rate => { type => 'select', options => [ [ any => 'anything' ], [ 255 => 'no gender' ], [ not255 => 'any gender' ], map { [ $_ => lc gender_text($_) ] } qw/0 31 63 127 191 254/ ] }, 
    5252    ability     => { type => 'text', size => 20, title => 'Enter the name or number of an ability' }, 
    5353    color       => { type => 'select', options => [qw/any black blue brown gray green pink purple red white yellow/], title => 'I have no explanation for why this is here' }, 
    … …  
    123123            if ($ability) { 
    124124                $joins{pokemon_abilities} = 1; 
    125                 $criteria{'pokemon_abilities.abilityid'} = $ability->id; 
     125                $criteria{'pokemon_abilities.ability_id'} = $ability->id; 
    126126            } 
    127127        } 
    … …  
    142142 
    143143        # BREEDING AND STUFF 
    144         if (defined $p->{gender} and $p->{gender} ne 'any') { 
    145             if ($p->{gender} eq 'not255') { 
    146                 $criteria{'me.gender'} = { '!=' => 255 }; 
     144        if (defined $p->{gender_rate} and $p->{gender_rate} ne 'any') { 
     145            if ($p->{gender_rate} eq 'not255') { 
     146                $criteria{'me.gender_rate'} = { '!=' => 255 }; 
    147147            } else { 
    148                 $criteria{'me.gender'} = $p->{gender}; 
     148                $criteria{'me.gender_rate'} = $p->{gender_rate}; 
    149149            } 
    150150        } 
    … …  
    154154            $criteria{'breeds.breed'} = \@breeds; 
    155155            if ($p->{breed_mode} eq 'and') { 
    156                 $clauses{having}{'COUNT(DISTINCT breeds.pokeid, breeds.breed)'} = scalar @breeds; 
     156                $clauses{having}{'COUNT(DISTINCT breeds.pokemon_id, breeds.breed)'} = scalar @breeds; 
    157157 
    158158                if (@breeds == 1) { 
    … …  
    192192            for my $move (@{ $p->{move} }) { 
    193193                # XXX: show some message if a move is invalid? 
    194                 my $moveid = get_move($move); 
    195                 push @moveids, $moveid if defined $moveid; 
     194                my $move_id = get_move($move); 
     195                push @moveids, $move_id if defined $move_id; 
    196196            } 
    197197            if (@moveids) { 
    198                 $joins{pokemoves} = 1; 
    199                 $criteria{'pokemoves.moveid'} = \@moveids; 
    200                 $clauses{having}{'COUNT(DISTINCT pokemoves.pokeid, pokemoves.moveid)'} = scalar @moveids; 
     198                $joins{pokemon_moves} = 1; 
     199                $criteria{'pokemon_moves.move_id'} = \@moveids; 
     200                $clauses{having}{'COUNT(DISTINCT pokemon_moves.pokemon_id, pokemon_moves.move_id)'} = scalar @moveids; 
    201201 
    202202                if ($p->{move_method}) { 
    203                     $criteria{'pokemoves.method'} = $p->{move_method}; 
     203                    $criteria{'pokemon_moves.method'} = $p->{move_method}; 
    204204                } 
    205205                if ($p->{move_version}) { 
    206                     push @{$criteria{'-and'}}, { '-or', [ map { \ "FIND_IN_SET('$_', pokemoves.version)" } Vee::Utils::array($p->{move_version}) ] }; 
     206                    push @{$criteria{'-and'}}, { '-or', [ map { \ "FIND_IN_SET('$_', pokemon_moves.versions)" } Vee::Utils::array($p->{move_version}) ] }; 
    207207                } 
    208208            } 
    … …  
    237237 
    238238            if ($evo_stages{base}) { 
    239                 $criteria{'me.evparent'} = 0; 
     239                $criteria{'me.evo_parent_id'} = 0; 
    240240            } 
    241241 
    … …  
    308308}; 
    309309 
    310 for my $col (qw/power acc pp effect_chance priority/) { 
     310for my $col (qw/power accuracy pp effect_chance priority/) { 
    311311    for my $endpoint (keys %endpoints) { 
    312312        $move_search_fields->{ $col . '_' . $endpoint } = { type => 'text', size => 4, maxlength => 3, title => "\u$endpoints{$endpoint}{english} $col" }; 
    … …  
    366366            } 
    367367            if (@pokemonids) { 
    368                 $joins{pokemoves} = 1; 
    369                 $criteria{'pokemoves.pokeid'} = \@pokemonids; 
    370                 $clauses{having}{'COUNT(DISTINCT pokemoves.pokeid, pokemoves.moveid)'} = scalar @pokemonids; 
     368                $joins{pokemon_moves} = 1; 
     369                $criteria{'pokemon_moves.pokemon_id'} = \@pokemonids; 
     370                $clauses{having}{'COUNT(DISTINCT pokemon_moves.pokemon_id, pokemon_moves.move_id)'} = scalar @pokemonids; 
    371371 
    372372                if ($p->{move_method}) { 
    373                     $criteria{'pokemoves.method'} = $p->{move_method}; 
     373                    $criteria{'pokemon_moves.method'} = $p->{move_method}; 
    374374                } 
    375375                if ($p->{move_version}) { 
    376                     push @{$criteria{'-and'}}, { '-or', [ map { \ "FIND_IN_SET('$_', pokemoves.version)" } Vee::Utils::array($p->{move_version}) ] }; 
     376                    push @{$criteria{'-and'}}, { '-or', [ map { \ "FIND_IN_SET('$_', pokemon_moves.versions)" } Vee::Utils::array($p->{move_version}) ] }; 
    377377                } 
    378378            } 
    … …  
    380380 
    381381        # NUMBERS 
    382         for my $numbar (qw/power acc pp effect_chance priority/) { 
     382        for my $numbar (qw/power accuracy pp effect_chance priority/) { 
    383383            for my $endpoint (keys %endpoints) { 
    384384                my $value = $p->{$numbar . '_' . $endpoint}; 

  • veekun/trunk/lib/Vee/Controller/Dex/Utils.pm

    r371 r406  
    102102    my @pokemon; 
    103103 
    104     my (@rows, @pokemoves); 
     104    my (@rows, @pokemon_moves); 
    105105    # only do this if there are actually correct Pokemon to look up! 
    106106    if (@pokemon_ids) { 
    … …  
    116116         
    117117        # get moves 
    118         my $move_rs = $c->model('DBIC::PokeMoves')->search({ 
    119             pokeid => [ keys %pokemon_order ], 
    120             method => [qw/level machine egg tutor/], 
    121             -nest => \ "FIND_IN_SET('$version', version)", 
     118        my $move_rs = $c->model('DBIC::PokemonMoves')->search({ 
     119            pokemon_id => [ keys %pokemon_order ], 
     120            method     => [qw/level machine egg tutor/], 
     121            -nest      => \ "FIND_IN_SET('$version', versions)", 
    122122        }); 
    123123        while (my $row = $move_rs->next) { 
    124             push @{ $pokemoves[ $_ ]{ $row->method } }, $row for @{ $pokemon_order{$row->pokeid} } 
    125         } 
    126     } 
    127  
    128     $s->{pokemon}     = \@pokemon; 
    129     $s->{pokemon_raw} = \@pokemon_raw; 
    130     $s->{pokemoves}   = \@pokemoves; 
     124            push @{ $pokemon_moves[ $_ ]{ $row->method } }, $row for @{ $pokemon_order{$row->pokemon_id} } 
     125        } 
     126    } 
     127 
     128    $s->{pokemon}       = \@pokemon; 
     129    $s->{pokemon_raw}   = \@pokemon_raw; 
     130    $s->{pokemon_moves} = \@pokemon_moves; 
    131131 
    132132    $s->{template} = 'dex/utils/compare-results.tt'; 
    … …  
    173173    # ensure this move is actually inheritable 
    174174    # TODO: should I error if the move is learnable normally? 
    175     my $inheritable_ct = $c->model('DBIC::PokeMoves')->count({ 
    176         pokeid => $pokemon->id, 
    177         moveid => $move->id, 
    178         method => [qw/ egg machine /], 
    179         -nest  => \ "FIND_IN_SET('$gen', version)", 
     175    my $inheritable_ct = $c->model('DBIC::PokemonMoves')->count({ 
     176        pokemon_id => $pokemon->id, 
     177        move_id    => $move->id, 
     178        method     => [qw/ egg machine /], 
     179        -nest      => \ "FIND_IN_SET('$gen', versions)", 
    180180    }); 
    181181    $c->vee_stop('', $pokemon->name, " can't inherit ", $move->name, '.') unless $inheritable_ct; 
    182182     
    183183    my $gender_restriction; 
    184     if ($pokemon->gender == 255) { 
     184    if ($pokemon->gender_rate == 255) { 
    185185        # must also be genderless, i.e. bred with Ditto 
    186186        $gender_restriction = 255; 
    … …  
    192192    ### grab the methods by which any Pokemon learn the move 
    193193 
    194     my $methods_rs = $c->model('DBIC::PokeMoves')->search({ 
    195         moveid => $move->id, 
    196         method => [qw[ level egg machine ]], 
    197         -nest => \ "FIND_IN_SET('$gen', version)", 
    198         'pokemon.gender' => $gender_restriction, 
     194    my $methods_rs = $c->model('DBIC::PokemonMoves')->search({ 
     195        move_id => $move->id, 
     196        method  => [qw[ level egg machine ]], 
     197        -nest   => \ "FIND_IN_SET('$gen', versions)", 
     198        'pokemon.gender_rate' => $gender_restriction, 
    199199    }, { 
    200200        join => 'pokemon', 
    … …  
    208208            $method = 'TM/HM'; 
    209209        } 
    210         push @{ $learn_methods{ $row->pokeid } }, $method; 
     210        push @{ $learn_methods{ $row->pokemon_id } }, $method; 
    211211    } 
    212212 
    … …  
    259259        my %branches; 
    260260 
    261         while (my $pokeid = shift @this_level) { 
    262             my $this_poke = $pokemon{$pokeid}; 
     261        while (my $pokemon_id = shift @this_level) { 
     262            my $this_poke = $pokemon{$pokemon_id}; 
    263263            my $hashref = shift @this_level; 
    264264 
    265             for my $pokeid (keys %pokemon) { 
    266                 next if not $this_poke->can_breed_with( $pokemon{$pokeid} ); 
    267  
    268                 if (exists $seen{ $pokeid }) { 
     265            for my $pokemon_id (keys %pokemon) { 
     266                next if not $this_poke->can_breed_with( $pokemon{$pokemon_id} ); 
     267 
     268                if (exists $seen{ $pokemon_id }) { 
    269269                    # don't put anything if this Pokemon has been seen higher 
    270270                    # in the chain; needless descending is bad 
    271                     $hashref->{ $pokeid } = undef 
    272                         unless $seen{ $pokeid } < $cur_level; 
     271                    $hashref->{ $pokemon_id } = undef 
     272                        unless $seen{ $pokemon_id } < $cur_level; 
    273273                } else { 
    274                     $hashref->{ $pokeid } = ( $branches{$pokeid} ||= {} ); 
    275                     $seen{ $pokeid } = $cur_level; 
     274                    $hashref->{$pokemon_id} = ( $branches{$pokemon_id} ||= {} ); 
     275                    $seen{$pokemon_id} = $cur_level; 
    276276                } 
    277277            } 

  • veekun/trunk/lib/Vee/Controller/Forum.pm

    r386 r406  
    5858 
    5959    $s->{announcements_rs} = $c->model('DBIC::Threads')->search_announcements; 
    60     $s->{forums_rs}        = $c->model('DBIC::Forums')->search(undef, { prefetch => { lastpost => 'user' } }); 
     60    $s->{forums_rs}        = $c->model('DBIC::Forums')->search(undef, { prefetch => { last_post => 'user' } }); 
    6161 
    6262    # Grab a list of forums with unread threads 
    … …  
    9797    $s->{skip}             = $skip; 
    9898    $s->{threads_rs}       = $forum->search_related('threads', undef, { 
    99         order_by => 'FIND_IN_SET("sticky", me.flags) > 0 DESC, lastpost.time DESC', 
    100         prefetch => { firstpost => 'user', lastpost => 'user' }, 
     99        order_by => 'FIND_IN_SET("sticky", me.flags) > 0 DESC, last_post.time DESC', 
     100        prefetch => { first_post => 'user', last_post => 'user' }, 
    101101        offset   => $skip, 
    102102        rows     => $perpage, 
    … …  
    117117    # form generation stuff 
    118118    my $reply_fields = { 
    119         message => { type => 'textarea', rows => '10', cols => '100' }, 
     119        content => { type => 'textarea', rows => '10', cols => '100' }, 
    120120        id => { type => 'hidden' }, 
    121121        subject => { type => 'text', maxlength => 48 }, 
    … …  
    148148    my $thread = $c->model('DBIC::Threads')->find($id, { prefetch => 'forum' }) 
    149149        or $c->vee_abort('There is no thread with id ', $id, '.'); 
    150     $thread->hitct( $thread->hitct + 1 ); $thread->update; 
     150    $thread->view_count( $thread->view_count + 1 ); $thread->update; 
    151151 
    152152    if ($thread->flags =~ /deleted/ and not $c->can_i(override_thread_deleted => $thread->forum->id)) { 
    … …  
    161161        $filter_user = $c->model('DBIC::Users')->search({ name => $filter })->first; 
    162162        if ($filter_user) { 
    163             my $posts_shown = $c->model('DBIC::Posts')->count({ threadid => $id, userid => $filter_user->id }); 
     163            my $posts_shown = $c->model('DBIC::Posts')->count({ thread_id => $id, user_id => $filter_user->id }); 
    164164        } else { 
    165165            push @{ $s->{error_msg} }, "Can't find user " . $c->vee_cleanse($filter) . " in the database."; 
    … …  
    169169     
    170170    my $perpage = $c->site_opts->{page_sizes}{posts}; 
    171     my $lastpage = ($skip + $perpage >= $thread->postct); 
     171    my $lastpage = ($skip + $perpage >= $thread->post_count); 
    172172    my $posts_rs = $c->model('DBIC::Posts')->search( 
    173         { 'me.threadid' => $id, ( $filter_user ? ( 'me.userid' => $filter_user->id ) : () ) }, 
     173        { 'me.thread_id' => $id, ( $filter_user ? ( 'me.user_id' => $filter_user->id ) : () ) }, 
    174174        { prefetch => [ 'user', { 'lastedit', 'user' } ], order_by => 'me.time ASC', offset => $skip, rows => $perpage + 1 } 
    175175    ); 
    176     my $postct = $c->model('DBIC::Posts')->count({ 'me.threadid' => $id, ( $filter_user ? ( 'me.userid' => $filter_user->id ) : () ) }); 
     176    my $post_count = $c->model('DBIC::Posts')->count({ 'me.thread_id' => $id, ( $filter_user ? ( 'me.user_id' => $filter_user->id ) : () ) }); 
    177177    my @flags = split /,/, $thread->flags; 
    178178         
    … …  
    211211    # form generation stuff 
    212212    my $reply_fields = { 
    213         message => { type => 'textarea', rows => '10', cols => '100' }, 
     213        content => { type => 'textarea', rows => '10', cols => '100' }, 
    214214        id => { type => 'hidden' }, 
    215215    }; 
    … …  
    236236    $s->{page_islast} = $lastpage; 
    237237    $s->{posts_rs}    = $posts_rs; 
    238         $s->{postct}      = $postct; 
     238    $s->{post_count}  = $post_count; 
    239239    $s->{skip}        = $skip; 
    240240    $s->{filter}      = $filter; 
    … …  
    257257    # slurp up the number of (visible) posts before the requested one 
    258258    my $offset = $c->model('DBIC::Posts')->count({ 
    259         threadid => $post->threadid, 
     259        thread_id => $post->thread_id, 
    260260        -or => [ 
    261261            { time => $post->time, id => { '<', $post->id } }, 
    … …  
    266266    my $perpage = $c->site_opts->{page_sizes}{posts}; 
    267267    my $skip = $offset - $offset % $perpage; 
    268     $c->res->redirect( $c->uri('Forum', 'thread', $post->threadid, ($skip ? { skip => $skip } : ()) ) . "#p$id" ); 
     268    $c->res->redirect( $c->uri('Forum', 'thread', $post->thread_id, ($skip ? { skip => $skip } : ()) ) . "#p$id" ); 
    269269} 
    270270 
    … …  
    276276 
    277277sub thread_flags : LocalRegex('^thread/(\d*)/(announcement|sticky|locked)') : Args(0) { 
    278     my ( $self, $c ) = @_; 
    279     my ( $threadid, $flag ) = @{ $c->req->captures }; 
    280  
    281     my $thread = $c->model('DBIC::Threads')->find($threadid); 
     278    my ($self, $c) = @_; 
     279    my ($thread_id, $flag) = @{ $c->req->captures }; 
     280 
     281    my $thread = $c->model('DBIC::Threads')->find($thread_id); 
    282282 
    283283    toggleflag($thread, $flag) 
    284284        or $c->vee_abort("Whoops! Error setting flag '", $flag, "'. Not much more can be said about this."); 
    285     $c->res->redirect($c->uri('Forum', 'thread', $threadid)); 
     285    $c->res->redirect($c->uri('Forum', 'thread', $thread_id)); 
    286286} 
    287287 

  • veekun/trunk/lib/Vee/Controller/Forum/Create.pm

    r384 r406  
    5050 
    5151    # TODO: make these redir to an actual post page when one exists 
    52     $c->vee_abort('Please enter a message.') unless $c->req->params->{message} =~ /\S/; 
     52    $c->vee_abort('Please enter a message.') unless $c->req->params->{content} =~ /\S/; 
    5353    $c->vee_abort('No thread id specified.  This should not happen.  Sorry?') unless $c->req->params->{id}; 
    5454 
    … …  
    6060    } 
    6161 
    62     my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $c->req->params->{message} ); 
     62    my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $c->req->params->{content} ); 
    6363    if (@bbcode_errors) { 
    6464        $c->vee_abort("Your post contains invalid bbcode.  Please go back and fix it."); 
    … …  
    7373    # TODO: apply this to thread creation too?  not as common..  and merge as well? 
    7474    my $last_post = $c->model('DBIC::Posts')->search({ 
    75         threadid => $thread->id, 
    76         time     => { '>=', time - $c->site_opts->{post_automerge_time} }, 
     75        thread_id => $thread->id, 
     76        time      => { '>=', time - $c->site_opts->{post_automerge_time} }, 
    7777    }, { 
    78         order_by => 'time DESC', 
     78        order_by  => 'time DESC', 
    7979    })->single; 
    8080 
    8181    my $post; 
    8282    # only do merging/prevention if the last post is this user's         
    83     if ($last_post and $last_post->userid == $c->user->obj->id and $last_post->flags !~ /deleted/) { 
    84         if ($last_post->message eq $parsed_message) { 
     83    if ($last_post and $last_post->user_id == $c->user->obj->id and $last_post->flags !~ /deleted/) { 
     84        if ($last_post->content eq $parsed_message) { 
    8585            $c->vee_abort("You have already posted that message recently."); 
    8686        } 
    … …  
    9090        $post = $c->model('DBIC')->schema->txn_do( sub { 
    9191            my $edit = $c->model('DBIC::Edits')->create({ 
    92                 postid     => $last_post->id, 
    93                 userid     => $c->user->obj->id, 
    94                 time       => time, 
    95                 oldmessage => $last_post->message, 
     92                post_id     => $last_post->id, 
     93                user_id     => $c->user->obj->id, 
     94                time        => time, 
     95                old_content => $last_post->content, 
    9696            }); 
    97             $last_post->message( 
    98                 $last_post->message . 
     97            $last_post->content( 
     98                $last_post->content . 
    9999                "\n[hr][i]Automerged:[/i]\n" . 
    100100                $parsed_message 
    101101            ); 
    102             $last_post->lasteditid( $edit->id ); 
     102            $last_post->last_edit_id( $edit->id ); 
    103103            $last_post->time( time ); 
    104104            $last_post->update; 
    105105 
    106             $thread->lastpostid( $last_post->id ); 
    107             $thread->lasttime( time ); 
     106            $thread->last_post_id( $last_post->id ); 
     107            $thread->last_post_time( time ); 
    108108            $thread->update; 
    109109 
    … …  
    114114        $post = $c->model('DBIC')->schema->txn_do( sub { 
    115115            my $post = $c->model('DBIC::Posts')->create({ 
    116                 threadid => $thread->id, 
    117                 userid   => $c->user->obj->id, 
    118                 time     => time, 
    119                 format   => 'bbcode', 
    120                 message  => $parsed_message, 
     116                thread_id => $thread->id, 
     117                user_id   => $c->user->obj->id, 
     118                time      => time, 
     119                format    => 'bbcode', 
     120                content   => $parsed_message, 
    121121            }); 
    122122            # update thread's last-post stats 
    123             $thread->lastpostid( $post->id ); 
    124             $thread->lasttime( time ); 
    125             $thread->postct( $thread->postct + 1 ); 
     123            $thread->last_post_id( $post->id ); 
     124            $thread->last_post_time( time ); 
     125            $thread->post_count( $thread->post_count + 1 ); 
    126126            $thread->update; 
    127127            # update forum's last-post stats 
    128             $thread->forum->lastpostid( $post->id ); 
    129             $thread->forum->postct( $thread->forum->postct + 1 ); 
     128            $thread->forum->last_post_id( $post->id ); 
     129            $thread->forum->post_count( $thread->forum->post_count + 1 ); 
    130130            $thread->forum->update; 
    131131            # update user's postcount 
    132             $c->user->obj->postct( $c->user->postct + 1 ); 
     132            $c->user->obj->post_count( $c->user->post_count + 1 ); 
    133133            $c->user->obj->update; 
    134134            return $post; 
    … …  
    149149    my $s = $c->stash; 
    150150 
    151     my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $c->req->params->{message} ); 
     151    my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $c->req->params->{content} ); 
    152152    if (@bbcode_errors) { 
    153153        $c->vee_abort("Your post contains invalid bbcode.  Please go back and fix it."); 
    … …  
    156156     
    157157    my $rows = $c->site_opts->{page_sizes}{posts_preview}; 
    158     my $offset = $c->model('DBIC::Posts')->count({ threadid => $thread->id }, { order_by => 'me.time ASC' } ); 
     158    my $offset = $c->model('DBIC::Posts')->count({ thread_id => $thread->id }, { order_by => 'me.time ASC' } ); 
    159159    $offset = $offset - $rows; 
    160160 
    161     my $posts_rs = $c->model('DBIC::Posts')->search({ threadid => $thread->id }, { 
     161    my $posts_rs = $c->model('DBIC::Posts')->search({ thread_id => $thread->id }, { 
    162162        order_by => 'me.time ASC', 
    163163        offset   => $offset, 
    … …  
    167167    # form generation stuff 
    168168    my $reply_fields = { 
    169         message => { type => 'textarea', rows => '10', cols => '100' }, 
     169        content => { type => 'textarea', rows => '10', cols => '100' }, 
    170170        id => { type => 'hidden' }, 
    171171    }; 
    … …  
    207207 
    208208    # TODO: make these redir to an actual post page when one exists 
    209     $c->vee_abort("You must enter a message.") unless $c->req->params->{message} =~ /\S/; 
     209    $c->vee_abort("You must enter a message.") unless $c->req->params->{content} =~ /\S/; 
    210210    $c->vee_abort("You must enter a subject.") unless $c->req->params->{subject} =~ /\S/; 
    211211     
    212     my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $c->req->params->{message} ); 
     212    my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $c->req->params->{content} ); 
    213213    if (@bbcode_errors) { 
    214214        $c->detach('thread_preview'); 
    … …  
    229229    my $thread = $c->model('DBIC')->schema->txn_do( sub { 
    230230        my $thread = $c->model('DBIC::Threads')->create({ 
    231             forumid     => $forum->id, 
    232             subject     => $subject, 
    233             firstpostid => 0, 
    234             lastpostid  => 0, 
    235             lasttime    => time, 
    236             postct      => 1, 
    237             blurb       => $blurb, 
     231            forum_id       => $forum->id, 
     232            subject        => $subject, 
     233            first_post_id => 0, 
     234            last_post_id   => 0, 
     235            last_post_time => time, 
     236            post_count     => 1, 
     237            blurb          => $blurb, 
    238238        }); 
    239239        # create the post 
    240240        my $post = $c->model('DBIC::Posts')->create({ 
    241             threadid => $thread->id, 
    242             userid   => $c->user->obj->id, 
    243             time     => time, 
    244             format   => 'bbcode', 
    245             message  => Vee::Utils::fix_newlines( $parsed_message ), 
     241            thread_id => $thread->id, 
     242            user_id   => $c->user->obj->id, 
     243            time      => time, 
     244            format    => 'bbcode', 
     245            content   => Vee::Utils::fix_newlines( $parsed_message ), 
    246246        }); 
    247247        # update thread's last-post stats 
    248         $thread->firstpostid( $post->id ); 
    249         $thread->lastpostid( $post->id ); 
     248        $thread->first_post_id( $post->id ); 
     249        $thread->last_post_id( $post->id ); 
    250250        $thread->update; 
    251251        # update forum's last-post stats 
    252         $forum->lastpostid( $post->id ); 
    253         $forum->postct( $forum->postct + 1 ); 
    254         $forum->threadct( $forum->threadct + 1 ); 
     252        $forum->last_post_id( $post->id ); 
     253        $forum->post_count( $forum->post_count + 1 ); 
     254        $forum->thread_count( $forum->thread_count + 1 ); 
    255255        $forum->update; 
    256256        # update user's postcount 
    257         $c->user->obj->postct( $c->user->postct + 1 ); 
     257        $c->user->obj->post_count( $c->user->post_count + 1 ); 
    258258        $c->user->obj->update; 
    259259        return $thread; 
    … …  
    275275    my $subject = $c->req->params->{subject}; 
    276276    my $blurb   = $c->req->params->{blurb}; 
    277     my $message = $c->req->params->{message}; 
     277    my $content = $c->req->params->{content}; 
    278278    my $forum = $c->model('DBIC::Forums')->find( $c->req->params->{id} ) 
    279279        or $c->vee_abort('There is no forum with an id of ', $c->req->params->{id}, '.  It may have been deleted while you were typing?'); 
    … …  
    283283    } 
    284284     
    285     my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $message ); 
     285    my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode($content); 
    286286    if (@bbcode_errors) { 
    287287        $c->vee_abort("Your post contains invalid bbcode.  Please fix it."); 
    … …  
    290290    # form generation stuff 
    291291    my $reply_fields = { 
    292         message => { type => 'textarea', rows => '10', cols => '100' }, 
     292        content => { type => 'textarea', rows => '10', cols => '100' }, 
    293293        id => { type => 'hidden' }, 
    294294        subject => { type => 'text', maxlength => 48 }, 

  • veekun/trunk/lib/Vee/Controller/Forum/Post.pm

    r327 r406  
    5151sub utils : LocalRegex('^(\d*)/(delete|undelete|nuke)') : Args(0) { 
    5252    my ( $self, $c ) = @_; 
    53     my ($postid, $method) = @{ $c->req->captures }; 
    54      
    55     my $forumid = undef; 
     53    my ($post_id, $method) = @{ $c->req->captures }; 
     54     
     55    my $forum_id = undef; 
    5656    # This is the post to be deleted, as well as the entire result set of things to be modified 
    57     my $post = $c->model('DBIC::Posts')->find({ 'me.id' => $postid }, { prefetch => ['user', { 'thread' => 'forum' }], }) 
    58         or $c->vee_abort("There is no post with id of ", $postid, ". Perhaps another admin nuked it?"); 
    59     $c->vee_abort("The post with id of ", $postid, " has already been ", $method, "d.") 
     57    my $post = $c->model('DBIC::Posts')->find({ 'me.id' => $post_id }, { prefetch => ['user', { 'thread' => 'forum' }], }) 
     58        or $c->vee_abort("There is no post with id of ", $post_id, ". Perhaps another admin nuked it?"); 
     59    $c->vee_abort("The post with id of ", $post_id, " has already been ", $method, "d.") 
    6060        if (($post->flags =~ /deleted/ && $method eq 'delete') || ($post->flags !~ /deleted/ && $method eq 'undelete')); 
    6161    $c->vee_abort("You don't have permission to ", $method, " this post.") 
    62         unless (($c->user->obj->id == $post->userid && $method ne 'nuke') || $c->can_i("post$method")); 
     62        unless (($c->user->obj->id == $post->user_id && $method ne 'nuke') || $c->can_i("post$method")); 
    6363 
    6464    # Do everything in a transaction for rollback purposes 
    … …  
    6666        my ($thread, $forum, $user) = ($post->thread, $post->thread->forum, $post->user); 
    6767        # If any of the post (or thread) counts are 0 or less, this will break. Of course, if that's the case, something is broken 
    68         return undef unless (($forum->postct >= 0 || $forum->threadct >= 0 || $thread->postct >= 0 || $user->postct >= 0) || ($method eq 'undelete')); 
    69         my $thread_postct = $c->model('DBIC::Posts')->count({ 'me.threadid' => $post->threadid, 'me.flags' => { '!=', 'deleted' } }); 
     68        return undef unless (($forum->post_count >= 0 || $forum->thread_count >= 0 || $thread->post_count >= 0 || $user->post_count >= 0) || ($method eq 'undelete')); 
     69        my $thread_postct = $c->model('DBIC::Posts')->count({ 'me.thread_id' => $post->thread_id, 'me.flags' => { '!=', 'deleted' } }); 
    7070        # Unfortunately, this must be done here, since this needs to include deleted posts as well 
    71         my ($lastpostid, $lasttime) = ((map {($_->id)} $c->model('DBIC::Posts')->search({ 'thread.forumid' => $forum->id, 'me.threadid' => $post->threadid }, { prefetch => 'thread', columns => [qw/me.id me.threadid thread.forumid/], order_by => 'me.time DESC' })), undef); 
    72  
    73         if ($method eq 'nuke') { $c->model('DBIC::Posts')->search({ 'me.id' => $postid})->delete; } 
     71        my ($last_post_id, $last_post_time) = ((map {($_->id)} $c->model('DBIC::Posts')->search({ 'thread.forum_id' => $forum->id, 'me.thread_id' => $post->thread_id }, { prefetch => 'thread', columns => [qw/me.id me.thread_id thread.forum_id/], order_by => 'me.time DESC' })), undef); 
     72 
     73        if ($method eq 'nuke') { $c->model('DBIC::Posts')->search({ 'me.id' => $post_id })->delete; } 
    7474        else { toggleflag( $post, 'deleted' ) or return undef; }  
    7575 
    7676        # If there's only one post left, delete the thread as well 
    77         if ($thread_postct > 1 && $lastpostid == $post->id) { 
    78             ($lasttime, $lastpostid) = map {($_->time, $_->id)} $c->model('DBIC::Posts')->search({ 'thread.forumid' => $forum->id, 'me.threadid' => $post->threadid, 'me.flags' => { '!=', 'deleted' } }, { prefetch => 'thread', rows => 1, order_by => 'me.time DESC' }); 
     77        if ($thread_postct > 1 && $last_post_id == $post->id) { 
     78            ($last_post_time, $last_post_id) = map {($_->time, $_->id)} $c->model('DBIC::Posts')->search({ 'thread.forum_id' => $forum->id, 'me.thread_id' => $post->thread_id, 'me.flags' => { '!=', 'deleted' } }, { prefetch => 'thread', rows => 1, order_by => 'me.time DESC' }); 
    7979        } elsif ($thread_postct <= 1) { 
    8080            #try moving this elsewhere later, i hate it here 
    81             if ($method eq 'nuke') { $c->model('DBIC::Threads')->search({ 'me.id' => $post->threadid })->delete; } 
     81            if ($method eq 'nuke') { $c->model('DBIC::Threads')->search({ 'me.id' => $post->thread_id })->delete; } 
    8282            elsif (($method eq 'undelete' && $thread_postct == 0) || ($method eq 'delete' && $thread_postct <= 1)) { 
    8383                toggleflag( $thread, 'deleted' ) or return undef; 
    8484            } 
    85             ($lasttime, $lastpostid) = map {($_->time, $_->id)} $c->model('DBIC::Posts')->search({ 'thread.forumid' => $forum->id, 'thread.flags' => { '!=', 'deleted' }, 'me.flags' => { '!=', 'deleted' } }, { prefetch => 'thread', rows => 1, order_by => 'me.time DESC' }); 
    86             $forumid = $forum->id; 
    87             $lastpostid = 0 unless $lastpostid; 
     85            ($last_post_time, $last_post_id) = map {($_->time, $_->id)} $c->model('DBIC::Posts')->search({ 'thread.forum_id' => $forum->id, 'thread.flags' => { '!=', 'deleted' }, 'me.flags' => { '!=', 'deleted' } }, { prefetch => 'thread', rows => 1, order_by => 'me.time DESC' }); 
     86            $forum_id = $forum->id; 
     87            $last_post_id = 0 unless $last_post_id; 
    8888        } 
    8989             
    9090        if (($method eq 'nuke' && $post->flags !~ /deleted/) || ($method eq 'delete')) {  
    91             $thread->postct($thread->postct - 1); 
    92             $forum->postct($forum->postct - 1); 
    93             $forum->threadct($forum->threadct - 1) unless ($thread_postct > 1); 
    94             $user->postct($user->postct - 1); 
     91            $thread->post_count($thread->post_count - 1); 
     92            $forum->post_count($forum->post_count - 1); 
     93            $forum->thread_count($forum->thread_count - 1) unless ($thread_postct > 1); 
     94            $user->post_count($user->post_count - 1); 
    9595        } elsif ($method eq 'undelete') { 
    96             $thread->postct($thread->postct + 1); 
    97             $forum->postct($forum->postct + 1); 
    98             $forum->threadct($forum->threadct + 1) unless ($thread_postct > 1); 
    99             $user->postct($user->postct + 1); 
    100         } 
    101         # Only update lastpost and lasttime if this is actually the last post 
    102         if ($lasttime && $post->id == $thread->lastpostid) { 
    103             $thread->lastpostid($lastpostid); 
    104             $thread->lasttime($lasttime); 
     96            $thread->post_count($thread->post_count + 1); 
     97            $forum->post_count($forum->post_count + 1); 
     98            $forum->thread_count($forum->thread_count + 1) unless ($thread_postct > 1); 
     99            $user->post_count($user->post_count + 1); 
     100        } 
     101        # Only update last post and time if this is actually the last post 
     102        if ($last_post_time && $post->id == $thread->last_post_id) { 
     103            $thread->last_post_id($last_post_id); 
     104            $thread->last_post_time($last_post_time); 
    105105        } 
    106106        # Needs to be done here, in case the deleted post is the last post in a forum :( 
    107         $forum->lastpostid($lastpostid) if $post->id == $forum->lastpostid; 
     107        $forum->last_post_id($last_post_id) if $post->id == $forum->last_post_id; 
    108108        $thread->update if ($method ne 'nuke'); 
    109109        $forum->update; 
    … …  
    114114 
    115115    $c->error("This error message should never be displayed unless someone is screwing with things; sorry.") unless $action; 
    116     $c->res->redirect("/forum/" . (($forumid) ? "$forumid" : "post/$postid")); 
     116    $c->res->redirect("/forum/" . (($forum_id) ? "$forum_id" : "post/$post_id")); 
    117117} 
    118118 
    … …  
    125125sub edits : LocalRegex('^(\d*)/edits') { 
    126126    my ($self, $c) = @_; 
    127     my ($s, $postid) = ($c->stash, $c->req->captures->[0]); 
     127    my ($s, $post_id) = ($c->stash, $c->req->captures->[0]); 
    128128     
    129129    $c->vee_abort("You don't have permission to view post edits.") unless ($c->can_i('post_edits')); 
    130130 
    131     my $post   = $c->model('DBIC::Posts')->find({ 'me.id' => $postid}, { prefetch => [qw/user edits/, { thread => 'forum' }], order_by => 'edits.time DESC' }); 
     131    my $post   = $c->model('DBIC::Posts')->find({ 'me.id' => $post_id}, { prefetch => [qw/user edits/, { thread => 'forum' }], order_by => 'edits.time DESC' }); 
    132132     
    133133    $s->{post}      = $post; 
    … …  
    143143 
    144144my $reply_fields = { 
    145     message => { type => 'textarea', rows => '10', cols => '100' }, 
     145    content => { type => 'textarea', rows => '10', cols => '100' }, 
    146146    id => { type => 'hidden' }, 
    147147}; 
    … …  
    149149sub edit : LocalRegex('^(\d*)/edit') : Args(0) { 
    150150    my ($self, $c) = @_; 
    151     my ($s, $postid) = ($c->stash, $c->req->captures->[0]); 
    152      
    153     my $post_rs = $c->model('DBIC::Posts')->search({ 'me.id' => $postid }, { prefetch => 'user' })->single; 
     151    my ($s, $post_id) = ($c->stash, $c->req->captures->[0]); 
     152     
     153    my $post_rs = $c->model('DBIC::Posts')->search({ 'me.id' => $post_id }, { prefetch => 'user' })->single; 
    154154    $c->vee_abort("You must be logged in to edit posts.") unless $c->user; 
    155     $c->vee_abort("You don't have permission to edit posts.") unless ($c->can_i('post_edit') || $c->user->obj->id == $post_rs->userid); 
     155    $c->vee_abort("You don't have permission to edit posts.") unless ($c->can_i('post_edit') || $c->user->obj->id == $post_rs->user_id); 
    156156     
    157157    # Form submited stuff 
    158158    if ('post' eq lc $c->req->params->{submit}) { 
    159         my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $c->req->params->{message} ); 
     159        my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $c->req->params->{content} ); 
    160160        if (@bbcode_errors) { 
    161161            $c->vee_abort("Your post contains invalid bbcode.  Please go back and fix it."); 
    … …  
    164164         
    165165        # If post wasn't edited, don't do anything further; results in redirect only 
    166         unless ($parsed_message eq $post_rs->message) { 
     166        unless ($parsed_message eq $post_rs->content) { 
    167167            my $post = $c->model('DBIC')->schema->txn_do( sub { 
    168168                my $edit = $c->model('DBIC::Edits')->create({ 
    169                     postid     => $post_rs->id, 
    170                     userid     => $c->user->obj->id, 
    171                     time       => time, 
    172                     oldmessage => $post_rs->message, 
     169                    post_id     => $post_rs->id, 
     170                    user_id     => $c->user->obj->id, 
     171                    time        => time, 
     172                    old_content => $post_rs->content, 
    173173                }); 
    174174                 
    175                 $post_rs->lasteditid( $edit->id ); 
    176                 $post_rs->message( $parsed_message ); 
     175                $post_rs->last_edit_id( $edit->id ); 
     176                $post_rs->content($parsed_message); 
    177177                $post_rs->update; 
    178178                 
    … …  
    189189        copy_params => 1, 
    190190    ); 
    191     $form->force( id => $post_rs->threadid ); 
    192     $form->force( message => $c->req->params->{message} || $post_rs->message || '' ); 
     191    $form->force( id => $post_rs->thread_id ); 
     192    $form->force( content => $c->req->params->{content} || $post_rs->content || '' ); 
    193193     
    194194    $s->{page_header} = "Edit Post"; 

  • veekun/trunk/lib/Vee/Controller/Index.pm

    r386 r406  
    3131my $shoutbox_fields = { 
    3232    name => { type => 'text', size => 20, maxlength => 20 }, 
    33     message => { type => 'textarea', rows => 3, cols => 20 }, 
     33    content => { type => 'textarea', rows => 3, cols => 20 }, 
    3434}; 
    3535 
    … …  
    4545    my $page_sizes = $c->site_opts->{page_sizes}{index}; 
    4646 
    47     $s->{recent_news}   = $news_forum->threads( undef, { prefetch => 'firstpost', order_by => 'me.id DESC', rows => $page_sizes->{news} } ); 
     47    $s->{recent_news}   = $news_forum->threads( undef, { prefetch => 'first_post', order_by => 'me.id DESC', rows => $page_sizes->{news} } ); 
    4848    $s->{recent_news}   = $s->{recent_news}->search(\ 'NOT FIND_IN_SET("deleted", me.flags)') unless $c->can_i(override_thread_deleted => $news_forum->id); 
    4949 
    … …  
    5555    $threads_rs        = $threads_rs->search({ 'me.flags' => { '!=', 'deleted' } }) unless $c->can_i('override_thread_deleted'); 
    5656    $s->{recent_posts} = $threads_rs->search( undef, { 
    57         order_by => 'lastpost.time DESC', 
     57        order_by => 'last_post.time DESC', 
    5858        rows => $page_sizes->{forum}, 
    59         prefetch => { lastpost => 'user' }, 
     59        prefetch => { last_post => 'user' }, 
    6060    } ); 
    6161 
    6262    # NOT FIND_IN_SET breaks here; why? 
    63     $s->{recent_posts}  = $s->{recent_posts}->search({ 'lastpost.flags' => { '!=', 'deleted' } }) unless $c->can_i('override_thread_deleted'); 
     63    $s->{recent_posts}  = $s->{recent_posts}->search({ 'last_post.flags' => { '!=', 'deleted' } }) unless $c->can_i('override_thread_deleted'); 
    6464 
    6565    # Grab a list of unread threads 
    … …  
    102102 
    103103    $s->{recent_users} = $c->model('DBIC::Users')->search( 
    104         { lastactive => { '>', time - $c->site_opts->{user_activity_timeout} } }, 
    105         { order_by => 'me.lastactive DESC' } 
     104        { time_active => { '>', time - $c->site_opts->{user_activity_timeout} } }, 
     105        { order_by => 'me.time_active DESC' } 
    106106    );     
    107107 

  • veekun/trunk/lib/Vee/Controller/Root.pm

    r363 r406  
    4949    $storage->debug(1); 
    5050 
    51     if ($c->user) { $c->user->obj->lastactive(time); $c->user->obj->update; } 
     51    if ($c->user) { $c->user->obj->time_active(time); $c->user->obj->update; } 
    5252     
    5353    if ($c->flash and %{$c->flash}) { 
    … …  
    9797        eval { 
    9898            $c->model('DBIC::ErrorLog')->create({ 
    99                 time   => time, 
    100                 userid => $c->user ? $c->user->obj->id : 0, 
    101                 ip     => Vee::Utils::inet_aton($c->req->address), 
    102                 path   => $c->req->path, 
    103                 method => $c->req->method, 
    104                 query  => Dumper($c->req->params), 
    105                 error  => join "\n", @{$c->error}, 
     99                time    => time, 
     100                user_id => $c->user ? $c->user->obj->id : 0, 
     101                ip      => Vee::Utils::inet_aton($c->req->address), 
     102                path    => $c->req->path, 
     103                method  => $c->req->method, 
     104                query   => Dumper($c->req->params), 
     105                error   => join "\n", @{$c->error}, 
    106106            }); 
    107107        }; 

  • veekun/trunk/lib/Vee/Controller/Shoutbox.pm

    r288 r406  
    5959    my $s = $c->stash; 
    6060 
    61     my $message = Vee::Utils::fix_newlines( $c->req->params->{message} ); 
     61    my $content = Vee::Utils::fix_newlines( $c->req->params->{content} ); 
    6262    my $name    = $c->req->params->{name} 
    6363                || ($c->user ? $c->user->name : 'Anonymous'); 
    6464 
    65     if (!$message) { 
     65    if (!$content) { 
    6666        $c->vee_abort("Sorry, no mimes allowed."); 
    6767    } 
    6868 
    69     (my $linect = $message) =~ tr/\x0a//cd; 
     69    (my $linect = $content) =~ tr/\x0a//cd; 
    7070    if (length($linect) >= 10) {  # TODO: make me a pref! 
    7171        $c->vee_abort("Your shoutbox entry has too many lines, sorry."); 
    … …  
    7373     
    7474    # TODO: better spamproofing of some sort later, maybe? 
    75     if ($message =~ m!<a |</a>|\[url=|\[/url\]!) { 
     75    if ($content =~ m!<a |</a>|\[url=|\[/url\]!) { 
    7676        $c->vee_abort("Your shoutbox entry contains links.  This usually means you are a spambot, in which case you can shove your online poker ads where the sun don't shine.  If you are not, simply go back and try again without the code; HTML and bbcode don't work in the shoutbox anyway."); 
    7777    } 
    … …  
    7979    $c->model('DBIC::Shoutbox')->create({ 
    8080        name => $name, 
    81         userid => ($c->user ? $c->user->obj->id : undef), 
     81        user_id => ($c->user ? $c->user->obj->id : undef), 
    8282        ip => Vee::Utils::inet_aton($c->req->address), 
    8383        time => time, 
    84         message => $message, 
     84        content => $content, 
    8585    }); 
    8686 

  • veekun/trunk/lib/Vee/Controller/Users.pm

    r397 r406  
    104104        name => $p->{username}, 
    105105        password => sha1_hex( $p->{password}[0] ), 
    106         joindate => time, 
    107         lastactive => time, 
     106        time_joined => time, 
     107        time_active => time, 
    108108        signature => '', 
    109109        thread_view_cutoff => time, 
    … …  
    205205    my $skip   = $c->req->params->{skip} || 0; 
    206206         
    207     unless (Vee::Utils::in($order => qw/id name lastactive joindate postct/)) { $order = 'id'; } 
     207    unless (Vee::Utils::in($order => qw/id name time_active time_joined post_count/)) { $order = 'id'; } 
    208208    unless (Vee::Utils::in($sort => qw/asc desc/)) { $sort = 'asc'; } 
    209209     
    … …  
    242242    $s->{crumbs    }   = [ '<a href="' . $c->uri('User') . '">Users</a>', $user->name ]; 
    243243    $s->{ContactTypes} = \@ContactTypes; 
    244     $s->{recent_post}  = $c->model('DBIC::Posts')->search({ -and => [ userid => $c->req->args->[0], \'NOT FIND_IN_SET("deleted", me.flags)' ] }, { 
     244    $s->{recent_post}  = $c->model('DBIC::Posts')->search({ -and => [ user_id => $c->req->args->[0], \'NOT FIND_IN_SET("deleted", me.flags)' ] }, { 
    245245        order_by => 'me.time DESC', 
    246246        rows => 1 
    … …  
    349349    # Working with text data (sigs, title, etc) 
    350350    # Title 
    351     if ($changes{customtitle}) { 
     351    if ($changes{custom_title}) { 
    352352        # no fathomable reason this should ever be needed un-filtered, so just sanitize it now 
    353         $changes{customtitle} =~ s:[\x0d\x0a]::g; 
    354         $changes{customtitle} = Vee::Utils::cleanse( $changes{customtitle} ); 
    355  
    356         if (length $query->{customtitle} >= $user_limits->{customtitle}) { 
    357             push @errors, 'Custom title is longer than the maximum of ' . $user_limits->{customtitle} . ' characters.'; 
    358             delete $changes{customtitle}; 
     353        $changes{custom_title} =~ s:[\x0d\x0a]::g; 
     354        $changes{custom_title} = Vee::Utils::cleanse( $changes{custom_title} ); 
     355 
     356        if (length $query->{custom_title} >= $user_limits->{custom_title}) { 
     357            push @errors, 'Custom title is longer than the maximum of ' . $user_limits->{custom_title} . ' characters.'; 
     358            delete $changes{custom_title}; 
    359359        } else { 
    360             push @success, 'Updated your custom title to "' . $changes{customtitle} . '".'; 
    361         } 
    362     } elsif (exists $changes{customtitle} and $c->user->customtitle) { 
     360            push @success, 'Updated your custom title to "' . $changes{custom_title} . '".'; 
     361        } 
     362    } elsif (exists $changes{custom_title} and $c->user->custom_title) { 
    363363        push @success, 'Deleted your custom title.'; 
    364364    } 

  • veekun/trunk/lib/Vee/Controller/Users/Stats.pm

    r383 r406  
    5353 
    5454    my $posters_rs = $c->model('DBIC::Users')->search({ 
    55         postct  => { '!=', 0 }, 
     55        post_count => { '!=', 0 }, 
    5656    }, { 
    57         order_by => 'postct DESC', 
    58         rows     => 10, 
    59         columns  => [qw[ name postct ]], 
     57        order_by   => 'post_count DESC', 
     58        rows       => 10, 
     59        columns    => [qw[ name post_count ]], 
    6060    }); 
    6161    # TODO: when we figure out what "counts" as a post, adjust this to compensate 
    … …  
    6363 
    6464    my @fields = $posters_rs->get_column('name')->all; 
    65     my @data   = $posters_rs->get_column('postct')->all; 
     65    my @data   = $posters_rs->get_column('post_count')->all; 
    6666    my $top_total = sum @data; 
    6767    if ($total_posts > $top_total) { 
    … …  
    8686 
    8787    my $loudmouths_rs = $c->model('DBIC::Shoutbox')->search(undef, { 
    88         group_by  => 'userid', 
     88        group_by  => 'user_id', 
    8989        '+select' => \'COUNT(*) AS shout_count', 
    9090        '+as'     => 'shout_count', 

  • veekun/trunk/lib/Vee/Dex.pm

    r362 r406  
    235235    $DamagingMoveCount = $schema->resultset('Moves')->search({ power => { '!=' => undef } })->count; 
    236236 
    237     %TypeData = map { $_->name => $_ } $schema->resultset('Types')->search({ internalid => { '!=' => -1 } }); 
     237    %TypeData = map { $_->name => $_ } $schema->resultset('Types')->search({ internal_id => { '!=' => -1 } }); 
    238238    @TypeNames = sort keys %TypeData; 
    239     %OldTypeOrder = map { $_->internalid + 1 => $_->name } values %TypeData;  # for Compat.pm 
     239    %OldTypeOrder = map { $_->internal_id + 1 => $_->name } values %TypeData;  # for Compat.pm 
    240240    @NewTypeOrder = map { $_->name } sort { $a->id <=> $b->id } grep { $_->id >= 0 } values %TypeData; 
    241241 
    … …  
    255255 
    256256    # machines 
    257     my @tms = $schema->resultset('Machines')->search(undef, { columns => ['id', 'generation', 'moveid'], order_by => 'id ASC' }); 
     257    my @tms = $schema->resultset('Machines')->search(undef, { columns => ['id', 'generation', 'move_id'], order_by => 'id ASC' }); 
    258258    for my $row (@tms) { 
    259         $TMs[ $row->generation ][ $row->id ] = $row->moveid 
     259        $TMs[ $row->generation ][ $row->id ] = $row->move_id 
    260260    } 
    261261 
    … …  
    558558my @gender_fractions = ('no', '&#x215B;', '&frac14;', '&#x215C;', '&frac12;', '&#x215D;', '&frac34;', '&#x215E;', 'all'); 
    559559sub gender_text { 
    560     my $gendercode = shift; 
     560    my $gender_rate = shift; 
    561561    my $compact = shift; 
    562562 
    563     my $gender = int($gendercode / 32 + 0.5); 
     563    my $gender = int($gender_rate / 32 + 0.5); 
    564564    my ($img, $text); 
    565     if ($gendercode == 255) { 
     565    if ($gender_rate == 255) { 
    566566        $img = 'x'; $text = 'No gender'; 
    567567    } else { 

  • veekun/trunk/lib/Vee/Schema/Abilities.pm

    r350 r406  
    1313__PACKAGE__->load_components('Core'); 
    1414__PACKAGE__->table('abilities'); 
    15 __PACKAGE__->add_columns(qw/ id name gameblurb effect /); 
     15__PACKAGE__->add_columns(qw/ id name blurb_dp description /); 
    1616__PACKAGE__->set_primary_key('id'); 
    1717 
    18 __PACKAGE__->has_many(pokemon_abilities => 'Vee::Schema::PokemonAbilities', 'abilityid'); 
     18__PACKAGE__->has_many(pokemon_abilities => 'Vee::Schema::PokemonAbilities', 'ability_id'); 
    1919__PACKAGE__->many_to_many(pokemon => 'pokemon_abilities', 'pokemon'); 
    2020 

  • veekun/trunk/lib/Vee/Schema/ContestEffects.pm

    r350 r406  
    1 package Vee::Schema::ContestMoves; 
     1package Vee::Schema::ContestEffects; 
    22 
    33use strict; 
    … …  
    77=head1 NAME 
    88 
    9 Vee::Schema::ContestMoves - DBIC class for the C<contestmoves> table 
     9Vee::Schema::ContestEffects - DBIC class for the C<contest_effects> table 
    1010 
    1111=cut 
    1212 
    1313__PACKAGE__->load_components('Core'); 
    14 __PACKAGE__->table('contestmoves'); 
    15 __PACKAGE__->add_columns(qw/ id appeal jam description effect /); 
     14__PACKAGE__->table('contest_effects'); 
     15__PACKAGE__->add_columns(qw/ id appeal jam blurb_rusa description /); 
    1616__PACKAGE__->set_primary_key('id'); 
    1717 

  • veekun/trunk/lib/Vee/Schema/Creators.pm

    r350 r406  
    1313__PACKAGE__->load_components('Core'); 
    1414__PACKAGE__->table('creators'); 
    15 __PACKAGE__->add_columns(qw/ id userid name itemct /); 
     15__PACKAGE__->add_columns(qw/ id user_id name item_count /); 
    1616__PACKAGE__->set_primary_key('id'); 
    17 __PACKAGE__->add_unique_constraint(userid => ['userid']); 
    1817 
    1918=head1 SEE ALSO 

  • veekun/trunk/lib/Vee/Schema/Edits.pm

    r350 r406  
    1313__PACKAGE__->load_components('Core'); 
    1414__PACKAGE__->table('edits'); 
    15 __PACKAGE__->add_columns(qw/ id postid userid time oldmessage /); 
     15__PACKAGE__->add_columns(qw/ id post_id user_id time old_content /); 
    1616__PACKAGE__->set_primary_key('id'); 
    1717 
    18 __PACKAGE__->might_have(post => 'Vee::Schema::Posts', { 'foreign.id' => 'self.postid' }); 
    19 __PACKAGE__->might_have(user => 'Vee::Schema::Users', { 'foreign.id' => 'self.userid' }); 
     18__PACKAGE__->might_have(post => 'Vee::Schema::Posts', { 'foreign.id' => 'self.post_id' }); 
     19__PACKAGE__->might_have(user => 'Vee::Schema::Users', { 'foreign.id' => 'self.user_id' }); 
    2020 
    2121=head1 SEE ALSO 

  • veekun/trunk/lib/Vee/Schema/ErrorLog.pm

    r350 r406  
    77=head1 NAME 
    88 
    9 Vee::Schema::ErrorLog - DBIC class for the C<errorlog> table 
     9Vee::Schema::ErrorLog - DBIC class for the C<error_log> table 
    1010 
    1111=cut 
    1212 
    1313__PACKAGE__->load_components('Core'); 
    14 __PACKAGE__->table('errorlog'); 
    15 __PACKAGE__->add_columns(qw/ id time userid ip path method query error /); 
     14__PACKAGE__->table('error_log'); 
     15__PACKAGE__->add_columns(qw/ id time user_id ip path method query error /); 
    1616__PACKAGE__->set_primary_key('id'); 
    1717 

  • veekun/trunk/lib/Vee/Schema/EvoChains.pm

    r356 r406  
    1 package Vee::Schema::EvChains; 
     1package Vee::Schema::EvoChains; 
    22 
    33use strict; 
    … …  
    55use base 'DBIx::Class'; 
    66 
    7 # NOTE FOR WHEN THIS IS REFACTORED: 
    8 # I *believe* that base is not actually used anywhere except in pokemon_list, 
    9 # but the IDEA is that it is essentially the Pokemon with the LOWEST NATIONAL 
    10 # DEX NUMBER, thus making it the ORIGINAL FORM of the Pokemon. 
    11 # My SOLE EXCEPTION to this is Manaphy, which is the base of its chain, but 
    12 # only because that's not a real chain anyway. 
    13 # NOTE AGAIN: 
    14 # Nevermind!  base is now unused.  Delete to your heart's content. 
    15  
    167=head1 NAME 
    178 
    18 Vee::Schema::EvChains - DBIC class for the C<evchains> table 
     9Vee::Schema::EvoChains - DBIC class for the C<evo_chains> table 
    1910 
    2011=cut 
    2112 
    2213__PACKAGE__->load_components('Core'); 
    23 __PACKAGE__->table('evchains'); 
     14__PACKAGE__->table('evo_chains'); 
    2415__PACKAGE__->add_columns(qw/ 
    2516    id 
    26     base 
    27     growth 
    28     chain 
     17    growth_rate 
    2918    steps 
    30  
    31     babygs 
    32     babyc 
    33     babyrusa 
    34  
    3519    baby_item 
    3620/); 
    3721__PACKAGE__->set_primary_key('id'); 
    3822 
    39 __PACKAGE__->has_many(pokemon => 'Vee::Schema::Pokemon', 'evid'); 
    40 # TODO: delete the _pokemon suffix 
    41 __PACKAGE__->belongs_to(base_pokemon => 'Vee::Schema::Pokemon', 'base'); 
     23__PACKAGE__->has_many(pokemon => 'Vee::Schema::Pokemon', 'evo_chain_id'); 
    4224 
    4325=head1 SEE ALSO 

  • veekun/trunk/lib/Vee/Schema/FlavorText.pm

    r350 r406  
    77=head1 NAME 
    88 
    9 Vee::Schema::FlavorText - DBIC class for the C<flavortext> table 
     9Vee::Schema::FlavorText - DBIC class for the C<flavor_text> table 
    1010 
    1111=cut 
    1212 
    1313__PACKAGE__->load_components('Core'); 
    14 __PACKAGE__->table('flavortext'); 
    15 __PACKAGE__->add_columns(qw/ pokeid generation text /); 
     14__PACKAGE__->table('flavor_text'); 
     15__PACKAGE__->add_columns(qw/ pokemon_id generation text /); 
    1616 
    17 __PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokeid'); 
     17__PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokemon_id'); 
    1818 
    1919=head1 SEE ALSO 

  • veekun/trunk/lib/Vee/Schema/Forums.pm

    r386 r406  
    1414__PACKAGE__->table('forums'); 
    1515__PACKAGE__->add_columns(qw/ 
    16     id name lastpostid threadct postct flags accessibility blurb 
     16    id name last_post_id thread_count post_count flags accessibility description 
    1717/); 
    1818__PACKAGE__->set_primary_key('id'); 
    1919 
    20 __PACKAGE__->has_many(threads => 'Vee::Schema::Threads', 'forumid'); 
    21 __PACKAGE__->might_have(lastpost => 'Vee::Schema::Posts', { 'foreign.id' => 'self.lastpostid' }); 
     20__PACKAGE__->has_many(threads => 'Vee::Schema::Threads', 'forum_id'); 
     21__PACKAGE__->might_have(last_post => 'Vee::Schema::Posts', { 'foreign.id' => 'self.last_post_id' }); 
    2222 
    2323=head2 unread_ids($user) 
    … …  
    3333    # ambiguity errors 
    3434    return map { $_->id } $self->search( { 
    35         'threads.lasttime'         => { '>' => $user->thread_view_cutoff }, 
    36         'thread_views.last_viewed' => [ undef, \'< threads.lasttime' ], 
     35        'threads.last_post_time'   => { '>' => $user->thread_view_cutoff }, 
     36        'thread_views.last_viewed' => [ undef, \'< threads.last_post_time' ], 
    3737    }, { 
    3838        # XXX: This is very naughty, but the only way to stuff the user id in 
    … …  
    5353                    ], 
    5454                ], 
    55                 { 'me.id' => 'threads.forumid' }, 
     55                { 'me.id' => 'threads.forum_id' }, 
    5656            ], 
    5757        ], 

  • veekun/trunk/lib/Vee/Schema/GalleryKeywords.pm

    r350 r406  
    1212 
    1313__PACKAGE__->load_components('Core'); 
    14 __PACKAGE__->table('gallerykeywords'); 
     14__PACKAGE__->table('gallery_keywords'); 
    1515__PACKAGE__->add_columns(qw/ id keyword category description /); 
    1616__PACKAGE__->set_primary_key('id'); 
    17 __PACKAGE__->add_unique_constraint("keyword", ["keyword"]); 
    1817 
    1918=head1 SEE ALSO 

  • veekun/trunk/lib/Vee/Schema/GroupPermissions.pm

    r350 r406  
    77=head1 NAME 
    88 
    9 Vee::Schema::GroupPermissions - DBIC class for the C<grouppermissions> table 
     9Vee::Schema::GroupPermissions - DBIC class for the C<group_permissions> table 
    1010 
    1111=cut 
    1212 
    1313__PACKAGE__->load_components('Core'); 
    14 __PACKAGE__->table('grouppermissions'); 
    15 __PACKAGE__->add_columns(qw/ groupid permission scope polarity /); 
    16 __PACKAGE__->set_primary_key(qw/ groupid permission scope /); 
     14__PACKAGE__->table('group_permissions'); 
     15__PACKAGE__->add_columns(qw/ group_id permission scope polarity /); 
     16__PACKAGE__->set_primary_key(qw/ group_id permission scope /); 
    1717 
    18181; 

  • veekun/trunk/lib/Vee/Schema/Groups.pm

    r350 r406  
    1616__PACKAGE__->set_primary_key('id'); 
    1717 
    18 __PACKAGE__->has_many(user_groups => 'Vee::Schema::UserGroups', 'groupid'); 
    19 __PACKAGE__->has_many(permissions => 'Vee::Schema::GroupPermissions', 'groupid'); 
     18__PACKAGE__->has_many(user_groups => 'Vee::Schema::UserGroups', 'group_id'); 
     19__PACKAGE__->has_many(permissions => 'Vee::Schema::GroupPermissions', 'group_id'); 
    2020__PACKAGE__->many_to_many('users' => 'user_groups', 'user'); 
    2121 

  • veekun/trunk/lib/Vee/Schema/ItemKeywords.pm

    r350 r406  
    1212 
    1313__PACKAGE__->load_components('Core'); 
    14 __PACKAGE__->table('itemkeywords'); 
     14__PACKAGE__->table('item_keywords'); 
    1515__PACKAGE__->add_columns(qw/ itemid keywordid /); 
    1616__PACKAGE__->set_primary_key(qw/ itemid keywordid /); 

  • veekun/trunk/lib/Vee/Schema/Items.pm

    r350 r406  
    1313__PACKAGE__->load_components('Core'); 
    1414__PACKAGE__->table('items'); 
    15 __PACKAGE__->add_columns(qw/ id game_id berry_id name category cost col5 hp_plus_maybe fling_power fling_effect natural_gift_power natural_gift_type col12 col13 col14 col15 col16 col17 col18 col19 col20 col21 col22 col23 effort_hp effort_at effort_de effort_sp effort_sa effort_sd hp_restored pp_restored happiness1 happiness2 happiness3 is_underground dpblurb description /); 
     15__PACKAGE__->add_columns(qw/ id game_id berry_id name category cost col5 hp_plus_maybe fling_power fling_effect natural_gift_power natural_gift_type col12 col13 col14 col15 col16 col17 col18 col19 col20 col21 col22 col23 effort_hp effort_at effort_de effort_sp effort_sa effort_sd hp_restored pp_restored happiness1 happiness2 happiness3 is_underground blurb_dp description /); 
    1616__PACKAGE__->set_primary_key('id'); 
    1717 

  • veekun/trunk/lib/Vee/Schema/Machines.pm

    r350 r406  
    1313__PACKAGE__->load_components('Core'); 
    1414__PACKAGE__->table('machines'); 
    15 __PACKAGE__->add_columns(qw/ id generation cost moveid location /); 
     15__PACKAGE__->add_columns(qw/ id generation cost move_id location /); 
    1616__PACKAGE__->set_primary_key(qw/ id generation /); 
    1717 

  • veekun/trunk/lib/Vee/Schema/MoveEffects.pm

    r350 r406  
    1313__PACKAGE__->load_components('Core'); 
    1414__PACKAGE__->table('move_effects'); 
    15 __PACKAGE__->add_columns(qw/ id priority blurb description /); 
     15__PACKAGE__->add_columns(qw/ id priority short_description description /); 
    1616__PACKAGE__->set_primary_key('id'); 
    1717 

  • veekun/trunk/lib/Vee/Schema/Moves.pm

    r350 r406  
    2121    power 
    2222    pp 
    23     acc 
     23    accuracy 
    2424    target 
    2525    class 
    … …  
    3030    status 
    3131    move_effect_id 
    32     gameblurb 
    33     dpblurb 
    34     contype 
    35     coneffect 
     32    blurb_rusa 
     33    blurb_dp 
     34    contest_type 
     35    contest_effect_id 
    3636    notes 
    3737/); 
    3838__PACKAGE__->set_primary_key('id'); 
    3939 
    40 __PACKAGE__->belongs_to(contest => 'Vee::Schema::ContestMoves', 'coneffect'); 
     40__PACKAGE__->belongs_to(contest_effect => 'Vee::Schema::ContestEffects', 'contest_effect_id'); 
    4141__PACKAGE__->belongs_to(effect => 'Vee::Schema::MoveEffects', 'move_effect_id'); 
    42 __PACKAGE__->has_many(pokemoves => 'Vee::Schema::PokeMoves', 'moveid'); 
     42__PACKAGE__->has_many(pokemon_moves => 'Vee::Schema::PokemonMoves', 'move_id'); 
    4343 
    4444=head1 METHODS 
    … …  
    8888} 
    8989 
    90 =head2 blurb 
     90=head2 short_description 
    9191 
    92 Returns a short blurb for this move, suitable for putting in a move table. 
     92Returns a short description for this move, suitable for putting in a move table. 
    9393Applies C<_format_description> effects. 
    94  
    95 If this move's move effect has no blurb, the full description will be used 
    96 instead.  This should no longer happen, but was necessary for some degree of 
    97 completion when the blurbs were still being written. 
    9894 
    9995=cut 
    10096 
    101 sub blurb { 
     97sub short_description { 
    10298    my ($self) = @_; 
    10399 
    104     return $self->_format_description( 
    105         $self->effect->blurb || $self->effect->description 
    106     ); 
     100    return $self->_format_description( $self->effect->short_description ); 
    107101} 
    108102 
    … …  
    110104 
    111105Inserts this move's effect chance and priority into the provided string, if 
    112 applicable.  Used by C<description> and C<blurb>. 
     106applicable.  Used by C<description> and C<short_description>. 
    113107 
    114108=cut 

  • veekun/trunk/lib/Vee/Schema/Pokemon.pm

    r393 r406  
    2626    name_romaji 
    2727 
    28     evid 
    29     evparent 
    30     evmethod 
    31     evparam 
     28    evo_chain_id 
     29    evo_parent_id 
     30    evo_method 
     31    evo_param 
    3232 
    3333    height 
    … …  
    4747 
    4848    effort 
    49     oldgs 
    50     caprate 
    51     baseexp 
    52     gender 
    53     happiness 
    54     root 
    55     eventred 
    56     eventblue 
     49    gameshark_rby 
     50    capture_rate 
     51    base_exp 
     52    gender_rate 
     53    base_happiness 
    5754    notes 
    5855    flags 
    59     real_id 
     56    real_pokemon_id 
    6057/); 
    6158__PACKAGE__->set_primary_key('id'); 
    6259 
    63 __PACKAGE__->belongs_to(evchain => 'Vee::Schema::EvChains', 'evid'); 
    64 __PACKAGE__->has_many(pokemoves => 'Vee::Schema::PokeMoves', 'pokeid'); 
    65 __PACKAGE__->has_many(flavors => 'Vee::Schema::FlavorText', 'pokeid'); 
     60__PACKAGE__->belongs_to(evo_chain => 'Vee::Schema::EvoChains', 'evo_chain_id'); 
     61__PACKAGE__->has_many(pokemon_moves => 'Vee::Schema::PokemonMoves', 'pokemon_id'); 
     62__PACKAGE__->has_many(flavors => 'Vee::Schema::FlavorText', 'pokemon_id'); 
    6663__PACKAGE__->has_many(encounters => 'Vee::Schema::LocationEncounters', 'pokemon_id'); 
    67 __PACKAGE__->has_many(breeds => 'Vee::Schema::PokemonBreeds', 'pokeid'); 
     64__PACKAGE__->has_many(breeds => 'Vee::Schema::PokemonBreeds', 'pokemon_id'); 
    6865 
    69 __PACKAGE__->has_many(pokemon_abilities => 'Vee::Schema::PokemonAbilities', 'pokeid', { order_by => 'slot ASC' }); 
     66__PACKAGE__->has_many(pokemon_abilities => 'Vee::Schema::PokemonAbilities', 'pokemon_id', { order_by => 'slot ASC' }); 
    7067__PACKAGE__->many_to_many(abilities => 'pokemon_abilities', 'ability'); 
    7168 
    … …  
    7370__PACKAGE__->many_to_many(items => 'pokemon_items', 'item'); 
    7471 
    75 __PACKAGE__->might_have(parent => 'Vee::Schema::Pokemon', 'evparent'); 
    76 __PACKAGE__->has_many(descendants => 'Vee::Schema::Pokemon', 'evparent'); 
     72__PACKAGE__->might_have(parent => 'Vee::Schema::Pokemon', 'evo_parent_id'); 
     73__PACKAGE__->has_many(descendants => 'Vee::Schema::Pokemon', 'evo_parent_id'); 
    7774 
    7875=head1 METHODS 

  • veekun/trunk/lib/Vee/Schema/PokemonAbilities.pm

    r350 r406  
    1313__PACKAGE__->load_components('Core'); 
    1414__PACKAGE__->table('pokemon_abilities'); 
    15 __PACKAGE__->add_columns(qw/ pokeid abilityid slot /); 
    16 __PACKAGE__->set_primary_key(qw/ pokeid abilityid /); 
     15__PACKAGE__->add_columns(qw/ pokemon_id ability_id slot /); 
     16__PACKAGE__->set_primary_key(qw/ pokemon_id ability_id /); 
    1717 
    18 __PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokeid'); 
    19 __PACKAGE__->belongs_to(ability => 'Vee::Schema::Abilities', 'abilityid'); 
     18__PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokemon_id'); 
     19__PACKAGE__->belongs_to(ability => 'Vee::Schema::Abilities', 'ability_id'); 
    2020 
    2121=head1 SEE ALSO 

  • veekun/trunk/lib/Vee/Schema/PokemonBreeds.pm

    r350 r406  
    1313__PACKAGE__->load_components('Core'); 
    1414__PACKAGE__->table('pokemon_breeds'); 
    15 __PACKAGE__->add_columns(qw/ pokeid breed /); 
    16 __PACKAGE__->set_primary_key(qw/ pokeid breed /); 
     15__PACKAGE__->add_columns(qw/ pokemon_id breed /); 
     16__PACKAGE__->set_primary_key(qw/ pokemon_id breed /); 
    1717 
    18 __PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokeid'); 
     18__PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokemon_id'); 
    1919 
    2020=head1 SEE ALSO 

  • veekun/trunk/lib/Vee/Schema/PokemonMoves.pm

    r350 r406  
    1 package Vee::Schema::PokeMoves; 
     1package Vee::Schema::PokemonMoves; 
    22 
    33use strict; 
    … …  
    77=head1 NAME 
    88 
    9 Vee::Schema::PokeMoves - DBIC class for the C<pokemoves> table 
     9Vee::Schema::PokemonMoves - DBIC class for the C<pokemon_moves> table 
    1010 
    1111=cut 
    1212 
    1313__PACKAGE__->load_components('Core'); 
    14 __PACKAGE__->table('pokemoves'); 
    15 __PACKAGE__->add_columns(qw/ pokeid moveid level version method /); 
     14__PACKAGE__->table('pokemon_moves'); 
     15__PACKAGE__->add_columns(qw/ pokemon_id move_id level versions method /); 
    1616 
    17 __PACKAGE__->set_primary_key(qw/ pokeid moveid level version method /); 
     17__PACKAGE__->set_primary_key(qw/ pokemon_id move_id level versions method /); 
    1818 
    19 __PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokeid'); 
    20 __PACKAGE__->belongs_to(move => 'Vee::Schema::Moves', 'moveid'); 
     19__PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokemon_id'); 
     20__PACKAGE__->belongs_to(move => 'Vee::Schema::Moves', 'move_id'); 
    2121 
    2222=head1 SEE ALSO 

  • veekun/trunk/lib/Vee/Schema/Posts.pm

    r350 r406  
    1313__PACKAGE__->load_components('Core'); 
    1414__PACKAGE__->table('posts'); 
    15 __PACKAGE__->add_columns(qw/ id threadid userid flags time format message lasteditid /); 
     15__PACKAGE__->add_columns(qw/ id thread_id user_id flags time format content last_edit_id /); 
    1616__PACKAGE__->set_primary_key('id'); 
    1717 
    18 __PACKAGE__->belongs_to(thread => 'Vee::Schema::Threads', 'threadid'); 
    19 __PACKAGE__->might_have(user => 'Vee::Schema::Users', { 'foreign.id' => 'self.userid' }); 
    20 __PACKAGE__->has_many(edits => 'Vee::Schema::Edits', 'postid'); 
    21 __PACKAGE__->might_have(lastedit => 'Vee::Schema::Edits', { 'foreign.id' => 'self.lasteditid' }); 
     18__PACKAGE__->belongs_to(thread => 'Vee::Schema::Threads', 'thread_id'); 
     19__PACKAGE__->might_have(user => 'Vee::Schema::Users', { 'foreign.id' => 'self.user_id' }); 
     20__PACKAGE__->has_many(edits => 'Vee::Schema::Edits', 'post_id'); 
     21__PACKAGE__->might_have(lastedit => 'Vee::Schema::Edits', { 'foreign.id' => 'self.last_edit_id' }); 
    2222 
    2323=head1 SEE ALSO 

  • veekun/trunk/lib/Vee/Schema/Sessions.pm

    r404 r406  
    1717__PACKAGE__->add_columns( 
    1818    'id', 
    19     userid  => { is_nullable => 1 }, 
    20     expires => { is_nullable => 1 }, 
    21     data    => { is_nullable => 1 }, 
     19    user_id      => { is_nullable => 1 }, 
     20    time_expires => { is_nullable => 1 }, 
     21    data         => { is_nullable => 1 }, 
    2222); 
    2323__PACKAGE__->set_primary_key('id'); 

  • veekun/trunk/lib/Vee/Schema/Shoutbox.pm

    r404 r406  
    1515__PACKAGE__->add_columns( 
    1616    qw/ id name /, 
    17     userid => { is_nullable => 1 }, 
    18     qw/ ip time message / 
     17    user_id => { is_nullable => 1 }, 
     18    qw/ ip time content / 
    1919); 
    2020__PACKAGE__->set_primary_key('id'); 
    2121 
    22 __PACKAGE__->might_have(user => 'Vee::Schema::Users', { 'foreign.id' => 'self.userid' }); 
     22__PACKAGE__->might_have(user => 'Vee::Schema::Users', { 'foreign.id' => 'self.user_id' }); 
    2323 
    2424=head1 SEE ALSO 

  • veekun/trunk/lib/Vee/Schema/Threads.pm

    r386 r406  
    1414__PACKAGE__->table('threads'); 
    1515__PACKAGE__->add_columns(qw/ 
    16   id forumid subject blurb firstpostid lastpostid lasttime postct hitct flags 
     16  id forum_id subject blurb first_post_id last_post_id last_post_time post_count view_count flags 
    1717/); 
    1818__PACKAGE__->set_primary_key('id'); 
    1919 
    20 __PACKAGE__->belongs_to(forum => 'Vee::Schema::Forums', 'forumid'); 
    21 __PACKAGE__->has_many(posts => 'Vee::Schema::Posts', 'threadid'); 
    22 __PACKAGE__->belongs_to(lastpost => 'Vee::Schema::Posts', 'lastpostid'); 
    23 __PACKAGE__->belongs_to(firstpost => 'Vee::Schema::Posts', 'firstpostid'); 
     20__PACKAGE__->belongs_to(forum => 'Vee::Schema::Forums', 'forum_id'); 
     21__PACKAGE__->has_many(posts => 'Vee::Schema::Posts', 'thread_id'); 
     22__PACKAGE__->belongs_to(last_post => 'Vee::Schema::Posts', 'last_post_id'); 
     23__PACKAGE__->belongs_to(first_post => 'Vee::Schema::Posts', 'first_post_id'); 
    2424__PACKAGE__->has_many(thread_views => 'Vee::Schema::ThreadViews', 'thread_id', { join_type => 'LEFT' }); 
    2525 
    … …  
    3737    return $self->search( 
    3838        [ \ 'FIND_IN_SET("announcement", me.flags) AND NOT FIND_IN_SET("deleted", me.flags)' ], 
    39         { prefetch => [ 'forum', { firstpost => 'user', lastpost => 'user' } ] } 
     39        { prefetch => [ 'forum', { first_post => 'user', last_post => 'user' } ] } 
    4040    ); 
    4141} 
    … …  
    5353    # ambiguity errors 
    5454    return map { $_->id } $self->search( { 
    55         'me.lasttime'              => { '>' => $user->thread_view_cutoff }, 
    56         'thread_views.last_viewed' => [ undef, \'< me.lasttime' ], 
     55        'me.last_post_time'        => { '>' => $user->thread_view_cutoff }, 
     56        'thread_views.last_viewed' => [ undef, \'< me.last_post_time' ], 
    5757    }, { 
    58         # XXX: This is very naughty, but the only way to stuff the user id in 
     58        # n.b.: This is very naughty, but the only way to stuff the user id in 
    5959        # the ON clause 
    6060        from     => [ 

  • veekun/trunk/lib/Vee/Schema/Types.pm

    r350 r406  
    1414__PACKAGE__->table('types'); 
    1515__PACKAGE__->add_columns(qw/ 
    16     name abbr color rank id internalid new_effects old_effects 
     16    name abbr color rank id internal_id new_effects old_effects 
    1717/); 
    1818__PACKAGE__->set_primary_key('name'); 

  • veekun/trunk/lib/Vee/Schema/UserGroups.pm

    r350 r406  
    77=head1 NAME 
    88 
    9 Vee::Schema::UserGroups - DBIC class for the C<usergroups> table 
     9Vee::Schema::UserGroups - DBIC class for the C<user_groups> table 
    1010 
    1111=cut 
    1212 
    1313__PACKAGE__->load_components('Core'); 
    14 __PACKAGE__->table('usergroups'); 
    15 __PACKAGE__->add_columns(qw/ userid groupid priority /); 
    16 __PACKAGE__->set_primary_key(qw/ userid groupid priority /); 
     14__PACKAGE__->table('user_groups'); 
     15__PACKAGE__->add_columns(qw/ user_id group_id priority /); 
     16__PACKAGE__->set_primary_key(qw/ user_id group_id priority /); 
    1717 
    18 __PACKAGE__->belongs_to(user => 'Vee::Schema::Users', 'userid'); 
     18__PACKAGE__->belongs_to(user => 'Vee::Schema::Users', 'user_id'); 
    1919# Temporary hack to get around problem with `` quoting 
    20 __PACKAGE__->belongs_to(group_hax => 'Vee::Schema::Groups', 'groupid');   
     20__PACKAGE__->belongs_to(group_hax => 'Vee::Schema::Groups', 'group_id');   
    2121 
    2222=head1 SEE ALSO 

  • veekun/trunk/lib/Vee/Schema/Users.pm

    r350 r406  
    1717    name 
    1818    password 
    19     joindate 
    20     lastactive 
     19    time_joined 
     20    time_active 
    2121    thread_view_cutoff 
    22     postct 
     22    post_count 
    2323    flags 
    24     newspic 
     24    news_pic 
    2525    avatar 
    2626    contact_aim 
    … …  
    3131    contact_homepage 
    3232    contact_email 
    33     pmicon 
    34     customtitle 
     33    pm_icon 
     34    custom_title 
    3535    signature 
    3636    is_dumb 
    … …  
    3939__PACKAGE__->add_unique_constraint(name => ['name']); 
    4040 
    41 __PACKAGE__->has_many(posts => 'Vee::Schema::Posts', 'userid'); 
    42 __PACKAGE__->has_many(shouts => 'Vee::Schema::Shoutbox', 'userid'); 
    43 __PACKAGE__->has_many(user_groups => 'Vee::Schema::UserGroups', 'userid'); 
     41__PACKAGE__->has_many(posts => 'Vee::Schema::Posts', 'user_id'); 
     42__PACKAGE__->has_many(shouts => 'Vee::Schema::Shoutbox', 'user_id'); 
     43__PACKAGE__->has_many(user_groups => 'Vee::Schema::UserGroups', 'user_id'); 
    4444__PACKAGE__->has_many(sent_messages => 'Vee::Schema::Messages', 'from_user_id'); 
    4545__PACKAGE__->has_many(received_messages => 'Vee::Schema::Messages', 'to_user_id'); 

  • veekun/trunk/lib/Vee/Utils.pm

    r283 r406  
    5050 
    5151sub postrank { 
    52     my ($postct) = @_; 
     52    my ($post_count) = @_; 
    5353    for my $rank ( 
    5454        sort { $b <=> $a } 
    5555        keys %{ Vee->config->{site}->{post_ranks} } 
    5656    ) { 
    57         return Vee->config->{site}->{post_ranks}->{$rank} if $rank <= $postct; 
     57        return Vee->config->{site}->{post_ranks}->{$rank} if $rank <= $post_count; 
    5858    } 
    5959    return "ERRORZ0RZ"; 
    … …  
    6363# XXX: decide the best way to do this, preferably a smooth log curve 
    6464sub post_width { 
    65     my ($postct) = @_; 
    66     return $postct / 1000; 
     65    my ($post_count) = @_; 
     66    return $post_count / 1000; 
    6767} 
    6868 
    … …  
    109109} 
    110110 
     111# URL-validation regex 
     112# Inferred from the W3's BNF: http://www.w3.org/Addressing/URL/5_BNF.html 
     113# n.b.: Technically, the BNF says hostname parts (as delimited by dots) 
     114# should begin with a letter, but given that 'xalpha' includes dot this was 
     115# a bit clumsy to pull off in practice, so I left it lazy. 
     116my $url_xalphas = qr/[-$_@.&+!*"'(),a-zA-Z0-9]/; 
     117our $IsValidURL = qr/ ^ 
     118    (?: http | https | ftp ) :\/\/          # protocol 
     119    (?: 
     120        [a-zA-Z] $url_xalphas*              # hostname 
     121        | (?: \d{1,3} \. ){3} \d{1,3}       # IP 
     122    ) 
     123    (?: : [0-9]+ )?                         # port 
     124    (?: \/                                  # path: leading slash 
     125        (?: $url_xalphas*                   # path: path part name 
     126          | %[a-fA-F][a-fA-F] )*            # path: escape 
     127    )*                                      # path: as many as you want 
     128    (?: \? $url_xalphas+ )?                 # query string 
     129    (?: \# $url_xalphas+ )?                 # anchor 
     130$ /x; 
     131 
     132 
    111133sub pad { sprintf "%0$_[1]d", $_[0] } 
    112134sub round { $_[1] ||= 0; return int($_[0] * 10 ** $_[1] + .5) / 10 ** $_[1]; } 

  • veekun/trunk/script/base.sql

    r330 r406  
    1717CREATE TABLE edits ( 
    1818  id int(10) unsigned NOT NULL auto_increment, 
    19   postid int(10) unsigned NOT NULL default '0', 
    20   userid int(10) unsigned NOT NULL default '0', 
    21   `time` int(10) unsigned NOT NULL default '0', 
    22   oldmessage text NOT NULL, 
    23   PRIMARY KEY  (id), 
    24   KEY POSTID (postid) 
    25 ) ENGINE=MyISAM DEFAULT CHARSET=latin1; 
    26  
    27 -- 
    28 -- Table structure for table `errorlog` 
    29 -- 
    30  
    31 DROP TABLE IF EXISTS errorlog; 
    32 CREATE TABLE errorlog ( 
    33   id int(10) unsigned NOT NULL auto_increment, 
    34   `time` int(10) unsigned NOT NULL, 
    35   userid int(10) unsigned NOT NULL, 
    36   ip int(10) unsigned NOT NULL, 
     19  post_id int(10) unsigned NOT NULL default '0', 
     20  user_id int(10) unsigned NOT NULL default '0', 
     21  `time` int(10) unsigned NOT NULL default '0', 
     22  old_content text NOT NULL, 
     23  PRIMARY KEY  (id), 
     24  KEY POSTID USING BTREE (post_id) 
     25) ENGINE=MyISAM DEFAULT CHARSET=latin1; 
     26 
     27-- 
     28-- Table structure for table `error_log` 
     29-- 
     30 
     31DROP TABLE IF EXISTS error_log; 
     32CREATE TABLE error_log ( 
     33  id int(10) unsigned NOT NULL auto_increment, 
     34  `time` int(10) unsigned NOT NULL default '0', 
     35  user_id int(10) unsigned NOT NULL default '0', 
     36  ip int(10) unsigned NOT NULL default '0', 
    3737  path tinytext NOT NULL, 
    3838  method enum('POST','GET') default NULL, 
    … …  
    5050  id int(10) unsigned NOT NULL auto_increment, 
    5151  `name` varchar(80) NOT NULL default 'Untitled Forum', 
    52   lastpostid int(10) unsigned default NULL, 
    53   threadct int(10) unsigned NOT NULL default '0', 
    54   postct int(10) unsigned NOT NULL default '0', 
     52  last_post_id int(10) unsigned default NULL, 
     53  thread_count int(10) unsigned NOT NULL default '0', 
     54  post_count int(10) unsigned NOT NULL default '0', 
    5555  flags set('header') NOT NULL, 
    5656  accessibility enum('normal','locked','archive','hidden') NOT NULL default 'normal', 
    57   blurb varchar(255) NOT NULL default '', 
    58   PRIMARY KEY  (id) 
    59 ) ENGINE=InnoDB DEFAULT CHARSET=latin1; 
    60  
    61 -- 
    62 -- Table structure for table `grouppermissions` 
    63 -- 
    64  
    65 DROP TABLE IF EXISTS grouppermissions; 
    66 CREATE TABLE grouppermissions ( 
    67   groupid int(10) unsigned NOT NULL, 
     57  description varchar(255) NOT NULL, 
     58  PRIMARY KEY  (id) 
     59) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; 
     60 
     61-- 
     62-- Table structure for table `group_permissions` 
     63-- 
     64 
     65DROP TABLE IF EXISTS group_permissions; 
     66CREATE TABLE group_permissions ( 
     67  group_id int(10) unsigned NOT NULL default '0', 
    6868  permission varchar(64) NOT NULL default '', 
    6969  scope varchar(64) NOT NULL default '', 
    7070  polarity enum('allow','deny') default NULL, 
    71   PRIMARY KEY  (groupid,permission,scope) 
    72 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 
     71  PRIMARY KEY  USING BTREE (group_id,permission,scope) 
     72) ENGINE=MyISAM DEFAULT CHARSET=latin1; 
    7373 
    7474-- 
    … …  
    8282  `name` tinytext NOT NULL, 
    8383  UNIQUE KEY id (id) 
    84 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 
     84) ENGINE=InnoDB DEFAULT CHARSET=utf8; 
    8585 
    8686-- 
    … …  
    9191CREATE TABLE messages ( 
    9292  id int(10) unsigned NOT NULL auto_increment, 
    93   from_user_id int(10) unsigned NOT NULL, 
    94   to_user_id int(10) unsigned NOT NULL, 
    95   `time` int(10) unsigned NOT NULL, 
     93  from_user_id int(10) unsigned NOT NULL default '0', 
     94  to_user_id int(10) unsigned NOT NULL default '0', 
     95  `time` int(10) unsigned NOT NULL default '0', 
    9696  `subject` tinytext NOT NULL, 
    9797  message text NOT NULL, 
    … …  
    106106CREATE TABLE posts ( 
    107107  id int(10) unsigned NOT NULL auto_increment, 
    108   threadid int(10) unsigned NOT NULL default '0', 
    109   userid int(10) unsigned NOT NULL default '0', 
     108  thread_id int(10) unsigned NOT NULL default '0', 
     109  user_id int(10) unsigned NOT NULL default '0', 
    110110  flags set('deleted') NOT NULL default '', 
    111111  `time` int(10) unsigned NOT NULL default '0', 
    112112  format enum('bbcode','raw','html') NOT NULL default 'raw', 
    113   message text NOT NULL, 
    114   lasteditid int(10) unsigned NOT NULL default '0', 
    115   PRIMARY KEY  (id), 
    116   KEY THREAD (threadid), 
    117   KEY `USER` (userid) 
    118 ) ENGINE=InnoDB DEFAULT CHARSET=latin1; 
     113  content text NOT NULL, 
     114  last_edit_id int(10) unsigned NOT NULL default '0', 
     115  PRIMARY KEY  (id), 
     116  KEY THREAD USING BTREE (thread_id), 
     117  KEY `USER` USING BTREE (user_id) 
     118) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED; 
    119119 
    120120-- 
    … …  
    124124DROP TABLE IF EXISTS sessions; 
    125125CREATE TABLE sessions ( 
    126   id char(72) NOT NULL default '', 
    127   userid int(10) unsigned NOT NULL default '0', 
    128   expires int(10) unsigned default NULL, 
     126  id varchar(72) NOT NULL default '', 
     127  user_id int(10) unsigned NOT NULL default '0', 
     128  time_expires int(10) unsigned default NULL, 
    129129  `data` text, 
    130   PRIMARY KEY  (id), 
    131   KEY USERID (userid) 
     130  PRIMARY KEY  USING BTREE (id), 
     131  KEY USER_ID USING BTREE (user_id) 
    132132) ENGINE=MyISAM DEFAULT CHARSET=latin1; 
    133133 
    … …  
    140140  id int(10) unsigned NOT NULL auto_increment, 
    141141  `name` varchar(24) NOT NULL default 'Anonymous', 
    142   userid int(10) unsigned default NULL, 
     142  user_id int(10) unsigned default NULL, 
    143143  ip int(10) unsigned NOT NULL default '0', 
    144144  `time` int(10) unsigned NOT NULL default '0', 
    145   message text NOT NULL, 
     145  content text NOT NULL, 
    146146  PRIMARY KEY  (id) 
    147147) ENGINE=MyISAM DEFAULT CHARSET=latin1; 
    … …  
    154154CREATE TABLE threads ( 
    155155  id int(10) unsigned NOT NULL auto_increment, 
    156   forumid int(10) unsigned NOT NULL default '0', 
     156  forum_id int(10) unsigned NOT NULL default '0', 
    157157  `subject` varchar(48) NOT NULL default 'Untitled Thread', 
    158158  blurb varchar(96) NOT NULL default '', 
    159   firstpostid int(10) unsigned NOT NULL, 
    160   lastpostid int(10) unsigned NOT NULL, 
    161   lasttime int(10) unsigned NOT NULL default '0', 
    162   postct int(10) unsigned NOT NULL default '0', 
    163   hitct int(10) unsigned NOT NULL default '0', 
     159  first_post_id int(10) unsigned NOT NULL, 
     160  last_post_id int(10) unsigned NOT NULL, 
     161  last_post_time int(10) unsigned NOT NULL default '0', 
     162  post_count int(10) unsigned NOT NULL default '0', 
     163  view_count int(10) unsigned NOT NULL default '0', 
    164164  flags set('locked','sticky','announcement','deleted') NOT NULL default '', 
    165165  PRIMARY KEY  (id), 
    166   KEY FORUMID (forumid) 
    167 ) ENGINE=InnoDB DEFAULT CHARSET=latin1; 
     166  KEY FORUMID USING BTREE (forum_id) 
     167) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; 
    168168 
    169169-- 
    … …  
    180180 
    181181-- 
    182 -- Table structure for table `usergroups` 
    183 -- 
    184  
    185 DROP TABLE IF EXISTS usergroups; 
    186 CREATE TABLE usergroups ( 
    187   userid int(10) unsigned NOT NULL, 
    188   groupid tinyint(3) unsigned NOT NULL, 
    189   priority tinyint(3) unsigned NOT NULL, 
    190   PRIMARY KEY  (userid,groupid,priority), 
    191   KEY userid (userid), 
    192   KEY groupid (groupid) 
    193 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 
    194  
    195 -- 
    196 -- Table structure for table `userpermissions` 
    197 -- 
    198  
    199 DROP TABLE IF EXISTS userpermissions; 
    200 CREATE TABLE userpermissions ( 
    201   userid int(10) NOT NULL, 
    202   permission varchar(64) NOT NULL default '', 
    203   scope varchar(64) NOT NULL default '', 
    204   polarity enum('allow','deny') default NULL, 
    205   PRIMARY KEY  (userid,permission,scope) 
    206 ) ENGINE=InnoDB DEFAULT CHARSET=utf8; 
     182-- Table structure for table `user_groups` 
     183-- 
     184 
     185DROP TABLE IF EXISTS user_groups; 
     186CREATE TABLE user_groups ( 
     187  user_id int(10) unsigned NOT NULL default '0', 
     188  group_id tinyint(3) unsigned NOT NULL default '0', 
     189  priority tinyint(3) unsigned NOT NULL default '0', 
     190  PRIMARY KEY  USING BTREE (user_id,group_id,priority), 
     191  KEY user_id USING BTREE (user_id), 
     192  KEY group_id USING BTREE (group_id) 
     193) ENGINE=MyISAM DEFAULT CHARSET=latin1; 
    207194 
    208195-- 
    … …  
    215202  `name` varchar(20) NOT NULL default '', 
    216203  `password` varchar(40) NOT NULL, 
    217   joindate int(10) unsigned NOT NULL default '0', 
    218   lastactive int(10) unsigned NOT NULL default '0', 
     204  time_joined int(10) unsigned NOT NULL default '0', 
     205  time_active int(10) unsigned NOT NULL default '0', 
    219206  thread_view_cutoff int(10) unsigned NOT NULL, 
    220   postct int(10) unsigned NOT NULL default '0', 
     207  post_count int(10) unsigned NOT NULL default '0', 
    221208  flags set('lockedsig','lockedavatar','lockedtitle') NOT NULL default '', 
    222   newspic varchar(64) default NULL, 
     209  news_pic varchar(64) default NULL, 
    223210  avatar varchar(64) default NULL, 
    224211  contact_aim varchar(32) NOT NULL default '', 
    … …  
    229216  contact_homepage varchar(96) NOT NULL default '', 
    230217  contact_email varchar(32) NOT NULL default '', 
    231   pmicon enum('bead','bellossom','dream','duskull','eatmail','gorgeous','letter','magnemite','pika','retro','slakoth','vee','wailmer','wingull','zigzagoon') NOT NULL default 'letter', 
    232   customtitle varchar(32) NOT NULL default '', 
     218  pm_icon enum('bead','bellossom','dream','duskull','eatmail','gorgeous','letter','magnemite','pika','retro','slakoth','vee','wailmer','wingull','zigzagoon') NOT NULL default 'letter', 
     219  custom_title varchar(32) NOT NULL, 
    233220  signature text NOT NULL, 
    234221  is_dumb tinyint(1) NOT NULL default '0', 

  • veekun/trunk/script/base_data.sql

    r381 r406  
    1 LOCK TABLES forums WRITE, grouppermissions WRITE, groups WRITE, usergroups WRITE, users WRITE; 
     1LOCK TABLES forums WRITE, group_permissions WRITE, groups WRITE, user_groups WRITE, users WRITE; 
    22 
    3 INSERT INTO forums (id, name, lastpostid, threadct, postct, flags, accessibility, blurb) 
     3INSERT INTO forums (id, name, last_post_id, thread_count, post_count, flags, accessibility, blurb) 
    44VALUES (1, 'News', NULL, 0, 0, '', 'normal', 'News and updates show up here.'); 
    55 
    6 INSERT INTO grouppermissions (groupid, permission, scope, polarity) 
     6INSERT INTO group_permissions (group_id, permission, scope, polarity) 
    77VALUES (1, 'splat', '', 'allow'); 
    88 
    … …  
    1111       (2, '', 'Users'); 
    1212 
    13 INSERT INTO usergroups (userid, groupid, priority) 
     13INSERT INTO user_groups (user_id, group_id, priority) 
    1414VALUES (0, 2, 1), 
    1515       (1, 1, 1); 
    1616 
    17 INSERT INTO users (id, name, password, joindate, signature, thread_view_cutoff) 
     17INSERT INTO users (id, name, password, time_joined, signature, thread_view_cutoff) 
    1818VALUES (1, 'admin', '5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8', UNIX_TIMESTAMP(), 'Default signature', UNIX_TIMESTAMP()); 
    1919 

  • veekun/trunk/script/dump_sql.pl

    r396 r406  
    1111 
    1212my %TABLES = ( 
    13     base    => [qw/ edits errorlog forums grouppermissions groups messages posts sessions shoutbox threads thread_views usergroups userpermissions users /], 
    14     gallery => [qw/ creators gallery gallerykeywords itemkeywords /], 
    15     pokedex => [qw/ abilities berries contestmoves evchains flavortext items locations location_sections location_encounters machines moves move_effects pokemon pokemon_abilities pokemon_breeds pokemon_items pokemoves types /], 
     13    base    => [qw/ edits error_log forums group_permissions groups messages posts sessions shoutbox threads thread_views user_groups users /], 
     14    gallery => [qw/ creators gallery gallery_keywords item_keywords /], 
     15    pokedex => [qw/ abilities berries contest_effects evo_chains flavor_text items locations location_sections location_encounters machines moves move_effects pokemon pokemon_abilities pokemon_breeds pokemon_items pokemon_moves types /], 
    1616); 
    1717 

  • veekun/trunk/script/gallery.sql

    r48 r406  
    1717CREATE TABLE creators ( 
    1818  id int(10) unsigned NOT NULL auto_increment, 
    19   userid int(10) unsigned default NULL, 
    20   `name` varchar(20) default NULL, 
    21   itemct int(10) unsigned NOT NULL default '0', 
    22   PRIMARY KEY  (id), 
    23   UNIQUE KEY userid (userid) 
    24 ) ENGINE=MyISAM DEFAULT CHARSET=latin1; 
     19  user_id int(10) unsigned NOT NULL, 
     20  `name` varchar(32) NOT NULL, 
     21  item_count tinyint(3) unsigned default NULL, 
     22  PRIMARY KEY  (id) 
     23) ENGINE=InnoDB DEFAULT CHARSET=utf8; 
    2524 
    2625-- 
    … …  
    4948 
    5049-- 
    51 -- Table structure for table `gallerykeywords` 
     50-- Table structure for table `gallery_keywords` 
    5251-- 
    5352 
    54 DROP TABLE IF EXISTS gallerykeywords; 
    55 CREATE TABLE gallerykeywords ( 
     53DROP TABLE IF EXISTS gallery_keywords; 
     54CREATE TABLE gallery_keywords ( 
    5655  id int(10) unsigned NOT NULL auto_increment, 
    5756  keyword varchar(48) NOT NULL default '', 
    … …  
    6362 
    6463-- 
    65 -- Table structure for table `itemkeywords` 
     64-- Table structure for table `item_keywords` 
    6665-- 
    6766 
    68 DROP TABLE IF EXISTS itemkeywords; 
    69 CREATE TABLE itemkeywords ( 
     67DROP TABLE IF EXISTS item_keywords; 
     68CREATE TABLE item_keywords ( 
    7069  itemid int(10) unsigned NOT NULL default '0', 
    7170  keywordid int(10) unsigned NOT NULL default '0', 

  • veekun/trunk/script/pokedex.sql

    r399 r406  
    1818  id tinyint(3) unsigned NOT NULL default '0', 
    1919  `name` varchar(24) NOT NULL default '', 
    20   gameblurb tinytext NOT NULL, 
    21   effect tinytext NOT NULL, 
     20  blurb_dp tinytext NOT NULL, 
     21  description tinytext NOT NULL, 
    2222  PRIMARY KEY  (id) 
    2323) ENGINE=MyISAM DEFAULT CHARSET=utf8; 
    … …  
    251251 
    252252-- 
    253 -- Table structure for table `contestmoves` 
     253-- Table structure for table `contest_effects` 
    254254-- 
    255255 
    256 DROP TABLE IF EXISTS contestmoves; 
    257 CREATE TABLE contestmoves ( 
     256DROP TABLE IF EXISTS contest_effects; 
     257CREATE TABLE contest_effects ( 
    258258  id tinyint(4) NOT NULL default '0', 
    259259  appeal tinyint(4) NOT NULL default '0', 
    260260  jam tinyint(4) NOT NULL default '0', 
     261  blurb_rusa tinytext NOT NULL, 
    261262  description tinytext NOT NULL, 
    262   effect tinytext NOT NULL, 
    263263  PRIMARY KEY  (id) 
    264264) ENGINE=MyISAM DEFAULT CHARSET=utf8; 
    265265 
    266266-- 
    267 -- Dumping data for table `contestmoves` 
     267-- Dumping data for table `contest_effects` 
    268268-- 
    269269 
    270 LOCK TABLES contestmoves WRITE; 
    271 /*!40000 ALTER TABLE contestmoves DISABLE KEYS */; 
    272 INSERT INTO contestmoves VALUES (1,4,0,'A highly appealing move.','Gives a high number of appeal points wth no other effects.'), 
     270LOCK TABLES contest_effects WRITE; 
     271/*!40000 ALTER TABLE contest_effects DISABLE KEYS */; 
     272INSERT INTO contest_effects VALUES (1,4,0,'A highly appealing move.','Gives a high number of appeal points wth no other effects.'), 
    273273(2,3,0,'Affected by how well the appeal in front goes.','If the Pokemon that appealed before the user earned less than three appeal points, user earns six; if three, user earns three; if more than three, user earns none.'), 
    274274(3,6,0,'After this move, the user is more easily startled.','If the user is jammed this turn after using this move, it will receive twice as many jam points.'), 
    … …  
    303303(32,1,0,'Ups the user\'s condition.  Helps prevent nervousness.','User gains one star.'), 
    304304(33,3,0,'Worsens the condition of those that made appeals.','Removes all stars from all Pokemon that have appealed this turn.'); 
    305 /*!40000 ALTER TABLE contestmoves ENABLE KEYS */; 
     305/*!40000 ALTER TABLE contest_effects ENABLE KEYS */; 
    306306UNLOCK TABLES; 
    307307 
    308308-- 
    309 -- Table structure for table `evchains` 
     309-- Table structure for table `evo_chains` 
    310310-- 
    311311