Improved definition style

diff --git a/src/Database/DBView.php b/src/Database/DBView.php
index f23ab152ee4813d159fc6639fc46d16d1a130749..cd1d22e1e11a66c122eb85cde2146e8a2bb7ba33 100644 (file)
--- a/src/Database/DBView.php
+++ b/src/Database/DBView.php
@@ -109,7 +109,11 @@ class DBView
 
                $sql_rows = [];
                foreach ($structure["fields"] AS $fieldname => $origin) {
-                       $sql_rows[] = $origin . " AS `" . DBA::escape($fieldname) . "`";
+                       if (is_string($origin)) {
+                               $sql_rows[] = $origin . " AS `" . DBA::escape($fieldname) . "`";
+                       } elseif (is_array($origin) && (sizeof($origin) == 2)) {
+                               $sql_rows[] = "`" . DBA::escape($origin[0]) . "`.`" . DBA::escape($origin[1]) . "` AS `" . DBA::escape($fieldname) . "`";
+                       }
                }
 
                $sql = sprintf("DROP VIEW IF EXISTS `%s`", DBA::escape($name));

diff --git a/static/dbview.config.php b/static/dbview.config.php
index 6bc327697aeff592931b1e2906120c34a2e7cf3b..165ae2fa1b9f89b7bc2f7eec16952553e282fa90 100755 (executable)
--- a/static/dbview.config.php
+++ b/static/dbview.config.php
@@ -24,8 +24,7 @@
  * Syntax (braces indicate optionale values):
  * "<view name>" => [
  *     "fields" => [
- *             "<field name>" => "`table`.`field`",
- *             "<field name>" => "`other-table`.`field`",
+ *             "<field name>" => ["table", "field"],
  *             "<field name>" => "SQL expression",
  *             ...
  *     ],
@@ -39,12 +38,12 @@
 
 return [
        "tag-view" => [
-               "fields" => ["uri-id" => "`post-tag`.`uri-id`",
-                       "uri" => "`item-uri`.`uri`",
-                       "guid" => "`item-uri`.`guid`",
-                       "type" => "`post-tag`.`type`",
-                       "tid" => "`post-tag`.`tid`",
-                       "cid" => "`post-tag`.`cid`",
+               "fields" => ["uri-id" => ["post-tag", "uri-id"],
+                       "uri" => ["item-uri", "uri"],
+                       "guid" => ["item-uri", "guid"],
+                       "type" => ["post-tag", "type"],
+                       "tid" => ["post-tag", "tid"],
+                       "cid" => ["post-tag", "cid"],
                        "name" => "CASE `cid` WHEN 0 THEN `tag`.`name` ELSE `contact`.`name` END",
                        "url" => "CASE `cid` WHEN 0 THEN `tag`.`url` ELSE `contact`.`url` END"],
                "query" => "FROM `post-tag`