Fix LocalFileMoveBatch query that was incompatibile with Postgres

Bug: T160910
Change-Id: I7ed6acec08243ff8380d28bbe5d66610a77502dc

diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index 7fc45eb..0464f07 100644 (file)
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -3344,9 +3344,9 @@ class LocalFileMoveBatch {
                        __METHOD__,
                        [ 'FOR UPDATE' ]
                );
                        __METHOD__,
                        [ 'FOR UPDATE' ]
                );

-               $oldRowCount = $dbw->selectField(
+               $oldRowCount = $dbw->selectRowCount(

                        'oldimage',
                        'oldimage',

-                       'COUNT(*)',
+                       '*',

                        [ 'oi_name' => $this->oldName ],
                        __METHOD__,
                        [ 'FOR UPDATE' ]
                        [ 'oi_name' => $this->oldName ],
                        __METHOD__,
                        [ 'FOR UPDATE' ]