Merge pull request #20050 from nextcloud/bugfix/noid/mysql-equal-trim…

…s-shock Make sure MySQL is not saying 'this' = 'this ' is true
nextcloud · Apr 15, 2020 · c43174a · c43174a
2 parents 5c0637b + 16e9bf2
commit c43174a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php
@@ -52,4 +52,12 @@ public function iLike($x, $y, $type = null) {
 		$y = $this->helper->quoteColumnName($y);
 		return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $y);
 	}
+
+	public function eq($x, $y, $type = null) {
+		return 'BINARY ' . parent::eq($x, $y, $type);
+	}
+
+	public function neq($x, $y, $type = null) {
+		return 'BINARY ' . parent::neq($x, $y, $type);
+	}
 }
diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php
@@ -188,7 +188,7 @@ protected function getUserObject($uid, $backend, $cacheUser = true) {
 	 */
 	public function userExists($uid) {
 		$user = $this->get($uid);
-		return ($user !== null);
+		return $user !== null && $user->getUID() === $uid;
 	}
 
 	/**