From: Michael R. <mr...@us...> - 2002-03-19 09:11:16
|
Update of /cvsroot/kick/kick In directory usw-pr-cvs1:/tmp/cvs-serv11101 Modified Files: auszg Log Message: Tools wird nicht mehr gebunden Unterschiedliche JOIN Syntax für MySql und MS Access Anpassung an Rückgabe-Array &Sql_Spalten Quote-Anpassung im Datumsformat (unterschiedliche Behandlung MySql und MS Access) Index: auszg =================================================================== RCS file: /cvsroot/kick/kick/auszg,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** auszg 23 Oct 2001 20:38:48 -0000 1.5 --- auszg 19 Mar 2002 09:11:12 -0000 1.6 *************** *** 10,14 **** use Kick; use GetOption; - use Tools; use Date::Calc qw(check_date Add_Delta_Days); use Text::ParseWords; --- 10,13 ---- *************** *** 79,108 **** # Ein-/Auszahlungen im Report erscheinen ! my $sql = "SELECT ! a.datum AS datum, ! SUM(b.anteile * a.preis * b.waehrung) AS ez1, ! 0 / 1 AS ez2, ! 0 / 1 AS az1, ! 0 / 1 AS az2, ! SUM(b.anteile) AS a1, ! 0 / 1 AS a2, ! MIN(a.preis) AS p1, ! MAX(a.preis) AS p2, ! 0 / 1 AS w ! INTO ! temp ! FROM ! abschluss a ! LEFT OUTER JOIN ! tbuchungen b ! ON ! a.id = b.xende ! WHERE ! b.anteile > 0 ! $interval ! GROUP BY ! a.datum"; ! &Sql ( sql => $sql ); # Auszahlungen --- 78,151 ---- # Ein-/Auszahlungen im Report erscheinen ! my $sql; ! if (&DBDriver eq 'mysql') { ! $sql = 'CREATE TABLE temp ( ! datum DATE NOT NULL, ! ez1 DOUBLE, ! ez2 DOUBLE, ! az1 DOUBLE, ! az2 DOUBLE, ! a1 DOUBLE, ! a2 DOUBLE, ! p1 DOUBLE, ! p2 DOUBLE, ! w DOUBLE ! )'; ! &Sql ( sql => $sql, halt => 1 ); ! ! $sql = "INSERT INTO temp ! SELECT ! a.datum AS datum, ! SUM(b.anteile * a.preis * b.waehrung) AS ez1, ! 0 / 1 AS ez2, ! 0 / 1 AS az1, ! 0 / 1 AS az2, ! SUM(b.anteile) AS a1, ! 0 / 1 AS a2, ! MIN(a.preis) AS p1, ! MAX(a.preis) AS p2, ! 0 / 1 AS w ! FROM ! abschluss a ! LEFT OUTER JOIN ! tbuchungen b ! ON ! a.id = b.xende ! WHERE ! b.anteile > 0 ! $interval ! GROUP BY ! a.datum"; ! } ! else { ! ! $sql = "SELECT ! a.datum AS datum, ! SUM(b.anteile * a.preis * b.waehrung) AS ez1, ! 0 / 1 AS ez2, ! 0 / 1 AS az1, ! 0 / 1 AS az2, ! SUM(b.anteile) AS a1, ! 0 / 1 AS a2, ! MIN(a.preis) AS p1, ! MAX(a.preis) AS p2, ! 0 / 1 AS w ! INTO ! temp ! FROM ! abschluss a ! LEFT OUTER JOIN ! tbuchungen b ! ON ! a.id = b.xende ! WHERE ! b.anteile > 0 ! $interval ! GROUP BY ! a.datum"; ! } ! ! &Sql ( sql => $sql, halt => 1 ); # Auszahlungen *************** *** 247,251 **** if ($opt { csv }) { ! print join "\n", map { (join ";", map { &IsNumber(Trim($_)) ? Trim($_) : '"'.Trim($_).'"' } @{$_}) } (@col, @reformat); print "\n"; } --- 290,294 ---- if ($opt { csv }) { ! print join "\n", map { (join ";", map { &IsNumber(Trim($_)) ? Trim($_) : '"'.Trim($_).'"' } @{$_}) } (\@col, @reformat); print "\n"; } *************** *** 391,394 **** --- 434,444 ---- $Log$ + Revision 1.6 2002/03/19 09:11:12 mrau + + Tools wird nicht mehr gebunden + Unterschiedliche JOIN Syntax für MySql und MS Access + Anpassung an Rückgabe-Array &Sql_Spalten + Quote-Anpassung im Datumsformat (unterschiedliche Behandlung MySql und MS Access) + Revision 1.5 2001/10/23 20:38:48 mrau SQL-Fix: Bewertungen ohne Zahlungen werden jetzt auch angezeigt |