Changeset 350

Timestamp:

10/23/07 01:30:10 (10 months ago)

Author:

eevee

Message:

I discovered that DBIx::Class::Schema::Loader had been filling my table classes with lines of the form __PACKAGE__->add_unique_constraint(['id'], undef); erroneously, due to someone's inadvertently iterating over %hash rather than keys %hash. Not only were these lines redundant in the case of a primary key, but the parameters are supposed to be a name and a list of columns: thus I had a lot of constraints with ARRAY(0x...) as names and no columns. This was thoroughly breaking $schema->deploy, as it was trying to create indices with garbage names that looked like functions. I have, obviously, removed them all.
In the process, I have done something I've been meaning to do for a while: cleaned up the source in every single file to match my usual style. No auto-gen comment, no redundant loading of PK::Auto, no double-newline after the 1;, proper POD, use of qw// for passing lists, etc. This is actually a teeny part of my db cleanup tracking bug. (#58)

Location:

veekun/trunk/lib/Vee/Schema

Files:

• Abilities.pm (modified) (1 diff)
• Berries.pm (modified) (1 diff)
• ContestMoves.pm (modified) (1 diff)
• Creators.pm (modified) (1 diff)
• Edits.pm (modified) (1 diff)
• ErrorLog.pm (modified) (1 diff)
• EvChains.pm (modified) (3 diffs)
• FlavorText.pm (modified) (1 diff)
• Forums.pm (modified) (1 diff)
• Gallery.pm (modified) (1 diff)
• GalleryKeywords.pm (modified) (1 diff)
• GroupPermissions.pm (modified) (1 diff)
• Groups.pm (modified) (1 diff)
• ItemKeywords.pm (modified) (1 diff)
• Items.pm (modified) (5 diffs)
• LocationEncounters.pm (modified) (2 diffs)
• Locations.pm (modified) (1 diff)
• Machines.pm (modified) (1 diff)
• Messages.pm (modified) (1 diff)
• MoveEffects.pm (modified) (1 diff)
• Moves.pm (modified) (6 diffs)
• Permissions.pm (modified) (1 diff)
• PokeMoves.pm (modified) (1 diff)
• Pokemon.pm (modified) (6 diffs)
• PokemonAbilities.pm (modified) (1 diff)
• PokemonBreeds.pm (modified) (1 diff)
• PokemonItems.pm (modified) (1 diff)
• Posts.pm (modified) (2 diffs)
• Sessions.pm (modified) (1 diff)
• Shoutbox.pm (modified) (1 diff)
• ThreadViews.pm (modified) (2 diffs)
• Threads.pm (modified) (4 diffs)
• Types.pm (modified) (1 diff)
• UserGroups.pm (modified) (1 diff)
• UserPermissions.pm (modified) (1 diff)
• Users.pm (modified) (2 diffs)

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

@@ -1 +1 @@
 package Vee::Schema::Abilities;
-
-# Created by DBIx::Class::Schema::Loader v0.03003 @ 2006-07-11 01:54:10
 
 use strict;
 use warnings;
-
 use base 'DBIx::Class';
 
-__PACKAGE__->load_components("PK::Auto", "Core");
-__PACKAGE__->table("abilities");
-__PACKAGE__->add_columns("id", "name", "gameblurb", "effect");
-__PACKAGE__->set_primary_key("id");
-__PACKAGE__->add_unique_constraint(["id"], undef);
+=head1 NAME
+
+Vee::Schema::Abilities - DBIC class for the C<abilities> table
+
+=cut
+
+__PACKAGE__->load_components('Core');
+__PACKAGE__->table('abilities');
+__PACKAGE__->add_columns(qw/ id name gameblurb effect /);
+__PACKAGE__->set_primary_key('id');
 
 __PACKAGE__->has_many(pokemon_abilities => 'Vee::Schema::PokemonAbilities', 'abilityid');
 __PACKAGE__->many_to_many(pokemon => 'pokemon_abilities', 'pokemon');
 
