Changeset 406 for veekun/trunk/lib/Vee/Controller/Dex.pm

Timestamp:

02/08/08 02:44:39 (2 years ago)

Author:

eevee

Message:

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

Files:

• veekun/trunk/lib/Vee/Controller/Dex.pm (modified) (21 diffs)

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

@@ -281 +281 @@
         group_by  => 'me.id',
         join      => 'pokemon_abilities',
-        '+select' => 'COUNT(DISTINCT pokemon_abilities.pokeid)',
+        '+select' => 'COUNT(DISTINCT pokemon_abilities.pokemon_id)',
         '+as'     => 'pokemon_count',
     });
@@ -353 +353 @@
     
     # check to see if there is only one move, ever, that corresponds to this TM
-    my %set = map { $_->moveid => 1 } @tms;
+    my %set = map { $_->move_id => 1 } @tms;
 
     if (!@tms) {
@@ -359 +359 @@
     } elsif (1 == scalar keys %set) {
         # TODO: remove this?
-        $c->res->redirect( $c->uri('Dex', 'moves', lc $MoveData[ $tms[0]->moveid ]->name) );
+        $c->res->redirect( $c->uri('Dex', 'moves', lc $MoveData[ $tms[0]->move_id ]->name) );
     }
 
@@ -453 +453 @@
         %query,
     }, {
-        join     => { evchain => 'pokemon' },
+        join     => { evo_chain => 'pokemon' },
         prefetch => { pokemon_abilities => 'ability' },
-        group_by => [ 'me.id', 'pokemon_abilities.abilityid' ],
+        group_by => [ 'me.id', 'pokemon_abilities.ability_id' ],
         order_by => [ @extra_order, "pokemon.id ASC", "FIND_IN_SET('baby', me.flags) DESC", 'me.id ASC' ],
     });
@@ -482 +482 @@
     delete $c->session->{last_pokemon_view};
 
-    $s->{page_title}  = $row->name . ' - Pokémon #' . $row->real_id;
+    $s->{page_title}  = $row->name . ' - Pokémon #' . $row->real_pokemon_id;
     $s->{page_header} = $row->name;
     $s->{extra_js}    = ['dexutils'];
@@ -507 +507 @@
     $s->{this}       = $row;
     $s->{pid}        = Vee::Utils::pad($row->id, 3);
