Re-order LEFT JOIN pages before LEFT JOIN rpm

[packages/dokuwiki-plugin-data.git] / separate-rpmdb.patch

diff --git a/separate-rpmdb.patch b/separate-rpmdb.patch
index 893c03b9f4daba39c54d5e88902a27c4177ead25..7a4e71e01f53dfe1edad4f46ccd40b0c9948ab34 100644 (file)
--- a/separate-rpmdb.patch
+++ b/separate-rpmdb.patch
@@ -10,21 +10,16 @@ CREATE TABLE rpmdb (eid INTEGER PRIMARY KEY, pid INTEGER, value);
 Handling it automatically would mean have to renumber upstream patches each
 time...
 
-#--- dokuwiki-plugin-data-20120227/db/latest.version~  2012-02-27 16:32:51.000000000 +0200
-#+++ dokuwiki-plugin-data-20120227/db/latest.version   2012-03-13 13:10:57.241251292 +0200
-#@@ -1 +1 @@
-#-5
-#+6
---- dokuwiki-plugin-data-20120227/helper.php~  2012-03-13 13:10:04.000000000 +0200
-+++ dokuwiki-plugin-data-20120227/helper.php   2012-03-13 13:11:33.742793083 +0200
-@@ -184,6 +184,7 @@
-         static $specials = array('%title%'   => array('page', 'title'),
-                                  '%pageid%'  => array('title', 'page'),
-                                  '%class%'   => array('class'),
-+                                 '%rpm%'     => array('rpm'),
-                                  '%lastmod%' => array('lastmod','timestamp'));
-         if (isset($specials[$column['title']])) {
-             $s = $specials[$column['title']];
+--- dokuwiki-plugin-data-20160311/helper.php~  2016-11-22 23:06:06.000000000 +0200
++++ dokuwiki-plugin-data-20160311/helper.php   2016-11-22 23:06:44.267324645 +0200
+@@ -385,6 +385,7 @@
+             '%title%'   => array('page', 'title'),
+             '%pageid%'  => array('title', 'page'),
+             '%class%'   => array('class'),
++            '%rpm%'     => array('rpm'),
+             '%lastmod%' => array('lastmod', 'timestamp')
+         );
+         if(isset($specials[$column['title']])) {
 --- dokuwiki-plugin-data-20120227/lang/en/lang.php~    2012-02-27 16:32:51.000000000 +0200
 +++ dokuwiki-plugin-data-20120227/lang/en/lang.php     2012-03-13 13:12:04.190745746 +0200
 @@ -16,6 +16,7 @@
@@ -35,19 +30,41 @@ time...
  $lang['lastmod']   = 'Last Modified';
  
  $lang['name']      = 'Type Alias';
---- dokuwiki-plugin-data-20100608/syntax/table.php     2010-11-03 15:20:30.000000000 +0200
-+++ dokuwiki-plugin-data-20100608/syntax/table.php     2010-12-01 19:50:59.217678000 +0200
-@@ -328,6 +328,13 @@
-                 $select[] = '" " || pages.class';
-             }elseif($key == '%title%'){
+--- dokuwiki-plugin-data-20160311/syntax/table.php     2016-11-22 23:08:01.967907897 +0200
++++ dokuwiki-plugin-data-20220727/syntax/table.php     2023-04-25 15:27:50.645943694 +0300
+@@ -584,6 +584,13 @@
+                 $select[] = 'pages.lastmod';
+             } elseif($key == '%title%') {
                  $select[] = "pages.page || '|' || pages.title";
-+            }elseif($key == '%rpm%'){
++            } elseif($key == '%rpm%'){
 +                if(!isset($tables[$key])){
 +                    $tables[$key] = 'T'.(++$cnt);
 +                    $from  .= ' LEFT JOIN rpmdb AS '.$tables[$key].' ON '.$tables[$key].'.pid = pages.pid';
 +                }
 +                $select[] = "group_concat(".$tables[$key].".value,'\n')";
 +
-             }else{
-                 if(!isset($tables[$key])){
-                     $tables[$key] = 'T'.(++$cnt);
+             } else {
+                 if(!isset($tables[$key])) {
+                     $tables[$key] = 'T' . (++$cnt);
+@@ -686,6 +693,21 @@
+                 GROUP BY W1.pid
+                 $order";
+ 
++        // Re-order LEFT JOIN pages before LEFT JOIN rpm
++        $sql = preg_replace_callback('/
++            (?P<before>.+)
++            (?P<rpmdb>LEFT\sJOIN\srpmdb\sAS\sT\d+\sON\sT\d+.pid\s=\spages.pid\s+)
++            (?P<pages>LEFT\sJOIN\spages\sON\sW\d+\.pid\s*=pages\.pid\s+)
++            (?P<after>.+)
++        /xm', function ($m) {
++            return implode("", [
++                $m['before'],
++                $m['pages'],
++                $m['rpmdb'],
++                $m['after'],
++            ]);
++        }, $sql);
++
+         // offset and limit
+         if($data['limit']) {
+             $sql .= ' LIMIT ' . ($data['limit'] + 1);