Column 'fileid' in where clause is ambiguous

[tobiasKaminsky]

This is my webdav search:

<?xml version="1.0" encoding="UTF-8"?>
<d:searchrequest xmlns:d="DAV:" xmlns:oc="http://nextcloud.com/ns">
    <d:basicsearch>
        <d:select>
            <d:prop>
                <d:displayname />
                <d:getcontenttype />
                <d:resourcetype />
                <d:getcontentlength />
                <d:getlastmodified />
                <d:creationdate />
                <d:getetag />
                <d:quota-used-bytes />
                <d:quota-available-bytes />
                <oc:permissions xmlns:oc="http://owncloud.org/ns" />
                <oc:id xmlns:oc="http://owncloud.org/ns" />
                <oc:size xmlns:oc="http://owncloud.org/ns" />
                <oc:favorite xmlns:oc="http://owncloud.org/ns" />
            </d:prop>
        </d:select>
        <d:from>
            <d:scope>
                <d:href>/files/test</d:href>
                <d:depth>infinity</d:depth>
            </d:scope>
        </d:from>
        <d:where>
            <d:eq>
                <d:prop>
                    <oc:fileid xmlns:oc="http://owncloud.org/ns" />
                </d:prop>
                <d:literal>123123</d:literal>
            </d:eq>
        </d:where>
        <d:orderby />
    </d:basicsearch>
</d:searchrequest>

This is the response:

<?xml version="1.0" encoding="utf-8"?>
<d:error xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
    <s:exception>Doctrine\DBAL\Exception\NonUniqueFieldNameException</s:exception>
    <s:message>An exception occurred while executing 'SELECT `file`.`fileid`, `storage`, `path`, `path_hash`,
        `file`.`parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `etag`,
        `permissions`, `checksum`, `metadata_etag`, `creation_time`, `upload_time` FROM `oc_filecache` `file` LEFT JOIN
        `oc_filecache_extended` `fe` ON `file`.`fileid` = `fe`.`fileid` WHERE (`storage` = ?) AND (`fileid` = ?)' with
        params [9, 123123]:

        SQLSTATE[23000]: Integrity constraint violation: 1052 Column 'fileid' in where clause is ambiguous
    </s:message>
</d:error>

This is afaik a regression, as it worked until ~1-2 weeks ago.

@rullzer @icewind1991

[kesselb]

Index: lib/private/Files/Cache/QuerySearchHelper.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- lib/private/Files/Cache/QuerySearchHelper.php	(revision bb8ac6ca34aa84a9c43fb841a863438b025120a1)
+++ lib/private/Files/Cache/QuerySearchHelper.php	(date 1575966999689)
@@ -161,6 +161,8 @@
 			$value = self::TAG_FAVORITE;
 		} else if ($field === 'tagname') {
 			$field = 'tag.category';
+		} else if ($field === 'fileid') {
+			$field = 'file.fileid';
 		}
 		return [$field, $value, $type];
 	}

Should fix it. It's related to the new filecache_extended table.

[tobiasKaminsky]

Indeed, this fixes it 🎉
Will you create a PR, or shall I do it?

[kesselb]

Would you mind to do it? :)