+=head1 SEE ALSO
+
+L<Vee::Schema>, L<DBIx::Class>
+
+=head1 AUTHOR
+
+Maintainer: Alex "Eevee" Munroe (C<veekun@veekun.com>)
+
+See the included F<AUTHORS> file for a full list of contributers.
+
+=head1 LICENSE
+
+See the included F<LICENSE> file.
+
+=cut
+
 1;
-

veekun/trunk/lib/Vee/Schema/Berries.pm

@@ -1 +1 @@
 package Vee::Schema::Berries;
-
-# Created by DBIx::Class::Schema::Loader v0.03003 @ 2006-07-11 01:54:10
 
 use strict;
 use warnings;
-
 use base 'DBIx::Class';
 
-__PACKAGE__->load_components("PK::Auto", "Core");
-__PACKAGE__->table("berries");
+=head1 NAME
+
+Vee::Schema::Berries - DBIC class for the C<berries> table
+
+=cut
+
+__PACKAGE__->load_components('Core');
+__PACKAGE__->table('berries');
 __PACKAGE__->add_columns(qw/ id size firmness max_harvest growth_time soil_dryness spicy dry sweet bitter sour smoothness /);
-__PACKAGE__->set_primary_key("id");
-__PACKAGE__->add_unique_constraint(["id"], undef);
+__PACKAGE__->set_primary_key('id');
 
 __PACKAGE__->belongs_to(item => 'Vee::Schema::Items', { 'foreign.berry_id' => 'self.id' });
 
+=head1 SEE ALSO
+
+L<Vee::Schema>, L<DBIx::Class>
+
+=head1 AUTHOR
+
+Maintainer: Alex "Eevee" Munroe (C<veekun@veekun.com>)
+
+See the included F<AUTHORS> file for a full list of contributers.
+
+=head1 LICENSE
+
+See the included F<LICENSE> file.
+
+=cut
+
 1;
-

veekun/trunk/lib/Vee/Schema/ContestMoves.pm

@@ -1 +1 @@
 package Vee::Schema::ContestMoves;
-
-# Created by DBIx::Class::Schema::Loader v0.03003 @ 2006-07-11 01:54:10
 
 use strict;
 use warnings;
-
 use base 'DBIx::Class';
 
-__PACKAGE__->load_components("PK::Auto", "Core");
-__PACKAGE__->table("contestmoves");
-__PACKAGE__->add_columns("id", "appeal", "jam", "description", "effect");
-__PACKAGE__->set_primary_key("id");
-__PACKAGE__->add_unique_constraint(["id"], undef);
+=head1 NAME
+
+Vee::Schema::ContestMoves - DBIC class for the C<contestmoves> table
+
+=cut
+
+__PACKAGE__->load_components('Core');
+__PACKAGE__->table('contestmoves');
+__PACKAGE__->add_columns(qw/ id appeal jam description effect /);
+__PACKAGE__->set_primary_key('id');
+
+=head1 SEE ALSO
+
+L<Vee::Schema>, L<DBIx::Class>
+
+=head1 AUTHOR
+
+Maintainer: Alex "Eevee" Munroe (C<veekun@veekun.com>)
+
+See the included F<AUTHORS> file for a full list of contributers.
+
+=head1 LICENSE
+
+See the included F<LICENSE> file.
+
+=cut
 
 1;
-

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

@@ -1 +1 @@
 package Vee::Schema::Creators;
-
-# Created by DBIx::Class::Schema::Loader v0.03003 @ 2006-07-11 01:54:10
 
 use strict;
 use warnings;
-
 use base 'DBIx::Class';
 
