Changeset 441

Timestamp:

06/25/12 19:36:48 (12 years ago)

Author:

nanardon

Message:

• fix DBIx query, find() w/o key is now fatal

Location:

server/trunk/web/lib/Sophie

Files:

• Base/Result/DesktopFiles.pm (modified) (1 diff)
• Scan/RpmParser/Desktopfile.pm (modified) (1 diff)
• Scan/RpmsPath.pm (modified) (5 diffs)

server/trunk/web/lib/Sophie/Base/Result/DesktopFiles.pm

@@ -8 +8 @@
 __PACKAGE__->add_columns(qw/pkgid count desktop_file_pkey/);
 __PACKAGE__->set_primary_key(qw/desktop_file_pkey/);
+__PACKAGE__->add_unique_constraint('pkgid_count' => [ 'pkgid', 'count' ]);
 __PACKAGE__->belongs_to(BinFiles => 'Sophie::Base::Result::BinFiles', [ 'pkgid', 'count' ]);
 __PACKAGE__->belongs_to(Rpms => 'Sophie::Base::Result::Rpms', 'pkgid');

server/trunk/web/lib/Sophie/Scan/RpmParser/Desktopfile.pm

@@ -73 +73 @@
                                 count => $filelist{$fname}->count,
                                 pkgid => $pkgid,
-                            }
+                            },
+                            { key => 'pkgid_count' },
                         );
                         foreach my $param ($ini->Parameters('Desktop Entry')) {

server/trunk/web/lib/Sophie/Scan/RpmsPath.pm

@@ -27 +27 @@
     
     $self->db->base->resultset('Paths')->find(
-        { d_path_key => $self->key }
+        { d_path_key => $self->key },
+        { key => 'd_path_key' },
     )->path;
 }
@@ -122 +123 @@
     my ($self, $exists) = @_;
     $self->db->base->resultset('Paths')->find(
-        { d_path_key => $self->key }
+        { d_path_key => $self->key },
+        { key => 'd_path_key' },
     )->update({ 'exists' => ($exists ? 1 : 0) });
     $self->db->commit;
@@ -130 +132 @@
     my ($self) = @_;
     $self->db->base->resultset('Paths')->find(
-        { d_path_key => $self->key }
+        { d_path_key => $self->key },
+        { key => 'd_path_key' },
     )->update({ needupdate => 0 });
     $self->db->commit;
@@ -138 +141 @@
     my ($self) = @_;
     $self->db->base->resultset('Paths')->find(
-        { d_path_key => $self->key }
+        { d_path_key => $self->key },
+        { key => 'd_path_key' },
     )->get_column('needupdate');
 }
@@ -145 +149 @@
     my ($self) = @_;
     $self->db->base->resultset('Paths')->find(
-        { d_path_key => $self->key }
+        { d_path_key => $self->key },
+        { key => 'd_path_key' },
     )->update({ 'updated' => \'now()' });
     $self->db->commit;