[Cpan-forum-commit] rev 348 - in trunk: . lib/CPAN/Forum/DB

[svn at pti.co.il]

Author: gabor
Date: 2007-08-14 11:35:58 +0300 (Tue, 14 Aug 2007)
New Revision: 348

Modified:
   trunk/
   trunk/lib/CPAN/Forum/DB/Groups.pm
   trunk/lib/CPAN/Forum/DB/Posts.pm
   trunk/lib/CPAN/Forum/DB/Users.pm
Log:
remove the CDBI relation definitions



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 7bc34947-122d-0410-bc5a-f898d2bb5f81:/local/cpan-forum:4434
8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/cpan-forum:12752
   + 7bc34947-122d-0410-bc5a-f898d2bb5f81:/local/cpan-forum:4435
8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/cpan-forum:12752

Modified: trunk/lib/CPAN/Forum/DB/Groups.pm
===================================================================
--- trunk/lib/CPAN/Forum/DB/Groups.pm	2007-08-14 08:35:41 UTC (rev 347)
+++ trunk/lib/CPAN/Forum/DB/Groups.pm	2007-08-14 08:35:58 UTC (rev 348)
@@ -3,18 +3,7 @@
 use warnings;
 use Carp;
 use base 'CPAN::Forum::DBI';
-__PACKAGE__->table('groups');
-__PACKAGE__->columns(Primary   => qw/id/);
-__PACKAGE__->columns(Essential => qw/id name version pauseid/);
-__PACKAGE__->columns(Others    => qw/gtype status rating review_count/);
 
-__PACKAGE__->has_many(posts         => "CPAN::Forum::DB::Posts");
-__PACKAGE__->has_many(subscriptions => "CPAN::Forum::DB::Subscriptions");
-__PACKAGE__->has_a   (pauseid       => "CPAN::Forum::DB::Authors");
-
-__PACKAGE__->set_sql(count_like     => "SELECT count(*) FROM __TABLE__ WHERE %s LIKE '%s'");
-__PACKAGE__->set_sql(count          => "SELECT count(*) FROM __TABLE__ WHERE %s = '%s'");
-
 use List::MoreUtils qw(none);
 
 sub info_by {

Modified: trunk/lib/CPAN/Forum/DB/Posts.pm
===================================================================
--- trunk/lib/CPAN/Forum/DB/Posts.pm	2007-08-14 08:35:41 UTC (rev 347)
+++ trunk/lib/CPAN/Forum/DB/Posts.pm	2007-08-14 08:35:58 UTC (rev 348)
@@ -3,17 +3,7 @@
 use warnings;
 use Carp;
 use base 'CPAN::Forum::DBI';
-__PACKAGE__->table('posts');
-__PACKAGE__->columns(All => qw/id gid uid parent subject text date thread hidden/);
-__PACKAGE__->columns(Essential => qw/id gid uid parent subject text date thread hidden/);
-__PACKAGE__->has_a(parent => "CPAN::Forum::DB::Posts");
-__PACKAGE__->has_a(uid    => "CPAN::Forum::DB::Users");
-__PACKAGE__->has_a(gid    => "CPAN::Forum::DB::Groups");
 
-__PACKAGE__->set_sql(latest         => "SELECT __ESSENTIAL__ FROM __TABLE__ ORDER BY DATE DESC LIMIT %s");
-
-__PACKAGE__->set_sql(count_where    => "SELECT count(*) FROM __TABLE__ WHERE %s='%s'");
-__PACKAGE__->set_sql(count_like     => "SELECT count(*) FROM __TABLE__ WHERE %s LIKE '%s'");
 my $MORE_SQL = 'groups.name group_name, users.fname user_fname, users.lname user_lname, users.username user_username';
 
 
@@ -127,7 +117,7 @@
     #%where = (1 => 1) if not %where;
     $CPAN::Forum::logger->debug(Data::Dumper->Dump([\%where], ['where']));
 
-    my $pager = __PACKAGE__->mypager(
+    my $pager = $self->mypager(
         where         => \%where,
         per_page      => $params->{per_page} || 10,
         page          => $params->{page}     || 1,

Modified: trunk/lib/CPAN/Forum/DB/Users.pm
===================================================================
--- trunk/lib/CPAN/Forum/DB/Users.pm	2007-08-14 08:35:41 UTC (rev 347)
+++ trunk/lib/CPAN/Forum/DB/Users.pm	2007-08-14 08:35:58 UTC (rev 348)
@@ -3,10 +3,6 @@
 use warnings;
 use Carp;
 use base 'CPAN::Forum::DBI';
-__PACKAGE__->table('users');
-__PACKAGE__->columns(All => qw/id username password email fname lname status
-                            update_on_new_user/);
-__PACKAGE__->has_many(posts => "CPAN::Forum::DB::Posts");
  
 
 use List::MoreUtils qw(none);