-__PACKAGE__->load_components("PK::Auto", "Core");
-__PACKAGE__->table("creators");
-__PACKAGE__->add_columns("id", "userid", "name", "itemct");
-__PACKAGE__->set_primary_key("id");
-__PACKAGE__->add_unique_constraint("userid", ["userid"]);
-__PACKAGE__->add_unique_constraint(["userid"], undef);
-__PACKAGE__->add_unique_constraint(["id"], undef);
+=head1 NAME
+
+Vee::Schema::Creators - DBIC class for the C<creators> table
+
+=cut
+
+__PACKAGE__->load_components('Core');
+__PACKAGE__->table('creators');
+__PACKAGE__->add_columns(qw/ id userid name itemct /);
+__PACKAGE__->set_primary_key('id');
+__PACKAGE__->add_unique_constraint(userid => ['userid']);
+
+=head1 SEE ALSO
+
+L<Vee::Schema>, L<DBIx::Class>
+
+=head1 AUTHOR
+
+Maintainer: Alex "Eevee" Munroe (C<veekun@veekun.com>)
+
+See the included F<AUTHORS> file for a full list of contributers.
+
+=head1 LICENSE
+
+See the included F<LICENSE> file.
+
+=cut
 
 1;
-

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

@@ -1 +1 @@
 package Vee::Schema::Edits;
-
-# Created by DBIx::Class::Schema::Loader v0.03003 @ 2006-07-11 01:54:10
 
 use strict;
 use warnings;
-
 use base 'DBIx::Class';
 
-__PACKAGE__->load_components("PK::Auto", "Core");
-__PACKAGE__->table("edits");
-__PACKAGE__->add_columns("id", "postid", "userid", "time", "oldmessage");
-__PACKAGE__->set_primary_key("id");
-__PACKAGE__->add_unique_constraint(["id"], undef);
+=head1 NAME
 
-#__PACKAGE__->belongs_to(post => 'Vee::Schema::Posts', 'postid');
-#__PACKAGE__->belongs_to(user => 'Vee::Schema::Users', 'userid');
-# have to use might_have because more often than not there is no edit row for a post and that fucks everything up
+Vee::Schema::Edits - DBIC class for the C<edits> table
+
+=cut
+
+__PACKAGE__->load_components('Core');
+__PACKAGE__->table('edits');
+__PACKAGE__->add_columns(qw/ id postid userid time oldmessage /);
+__PACKAGE__->set_primary_key('id');
 
 __PACKAGE__->might_have(post => 'Vee::Schema::Posts', { 'foreign.id' => 'self.postid' });
 __PACKAGE__->might_have(user => 'Vee::Schema::Users', { 'foreign.id' => 'self.userid' });
 
+=head1 SEE ALSO
+
+L<Vee::Schema>, L<DBIx::Class>
+
+=head1 AUTHOR
+
+Maintainer: Alex "Eevee" Munroe (C<veekun@veekun.com>)
+
+See the included F<AUTHORS> file for a full list of contributers.
+
+=head1 LICENSE
+
+See the included F<LICENSE> file.
+
+=cut
+
 1;
-

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

@@ -1 +1 @@
 package Vee::Schema::ErrorLog;
-
-# Created by DBIx::Class::Schema::Loader v0.03003 @ 2006-07-11 01:54:10
 
 use strict;
 use warnings;
-
 use base 'DBIx::Class';
 
-__PACKAGE__->load_components("PK::Auto", "Core");
-__PACKAGE__->table("errorlog");
-__PACKAGE__->add_columns("id", "time", "userid", "ip", "path", "method", "query", "error");
-__PACKAGE__->set_primary_key("id");
-__PACKAGE__->add_unique_constraint(["id"], undef);
+=head1 NAME
+
+Vee::Schema::ErrorLog - DBIC class for the C<errorlog> table
+
+=cut
+
+__PACKAGE__->load_components('Core');
+__PACKAGE__->table('errorlog');
+__PACKAGE__->add_columns(qw/ id time userid ip path method query error /);
+__PACKAGE__->set_primary_key('id');
+
+=head1 SEE ALSO
+
+L<Vee::Schema>, L<DBIx::Class>
+
+=head1 AUTHOR
+
+Maintainer: Alex "Eevee" Munroe (C<veekun@veekun.com>)
+
+See the included F<AUTHORS> file for a full list of contributers.
+
+=head1 LICENSE
+
+See the included F<LICENSE> file.
+
+=cut
 
 1;