-    $s->{generation} = my $generation = ( grep { $Generations[$_]{maxid} >= $row->real_id } 0 .. $#Generations )[0];
+    $s->{generation} = my $generation = ( grep { $Generations[$_]{maxid} >= $row->real_pokemon_id } 0 .. $#Generations )[0];
 
     # alt forms
@@ -513 +513 @@
         my @alts;
         my $alt_rs = $c->model('DBIC::Pokemon')->search({
-            real_id  => $row->real_id,
+            real_pokemon_id  => $row->real_pokemon_id,
         }, {
             columns  => ['alt_form'],
@@ -525 +525 @@
         
     # evolution chain
-    my @family = $row->evchain->pokemon( \'id = real_id', { columns => [qw/id evparent evmethod evparam/] } );
+    my @family = $row->evo_chain->pokemon( \'id = real_pokemon_id', { columns => [qw/id evo_parent_id evo_method evo_param/] } );
     my %evtrees;
-    $evtrees{$_->id} = { id => $_->id, parent => $_->evparent, method => $_->evmethod, param => $_->evparam, children => [] } for @family;
+    $evtrees{$_->id} = { id => $_->id, parent => $_->evo_parent_id, method => $_->evo_method, param => $_->evo_param, children => [] } for @family;
     push @{ $evtrees{ $_->{parent} }{children} }, $_ for sort { $a->{id} <=> $b->{id} } grep { $_->{parent} } values %evtrees;
-    for my $node (values %evtrees) { add_evolution_desc($node, $row->evchain) }
+    for my $node (values %evtrees) { add_evolution_desc($node, $row->evo_chain) }
     $s->{evtree} = ( grep { !$_->{parent} } values %evtrees )[0];  # should only be one with no parent: the root
     calculate_tree_width($s->{evtree});
@@ -547 +547 @@
     $s->{compatibility}{all}  = $compat_rs->count;
     # TODO: this is actually wrong; fix when bug #88 is fixed please
-    $s->{compatibility}{base} = $compat_rs->search({ evparent => 0 })->count;
+    $s->{compatibility}{base} = $compat_rs->search({ evo_parent_id => 0 })->count;
 
     # held items
@@ -563 +563 @@
     # moves from here down
     # slurp everything this Pokemon can learn, complete with egg moves if necessary
-    my $moves_rs = $c->model('DBIC::PokeMoves')->search( {
-        pokeid => $row->id,
-    }, {
-        columns => [qw/moveid method level version/]
+    my $moves_rs = $c->model('DBIC::PokemonMoves')->search( {
+        pokemon_id => $row->id,
     } );
     
@@ -578 +576 @@
     while (my $move_row = $moves_rs->next) {
         my $table_row = {
-            moveid => $move_row->moveid,
+            move_id => $move_row->move_id,
             level => $move_row->level,
-            versions => { map { $_ => $move_row->level || 1 } split /,/, $move_row->version },
+            versions => { map { $_ => $move_row->level || 1 } split /,/, $move_row->versions },
         };
 
@@ -595 +593 @@
     @{ $moves{$_} } = sort {
         $a->{level} <=> $b->{level} or
-        $MoveData[ $a->{moveid} ]->name cmp $MoveData[ $b->{moveid} ]->name
+        $MoveData[ $a->{move_id} ]->name cmp $MoveData[ $b->{move_id} ]->name
     } @{ $moves{$_} } for qw/ level egg machine /;
     
@@ -633 +631 @@
         my $i = -1;
         while (++$i <= $#$lev_moves) {  # shouldn't use a for since the size of the array changes
-            # find the next row index with the same moveid
-            my $next_idx = first { $lev_moves->[$_]{moveid} == $lev_moves->[$i]{moveid} } $i + 1 .. $#$lev_moves;
+            # find the next row index with the same move id
+            my $next_idx = first { $lev_moves->[$_]{move_id} == $lev_moves->[$i]{move_id} } $i + 1 .. $#$lev_moves;
             next if not defined $next_idx;
 
@@ -673 +671 @@
             }
             if (scalar keys %{ $from->{versions} } == 0) {  
-                # only moveid left, so delete this row and redo to hit the next one
+                # only move id left, so delete this row and redo to hit the next one
                 splice @$lev_moves, $from_idx, 1;
                 redo;
@@ -704 +702 @@
         map { $_->generation => $_->text } $row->flavors
     };
-    $s->{generation} = ( grep { $Generations[$_]{maxid} >= $row->real_id } 0 .. $#Generations )[0];
+    $s->{generation} = ( grep { $Generations[$_]{maxid} >= $row->real_pokemon_id } 0 .. $#Generations )[0];
 
     $s->{page_title} = $row->name . ' - Flavor Text and Images';
@@ -785 +783 @@
         ? Vee::Utils::round( $c->model('DBIC::Moves')->count({ power => { '!=' => undef, '<' => $row->power } }) / $DamagingMoveCount * 100, 1 )
         :'n/a';
-    $s->{tm_info} = { map { $_->generation => $_ } $c->model('DBIC::Machines')->search({ moveid => $row->id }) };
+    $s->{tm_info} = { map { $_->generation => $_ } $c->model('DBIC::Machines')->search({ move_id => $row->id }) };
 
     # status effect
@@ -805 +803 @@
 
     # contest stuffs
-    my $contest_family_rs = $c->model('DBIC::Moves')->search({ coneffect => $row->coneffect, id => { '!=', $row->id } }, { columns => [qw/id name contype/], order_by => 'name ASC' });
+    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' });
     my %contest_family;
     $s->{contest_family_count} = 0;
     while (my $move = $contest_family_rs->next) {
-        push @{ $contest_family{ $move->contype } }, $move;
+        push @{ $contest_family{ $move->contest_type } }, $move;
         $s->{contest_family_count}++;
     }
@@ -818 +816 @@
     my %pokemon_count;
     my %valid_methods = map { $_ => 1 } qw/level egg tutor machine/;
-    my $pokemoves_rs = $c->model('DBIC::PokeMoves')->search({ moveid => $row->id });
+    my $pokemoves_rs = $c->model('DBIC::PokemonMoves')->search({ move_id => $row->id });
     my %pokemon_hash;  # method => pokemon id => version => level
     while (my $pm = $pokemoves_rs->next) {
@@ -829 +827 @@
             @versions = ('all');
         } else {
-            @versions = split /,/, $pm->version;
+            @versions = split /,/, $pm->versions;
         }
 
         for my $ver (@versions) {
-            $pokemon_hash{$method}{$pm->pokeid}{pokemon} ||= $pm->pokemon;
-            $pokemon_hash{$method}{$pm->pokeid}{$ver} = $pm->level || 1;
-        }
-        $pokemon_count{ $pm->pokeid } = 1;
+            $pokemon_hash{$method}{$pm->pokemon_id}{pokemon} ||= $pm->pokemon;
+            $pokemon_hash{$method}{$pm->pokemon_id}{$ver} = $pm->level || 1;
+        }
+        $pokemon_count{ $pm->pokemon_id } = 1;
     }
 
@@ -903 +901 @@
     $c->forward('/cache', [ $row->id ]);
 
-    $s->{hid}         = $row->internalid + 1;
+    $s->{hid}         = $row->internal_id + 1;
     $s->{generation}  = ($row->name eq 'dark' || $row->name eq 'steel') ? 1 : 0;
 
@@ -1190 +1188 @@
     my @extra;
     # n.b.: can ONLY prefetch one has_many here; DBIx::Class will refuse more due to cross-product effect
-    if ($table eq 'Pokemon') { @extra = ( prefetch => [qw/evchain pokemoves/], order_by => 'pokemoves.moveid ASC' ) }
-    elsif ($table eq 'Moves') { @extra = ( prefetch => 'pokemoves', order_by => 'pokemoves.pokeid ASC' ) }
+    if ($table eq 'Pokemon') { @extra = ( prefetch => [qw/evo_chain pokemon_moves/], order_by => 'pokemon_moves.move_id ASC' ) }
+    elsif ($table eq 'Moves') { @extra = ( prefetch => 'pokemon_moves', order_by => 'pokemon_moves.pokemon_id ASC' ) }
     
     if ($id eq 'random') {