Merge branch 'fronkdev' into 'master'
Fixed ADBHausnummer::count() with joins sql See merge request fronk/thetool!1460
This commit is contained in:
@@ -121,12 +121,12 @@ class ADBHausnummerModel {
|
|||||||
|
|
||||||
if ($join_tables) {
|
if ($join_tables) {
|
||||||
$sql = "SELECT COUNT(*) as cnt FROM (
|
$sql = "SELECT COUNT(*) as cnt FROM (
|
||||||
SELECT Hausnummer.id FROM Hausnummer
|
SELECT Hausnummer.id FROM Hausnummer
|
||||||
LEFT JOIN Ortschaft ON (Ortschaft.id = Hausnummer.ortschaft_id)
|
LEFT JOIN Ortschaft ON (Ortschaft.id = Hausnummer.ortschaft_id)
|
||||||
LEFT JOIN Gemeinde ON (Gemeinde.id = Ortschaft.gemeinde_id)
|
LEFT JOIN Gemeinde ON (Gemeinde.id = Ortschaft.gemeinde_id)
|
||||||
LEFT JOIN Strasse ON (Hausnummer.strasse_id = Strasse.id)
|
LEFT JOIN Strasse ON (Hausnummer.strasse_id = Strasse.id)
|
||||||
LEFT JOIN Plz ON (Hausnummer.plz_id = Plz.id)
|
LEFT JOIN Plz ON (Hausnummer.plz_id = Plz.id)
|
||||||
LEFT JOIN HausnummerStatusflagValue ON (HausnummerStatusflagValue.hausnummer_id = Hausnummer.id)";
|
LEFT JOIN HausnummerStatusflagValue ON (HausnummerStatusflagValue.hausnummer_id = Hausnummer.id)";
|
||||||
} else {
|
} else {
|
||||||
$sql = "SELECT COUNT(*) as cnt FROM Hausnummer";
|
$sql = "SELECT COUNT(*) as cnt FROM Hausnummer";
|
||||||
}
|
}
|
||||||
@@ -142,6 +142,9 @@ class ADBHausnummerModel {
|
|||||||
$sql .= " GROUP BY Hausnummer.id";
|
$sql .= " GROUP BY Hausnummer.id";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if($join_tables) {
|
||||||
|
$sql .= ") count_table";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
mfLoghandler::singleton()->debug($sql);
|
mfLoghandler::singleton()->debug($sql);
|
||||||
|
|||||||
Reference in New Issue
Block a user