veekun/trunk/lib/Vee/Schema/EvChains.pm

@@ -1 +1 @@
 package Vee::Schema::EvChains;
-
-# Created by DBIx::Class::Schema::Loader v0.03003 @ 2006-07-11 01:54:10
 
 use strict;
 use warnings;
-
 use base 'DBIx::Class';
 
@@ -15 +12 @@
 # only because that's not a real chain anyway.
 
-__PACKAGE__->load_components("PK::Auto", "Core");
-__PACKAGE__->table("evchains");
-__PACKAGE__->add_columns(
-  "id",
-  "base",
-  "growth",
-  "chain",
-  "steps",
-  "babygs",
-  "babyc",
-  "babyrusa",
-  "baby_item",
-);
-__PACKAGE__->set_primary_key("id");
-__PACKAGE__->add_unique_constraint(["id"], undef);
+=head1 NAME
+
+Vee::Schema::EvChains - DBIC class for the C<evchains> table
+
+=cut
+
+__PACKAGE__->load_components('Core');
+__PACKAGE__->table('evchains');
+__PACKAGE__->add_columns(qw/
+    id
+    base
+    growth
+    chain
+    steps
+
+    babygs
+    babyc
+    babyrusa
+
+    baby_item
+/);
+__PACKAGE__->set_primary_key('id');
 
 __PACKAGE__->has_many(pokemon => 'Vee::Schema::Pokemon', 'evid');
@@ -35 +39 @@
 __PACKAGE__->belongs_to(base_pokemon => 'Vee::Schema::Pokemon', 'base');
 
+=head1 SEE ALSO
+
+L<Vee::Schema>, L<DBIx::Class>
+
+=head1 AUTHOR
+
+Maintainer: Alex "Eevee" Munroe (C<veekun@veekun.com>)
+
+See the included F<AUTHORS> file for a full list of contributers.
+
+=head1 LICENSE
+
+See the included F<LICENSE> file.
+
+=cut
+
 1;

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

@@ -3 +3 @@
 use strict;
 use warnings;
-
 use base 'DBIx::Class';
 
-__PACKAGE__->load_components("PK::Auto", "Core");
-__PACKAGE__->table("flavortext");
-__PACKAGE__->add_columns("pokeid", "generation", "text");
+=head1 NAME
+
+Vee::Schema::FlavorText - DBIC class for the C<flavortext> table
+
+=cut
+
+__PACKAGE__->load_components('Core');
+__PACKAGE__->table('flavortext');
+__PACKAGE__->add_columns(qw/ pokeid generation text /);
 
 __PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokeid');
 
+=head1 SEE ALSO
+
+L<Vee::Schema>, L<DBIx::Class>
+
+=head1 AUTHOR
+
+Maintainer: Alex "Eevee" Munroe (C<veekun@veekun.com>)
+
+See the included F<AUTHORS> file for a full list of contributers.
+
+=head1 LICENSE
+
+See the included F<LICENSE> file.
+
+=cut
+
 1;

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

@@ -1 +1 @@
 package Vee::Schema::Forums;
-
-# Created by DBIx::Class::Schema::Loader v0.03003 @ 2006-07-11 01:54:10
 
 use strict;
 use warnings;
-
 use base 'DBIx::Class';
 
