add backticks to SQL, use limit parameter instead of LIMIT SQL

2 files changed, 27 insertions, 27 deletions

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index be9aa21c3d2..ec3b5264915 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -165,9 +165,9 @@ abstract class Access {
 		$table = $this->getMapTable($isUser);
 
 		$query = \OCP\DB::prepare('
-			SELECT ldap_dn
-			FROM '.$table.'
-			WHERE owncloud_name = ?
+			SELECT `ldap_dn`
+			FROM `'.$table.'`
+			WHERE `owncloud_name` = ?
 		');
 
 		$record = $query->execute(array($name))->fetchOne();
@@ -223,9 +223,9 @@ abstract class Access {
 		}
 
 		$query = \OCP\DB::prepare('
-			SELECT owncloud_name
-			FROM '.$table.'
-			WHERE ldap_dn = ?
+			SELECT `owncloud_name`
+			FROM `'.$table.'`
+			WHERE `ldap_dn` = ?
 		');
 
 		//let's try to retrieve the ownCloud name from the mappings table
@@ -238,16 +238,16 @@ abstract class Access {
 		$uuid = $this->getUUID($dn);
 		if($uuid) {
 			$query = \OCP\DB::prepare('
-				SELECT owncloud_name
-				FROM '.$table.'
-				WHERE directory_uuid = ?
+				SELECT `owncloud_name`
+				FROM `'.$table.'`
+				WHERE `directory_uuid` = ?
 			');
 			$component = $query->execute(array($uuid))->fetchOne();
 			if($component) {
 				$query = \OCP\DB::prepare('
-					UPDATE '.$table.'
-					SET ldap_dn = ?
-					WHERE directory_uuid = ?
+					UPDATE `'.$table.'`
+					SET `ldap_dn` = ?
+					WHERE `directory_uuid` = ?
 				');
 				$query->execute(array($dn, $uuid));
 				return $component;
@@ -385,8 +385,8 @@ abstract class Access {
 		$table = $this->getMapTable($isUsers);
 
 		$query = \OCP\DB::prepare('
-			SELECT ldap_dn, owncloud_name
-			FROM '. $table
+			SELECT `ldap_dn`, `owncloud_name`
+			FROM `'. $table . '`'
 		);
 
 		return $query->execute()->fetchAll();
@@ -408,18 +408,18 @@ abstract class Access {
 		$sqlAdjustment = '';
 		$dbtype = \OCP\Config::getSystemValue('dbtype');
 		if($dbtype == 'mysql') {
-			$sqlAdjustment = 'FROM dual';
+			$sqlAdjustment = 'FROM `dual`';
 		}
 
 		$insert = \OCP\DB::prepare('
-			INSERT INTO '.$table.' (ldap_dn, owncloud_name, directory_uuid)
+			INSERT INTO `'.$table.'` (`ldap_dn`, `owncloud_name`, `directory_uuid`)
 				SELECT ?,?,?
 				'.$sqlAdjustment.'
 				WHERE NOT EXISTS (
 					SELECT 1
-					FROM '.$table.'
-					WHERE ldap_dn = ?
-						OR owncloud_name = ?)
+					FROM `'.$table.'`
+					WHERE `ldap_dn` = ?
+						OR `owncloud_name` = ?)
 		');
 
 		//feed the DB
diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index d478731b84c..4224ee9d7e5 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -64,9 +64,9 @@ class Jobs {
 	static private function handleKnownGroups($groups) {
 		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Dealing with known Groups.', \OCP\Util::DEBUG);
 		$query = \OCP\DB::prepare('
-			UPDATE *PREFIX*ldap_group_members
-			SET owncloudusers = ?
-			WHERE owncloudname = ?
+			UPDATE `*PREFIX*ldap_group_members`
+			SET `owncloudusers` = ?
+			WHERE `owncloudname` = ?
 		');
 		foreach($groups as $group) {
 			//we assume, that self::$groupsFromDB has been retrieved already
@@ -94,7 +94,7 @@ class Jobs {
 		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with created Groups.', \OCP\Util::DEBUG);
 		$query = \OCP\DB::prepare('
 			INSERT
-			INTO *PREFIX*ldap_group_members (owncloudname, owncloudusers)
+			INTO `*PREFIX*ldap_group_members` (`owncloudname`, `owncloudusers`)
 			VALUES (?, ?)
 		');
 		foreach($createdGroups as $createdGroup) {
@@ -109,8 +109,8 @@ class Jobs {
 		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with removed groups.', \OCP\Util::DEBUG);
 		$query = \OCP\DB::prepare('
 			DELETE
-			FROM *PREFIX*ldap_group_members
-			WHERE owncloudname = ?
+			FROM `*PREFIX*ldap_group_members`
+			WHERE `owncloudname` = ?
 		');
 		foreach($removedGroups as $removedGroup) {
 			\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – group "'.$createdGroup.'" was removed.', \OCP\Util::INFO);
@@ -143,8 +143,8 @@ class Jobs {
 			return self::$groupsFromDB;
 		}
 		$query = \OCP\DB::prepare('
-			SELECT owncloudname, owncloudusers
-			FROM *PREFIX*ldap_group_members
+			SELECT `owncloudname`, `owncloudusers`
+			FROM `*PREFIX*ldap_group_members`
 		');
 		$result = $query->execute()->fetchAll();
 		self::$groupsFromDB = array();