Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 90bb521a

Von Moritz Bunkus vor mehr als 11 Jahren hinzugefügt

  • ID 90bb521a25eeb37c5bbae1ff68c38e6c142b6e6b
  • Vorgänger b49ec094
  • Nachfolger 66c08b64

Alle Vorkommen von dbdriver, sid, Oracle entfernt

...und gegen das hardcodierte Werte für PostgreSQL ersetzt.

Unterschiede anzeigen:

SL/DO.pm
672 672
    delete $form->{id};
673 673
  }
674 674

  
675
  my %oid = ('Pg'     => 'oid',
676
             'Oracle' => 'rowid');
677

  
678 675
  # retrieve individual items
679 676
  # this query looks up all information about the items
680 677
  # stuff different from the whole will not be overwritten, but saved with a suffix.
......
693 690
       LEFT JOIN project pr ON (doi.project_id = pr.id)
694 691
       LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
695 692
       WHERE doi.delivery_order_id IN ($do_ids_placeholders)
696
       ORDER BY doi.$oid{$myconfig->{dbdriver}}|;
693
       ORDER BY doi.oid|;
697 694

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

  
......
752 749
  my $partsgroup;
753 750
  my $position = 0;
754 751

  
755
  my %oid = ('Pg'     => 'oid',
756
             'Oracle' => 'rowid');
757

  
758 752
  my (@project_ids, %projectnumbers, %projectdescriptions);
759 753

  
760 754
  push(@project_ids, $form->{"globalproject_id"}) if ($form->{"globalproject_id"});
......
869 863
      my $sortorder = "";
870 864
      if ($form->{groupitems}) {
871 865
        $sortorder =
872
          qq|ORDER BY pg.partsgroup, a.$oid{$myconfig->{dbdriver}}|;
866
          qq|ORDER BY pg.partsgroup, a.oid|;
873 867
      } else {
874
        $sortorder = qq|ORDER BY a.$oid{$myconfig->{dbdriver}}|;
868
        $sortorder = qq|ORDER BY a.oid|;
875 869
      }
876 870

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

Auch abrufbar als: Unified diff