Merge pull request #554 from cosmocode/no-serial-in-page-editor

Never load serial data in page editor

Author: annda

_test/AccessTableDataDB.test.php

@@ -299,7 +299,8 @@ public function test_pseudodiff() {
                 'multipage' => array('wiki:dokuwiki', 'wiki:syntax', 'wiki:welcome'),
                 'singletitle' => 'wiki:dokuwiki',
                 'multititle' => array('wiki:dokuwiki', 'wiki:syntax', 'wiki:welcome'),
-            )
+            ),
+            time()
         );
 
         // make sure titles for some pages are known (not for wiki:welcome)

_test/AccessTableDataReplacement.test.php

@@ -42,29 +42,33 @@ public function setUp() {
         $as->assignPageSchema('page2', 'bar');
         $as->assignPageSchema('page2', 'bar');
 
-
+        // page data is saved with a rev timestamp
+        $now = time();
         $this->saveData(
             'start',
             'foo',
             array(
                 'pages' => array('page1', 'page2')
-            )
+            ),
+            $now
         );
 
         $this->saveData(
             'page1',
             'bar',
             array(
                 'data' => 'data of page1'
-            )
+            ),
+            $now
         );
 
         $this->saveData(
             'page2',
             'bar',
             array(
                 'data' => 'data of page2'
-            )
+            ),
+            $now
         );
     }
 

_test/Search.test.php

@@ -26,6 +26,7 @@ public function setUp() {
         $as->assignPageSchema($page, 'schema2');
         saveWikiText($page, "===== TestTitle =====\nabc", "Summary");
         p_get_metadata($page);
+        $now = time();
         $this->saveData(
             $page,
             'schema1',
@@ -34,7 +35,8 @@ public function setUp() {
                 'second' => array('second data', 'more data', 'even more'),
                 'third' => 'third data',
                 'fourth' => 'fourth data'
-            )
+            ),
+            $now
         );
         $this->saveData(
             $page,
@@ -44,7 +46,8 @@ public function setUp() {
                 'asecond' => array('second data', 'more data', 'even more'),
                 'athird' => 'third data',
                 'afourth' => 'fourth data'
-            )
+            ),
+            $now
         );
 
         $as->assignPageSchema('test:document', 'schema1');
@@ -57,7 +60,8 @@ public function setUp() {
                 'second' => array('second', 'more'),
                 'third' => '',
                 'fourth' => 'fourth data'
-            )
+            ),
+            $now
         );
         $this->saveData(
             'test:document',
@@ -67,7 +71,8 @@ public function setUp() {
                 'asecond' => array('second data', 'more data', 'even more'),
                 'athird' => 'third data',
                 'afourth' => 'fourth data'
-            )
+            ),
+            $now
         );
 
         for($i = 10; $i <= 20; $i++) {
@@ -79,7 +84,8 @@ public function setUp() {
                     'asecond' => array("page$i second data"),
                     'athird' => "page$i third data",
                     'afourth' => "page$i fourth data"
-                )
+                ),
+                $now
             );
             $as->assignPageSchema("page$i", 'schema2');
         }

_test/Type_Dropdown.test.php

@@ -15,26 +15,30 @@ class Type_Dropdown_struct_test extends StructTest {
 
     protected function preparePages() {
         $this->loadSchemaJSON('dropdowns');
+        $now = time();
         $this->saveData(
             'test1',
             'dropdowns',
             [
                 'drop1' => '["test1",1]', 'drop2' => '["test1",1]', 'drop3' => 'John'
-            ]
+            ],
+            $now
         );
         $this->saveData(
             'test2',
             'dropdowns',
             [
                 'drop1' => '["test1",2]', 'drop2' => '["test1",2]', 'drop3' => 'Jane'
-            ]
+            ],
+            $now
         );
         $this->saveData(
             'test3',
             'dropdowns',
             [
                 'drop1' => '["test1",3]', 'drop2' => '["test1",3]', 'drop3' => 'Tarzan'
-            ]
+            ],
+            $now
         );
     }
 

_test/edit.test.php

@@ -26,7 +26,8 @@ public function setUp() {
                 'second' => array('second data', 'more data', 'even more'),
                 'third' => 'third data',
                 'fourth' => 'fourth data'
-            )
+            ),
+            time()
         );
     }
 

_test/output.test.php

@@ -24,6 +24,7 @@ public function setUp() {
 
         $page = 'page01';
         $includedPage = 'foo';
+        $now = time();
         $this->saveData(
             $page,
             'schema1',
@@ -32,7 +33,8 @@ public function setUp() {
                 'second' => array('second data', 'more data', 'even more'),
                 'third' => 'third data',
                 'fourth' => 'fourth data'
-            )
+            ),
+            $now
         );
         $this->saveData(
             $page,
@@ -42,7 +44,8 @@ public function setUp() {
                 'second field' => array('second data', 'more data', 'even more'),
                 'third%field' => 'third data',
                 'fourth.field?' => 'fourth data'
-            )
+            ),
+            $now
         );
         $this->saveData(
             $includedPage,
@@ -52,7 +55,8 @@ public function setUp() {
                 'second' => array('second data', 'more data', 'even more'),
                 'third' => 'third data',
                 'fourth' => 'fourth data'
-            )
+            ),
+            $now
         );
     }
 

meta/AccessTablePage.php

@@ -43,23 +43,25 @@ public function clearData()
     }
 
     /**
-     * @return int
+     * @return int|bool
      */
     protected function getLastRevisionTimestamp()
     {
         $table = 'data_' . $this->schema->getTable();
         $where = "WHERE pid = ?";
-        $opts = array($this->pid);
+        $opts = [$this->pid];
         if ($this->ts) {
-            $where .= " AND rev <= ?";
+            $where .= " AND REV > 0 AND rev <= ?";
             $opts[] = $this->ts;
         }
 
         /** @noinspection SqlResolve */
         $sql = "SELECT rev FROM $table $where ORDER BY rev DESC LIMIT 1";
         $res = $this->sqlite->query($sql, $opts);
-        $ret = (int) $this->sqlite->res2single($res);
+        $ret = $this->sqlite->res2single($res);
         $this->sqlite->res_close($res);
+        // make sure we don't cast empty result to 0 (serial data has rev = 0)
+        if ($ret !== false) $ret = (int) $ret;
         return $ret;
     }