Alle Vorkommen von dbdriver, sid, Oracle entfernt

[mfinanz.git] / SL / DO.pm

diff --git a/SL/DO.pm b/SL/DO.pm
index a4677bbd9881971ae3d7ef2dff57c032ed4a2aeb..fb8672c6a6fab970c250ad043715ee52b2dd9d06 100644 (file)
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -672,9 +672,6 @@ sub retrieve {
     delete $form->{id};
   }
 
     delete $form->{id};
   }
 

-  my %oid = ('Pg'     => 'oid',
-             'Oracle' => 'rowid');
-

   # retrieve individual items
   # this query looks up all information about the items
   # stuff different from the whole will not be overwritten, but saved with a suffix.
   # retrieve individual items
   # this query looks up all information about the items
   # stuff different from the whole will not be overwritten, but saved with a suffix.


@@ -693,7 +690,7 @@ sub retrieve {
        LEFT JOIN project pr ON (doi.project_id = pr.id)
        LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
        WHERE doi.delivery_order_id IN ($do_ids_placeholders)
        LEFT JOIN project pr ON (doi.project_id = pr.id)
        LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
        WHERE doi.delivery_order_id IN ($do_ids_placeholders)

-       ORDER BY doi.$oid{$myconfig->{dbdriver}}|;
+       ORDER BY doi.oid|;

 
   $form->{form_details} = selectall_hashref_query($form, $dbh, $query, @do_ids);
 
 
   $form->{form_details} = selectall_hashref_query($form, $dbh, $query, @do_ids);
 


@@ -752,9 +749,6 @@ sub order_details {
   my $partsgroup;
   my $position = 0;
 
   my $partsgroup;
   my $position = 0;
 

-  my %oid = ('Pg'     => 'oid',
-             'Oracle' => 'rowid');
-

   my (@project_ids, %projectnumbers, %projectdescriptions);
 
   push(@project_ids, $form->{"globalproject_id"}) if ($form->{"globalproject_id"});
   my (@project_ids, %projectnumbers, %projectdescriptions);
 
   push(@project_ids, $form->{"globalproject_id"}) if ($form->{"globalproject_id"});


@@ -869,9 +863,9 @@ sub order_details {
       my $sortorder = "";
       if ($form->{groupitems}) {
         $sortorder =
       my $sortorder = "";
       if ($form->{groupitems}) {
         $sortorder =

-          qq|ORDER BY pg.partsgroup, a.$oid{$myconfig->{dbdriver}}|;
+          qq|ORDER BY pg.partsgroup, a.oid|;

       } else {
       } else {

-        $sortorder = qq|ORDER BY a.$oid{$myconfig->{dbdriver}}|;
+        $sortorder = qq|ORDER BY a.oid|;

       }
 
       do_statement($form, $h_pg, $q_pg, conv_i($form->{"id_$i"}));
       }
 
       do_statement($form, $h_pg, $q_pg, conv_i($form->{"id_$i"}));