Neue Spalten verwurstet

diff --git a/lib/FrBr/Books/Db/Result/BuchListe.pm b/lib/FrBr/Books/Db/Result/BuchListe.pm
index abb2298da84f2bac43d027431a8d3b43340f938f..d6bc76c57e946996bf0d3cc2b4a350d55fd66822 100644 (file)
--- a/lib/FrBr/Books/Db/Result/BuchListe.pm
+++ b/lib/FrBr/Books/Db/Result/BuchListe.pm
@@ -26,6 +26,13 @@ __PACKAGE__->add_columns(
     "preis",
     "verlags_id",
     "orts_id",
+    "notes",
+    "notes",
+    "created_at",
+    "id_created_by",
+    "name_created_by",
+    "changed_at",
+    "id_changed_by",
     "waehrungs_kuerzel",
     "waehrung",
     "ort",
@@ -52,6 +59,13 @@ __PACKAGE__->result_source_instance()->name( \<<SQL );
          `preis`,
          `verlags_id`,
          `orts_id`,
+         `notes`,
+         `created_at`,
+         `id_created_by`,
+         `name_created_by`,
+         `changed_at`,
+         `id_changed_by`,
+         `name_changed_by`,
          `waehrungs_kuerzel`,
          `waehrung`,
          `ort`,
@@ -74,6 +88,13 @@ __PACKAGE__->result_source_instance()->name( \<<SQL );
                   b.`preis`             AS `preis`,
                   b.`verlags_id`        AS `verlags_id`,
                   b.`orts_id`           AS `orts_id`,
+                  b.`notes`             AS `notes`,
+                  b.`created_at`        AS `created_at`,
+                  b.`created_by`        AS `id_created_by`,
+                  CONCAT( IFNULL( created_by.`vorname`, '' ), IF( ISNULL( created_by.`vorname`), '', ' ' ), created_by.`nachname` ) AS `name_created_by`,
+                  b.`changed_at`        AS `changed_at`,
+                  b.`changed_by`        AS `id_changed_by`,
+                  CONCAT( IFNULL( changed_by.`vorname`, '' ), IF( ISNULL( changed_by.`vorname`), '', ' ' ), changed_by.`nachname` ) AS `name_changed_by`,
                   w.`waehrungs_kuerzel` AS `waehrungs_kuerzel`,
                   w.`waehrungs_name`    AS `waehrung`,
                   CONCAT( '`', a.`nachname`,
@@ -97,16 +118,18 @@ __PACKAGE__->result_source_instance()->name( \<<SQL );
                   CONCAT( '`', s.`serien_name`, '`' )    AS `serie`,
                   bi.`art_name`         AS `bindungsart`
              FROM autor2buch AS ab
-             LEFT  JOIN `autoren`        a  ON ab.`autor_id` = a.`id`
-             RIGHT JOIN `buecher`        b  ON ab.`buch_id`  = b.`id`
-             LEFT  JOIN `bindungsarten`  bi ON b.`bindungsart_id` = bi.`id`
-             LEFT  JOIN `verlage`        v  ON b.`verlags_id` = v.`id`
-             LEFT  JOIN `orte`           o  ON b.`orts_id` = o.`id`
-             LEFT  JOIN `waehrungen`     w  ON b.`waehrungs_id` = w.`id`
-             LEFT  JOIN `buch2kategorie` bk ON b.`id` = bk.`buch_id`
-             LEFT  JOIN `kategorien`     k  ON k.`id` = bk.`kategorie_id`
-             LEFT  JOIN `buch2serie`     bs ON b.`id` = bs.`buch_id`
-             LEFT  JOIN `serien`         s  ON s.`id` = bs.`serien_id`
+             LEFT  JOIN `autoren`        a          ON ab.`autor_id` = a.`id`
+             RIGHT JOIN `buecher`        b          ON ab.`buch_id`  = b.`id`
+             LEFT  JOIN `bindungsarten`  bi         ON b.`bindungsart_id` = bi.`id`
+             LEFT  JOIN `verlage`        v          ON b.`verlags_id` = v.`id`
+             LEFT  JOIN `orte`           o          ON b.`orts_id` = o.`id`
+             LEFT  JOIN `waehrungen`     w          ON b.`waehrungs_id` = w.`id`
+             LEFT  JOIN `buch2kategorie` bk         ON b.`id` = bk.`buch_id`
+             LEFT  JOIN `kategorien`     k          ON k.`id` = bk.`kategorie_id`
+             LEFT  JOIN `buch2serie`     bs         ON b.`id` = bs.`buch_id`
+             LEFT  JOIN `serien`         s          ON s.`id` = bs.`serien_id`
+                   JOIN `users`          created_by ON b.`created_by` = created_by.`user_id`
+                   JOIN `users`          changed_by ON b.`changed_by` = changed_by.`user_id`
     ) AS `a`
   GROUP BY `id`
 )