-__PACKAGE__->load_components("PK::Auto", "Core");
-__PACKAGE__->table("forums");
-__PACKAGE__->add_columns("id", "name", "lastpostid", "threadct", "postct", "flags", "accessibility", "blurb");
-__PACKAGE__->set_primary_key("id");
-__PACKAGE__->add_unique_constraint(["id"], undef);
+=head1 NAME
+
+Vee::Schema::Forums - DBIC class for the C<forums> table
+
+=cut
+
+__PACKAGE__->load_components('Core');
+__PACKAGE__->table('forums');
+__PACKAGE__->add_columns(qw/
+    id name lastpostid threadct postct flags accessibility blurb
+/);
+__PACKAGE__->set_primary_key('id');
 
 __PACKAGE__->has_many(threads => 'Vee::Schema::Threads', 'forumid');
 __PACKAGE__->might_have(lastpost => 'Vee::Schema::Posts', { 'foreign.id' => 'self.lastpostid' });
 
+=head1 SEE ALSO
+
+L<Vee::Schema>, L<DBIx::Class>
+
+=head1 AUTHOR
+
+Maintainer: Alex "Eevee" Munroe (C<veekun@veekun.com>)
+
+See the included F<AUTHORS> file for a full list of contributers.
+
+=head1 LICENSE
+
+See the included F<LICENSE> file.
+
+=cut
+
 1;
-

veekun/trunk/lib/Vee/Schema/Gallery.pm

@@ -1 +1 @@
 package Vee::Schema::Gallery;
-
-# Created by DBIx::Class::Schema::Loader v0.03003 @ 2006-07-11 01:54:10
 
 use strict;
 use warnings;
-
 use base 'DBIx::Class';
 
-__PACKAGE__->load_components("PK::Auto", "Core");
-__PACKAGE__->table("gallery");
-__PACKAGE__->add_columns(
-  "id",
-  "creatorid",
-  "filename",
-  "uploaderid",
-  "approverid",
-  "time",
-  "hash",
-  "title",
-  "description",
-  "height",
-  "width",
-  "seriesid",
-  "position",
-  "type",
-);
-__PACKAGE__->set_primary_key("id");
-__PACKAGE__->add_unique_constraint("filename", ["filename"]);
-__PACKAGE__->add_unique_constraint(["filename"], undef);
-__PACKAGE__->add_unique_constraint(["id"], undef);
+=head1 NAME
+
+Vee::Schema::Gallery - DBIC class for the C<gallery> table
+
+=cut
+
+__PACKAGE__->load_components('Core');
+__PACKAGE__->table('gallery');
+__PACKAGE__->add_columns(qw/
+    id
+    creatorid
+    filename
+    uploaderid
+    approverid
+    time
+    hash
+    title
+    description
+    height
+    width
+    seriesid
+    position
+    type
+/);
+__PACKAGE__->set_primary_key('id');
+__PACKAGE__->add_unique_constraint(filename => ['filename']);
+
+=head1 SEE ALSO
+
+L<Vee::Schema>, L<DBIx::Class>
+
+=head1 AUTHOR
+
+Maintainer: Alex "Eevee" Munroe (C<veekun@veekun.com>)
+
+See the included F<AUTHORS> file for a full list of contributers.
+
+=head1 LICENSE
+
+See the included F<LICENSE> file.
+
+=cut
 
 1;
-

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

@@ -1 +1 @@
 package Vee::Schema::GalleryKeywords;
-
-# Created by DBIx::Class::Schema::Loader v0.03003 @ 2006-07-11 01:54:10
 
 use strict;
 use warnings;
-
 use base 'DBIx::Class';
 
-__PACKAGE__->load_components("PK::Auto", "Core");
-__PACKAGE__->table("gallerykeywords");
-__PACKAGE__->add_columns("id", "keyword", "category", "description");
-__PACKAGE__->set_primary_key("id");
+=head1 NAME
+
+Vee::Schema::GalleryKeywords - DBIC class for the C<gallerykeywords> table
+
+=cut
+
+__PACKAGE__->load_components('Core');
+__PACKAGE__->table('gallerykeywords');
+__PACKAGE__->add_columns(qw/ id keyword category description /);
+__PACKAGE__->set_primary_key('id');
 __PACKAGE__->add_unique_constraint("keyword", ["keyword"]);
-__PACKAGE__->add_unique_constraint(["keyword"], undef);
-__PACKAGE__->add_unique_constraint(["id"], undef);
+
+=head1 SEE ALSO
+
+L<Vee::Schema>, L<DBIx::Class>
+
+=head1 AUTHOR
+
+Maintainer: Alex "Eevee" Munroe (C<veekun@veekun.com>)
+
+See the included F<AUTHORS> file for a full list of contributers.
+
+=head1 LICENSE
+
+See the included F<LICENSE> file.
+
+=cut
 
 1;
-

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

@@ -1 +1 @@
 package Vee::Schema::GroupPermissions;
-
-# Created by DBIx::Class::Schema::Loader v0.03003 @ 2006-07-11 01:54:10
 
 use strict;
 use warnings;
-
 use base 'DBIx::Class';
 
-__PACKAGE__->load_components("PK::Auto", "Core");
-__PACKAGE__->table("grouppermissions");
-__PACKAGE__->add_columns("groupid", "permission", "scope", "polarity");
-__PACKAGE__->set_primary_key("groupid", "permission", "scope");
-__PACKAGE__->add_unique_constraint(["groupid", "permission", "scope"], undef);
+=head1 NAME
+
+Vee::Schema::GroupPermissions - DBIC class for the C<grouppermissions> table
+
+=cut
+
+__PACKAGE__->load_components('Core');
+__PACKAGE__->table('grouppermissions');
+__PACKAGE__->add_columns(qw/ groupid permission scope polarity /);
+__PACKAGE__->set_primary_key(qw/ groupid permission scope /);
 
 1;

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

@@ -1 +1 @@
 package Vee::Schema::Groups;
-
-# Created by DBIx::Class::Schema::Loader v0.03003 @ 2006-07-11 01:54:10
 
 use strict;
 use warnings;
-
 use base 'DBIx::Class';
 
-__PACKAGE__->load_components("PK::Auto", "Core");
-__PACKAGE__->table("groups");
-__PACKAGE__->add_columns("id", "icon", "name");
-__PACKAGE__->set_primary_key("id");
-__PACKAGE__->add_unique_constraint(["id"], undef);
+=head1 NAME
+
+Vee::Schema::Groups - DBIC class for the C<groups> table
+
+=cut
+
+__PACKAGE__->load_components('Core');
+__PACKAGE__->table('groups');
+__PACKAGE__->add_columns(qw/ id icon name /);
+__PACKAGE__->set_primary_key('id');
 
 __PACKAGE__->has_many(user_groups => 'Vee::Schema::UserGroups', 'groupid');

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

@@ -1 +1 @@
 package Vee::Schema::ItemKeywords;
-
-# Created by DBIx::Class::Schema::Loader v0.03003 @ 2006-07-11 01:54:10
 
 use strict;
 use warnings;
-
 use base 'DBIx::Class';
 
-__PACKAGE__->load_components("PK::Auto", "Core");
-__PACKAGE__->table("itemkeywords");
-__PACKAGE__->add_columns("itemid", "keywordid");
-__PACKAGE__->set_primary_key("itemid", "keywordid");
-__PACKAGE__->add_unique_constraint(["itemid", "keywordid"], undef);
+=head1 NAME
+
+Vee::Schema::ItemKeywords - DBIC class for the C<itemkeywords> table
+
+=cut
+
+__PACKAGE__->load_components('Core');
+__PACKAGE__->table('itemkeywords');
+__PACKAGE__->add_columns(qw/ itemid keywordid /);
+__PACKAGE__->set_primary_key(qw/ itemid keywordid /);
+
+=head1 SEE ALSO
+
+L<Vee::Schema>, L<DBIx::Class>
+
+=head1 AUTHOR
+
+Maintainer: Alex "Eevee" Munroe (C<veekun@veekun.com>)
+
+See the included F<AUTHORS> file for a full list of contributers.
+
+=head1 LICENSE
+
+See the included F<LICENSE> file.
+
+=cut
 
 1;
-