Use setLimit() to set query limit (#25981)

joomla-projects · Aug 26, 2019 · 803d2f2 · 803d2f2
1 parent 236399f
commit 803d2f2
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 19 deletions.
diff --git a/administrator/components/com_finder/Indexer/Adapter.php b/administrator/components/com_finder/Indexer/Adapter.php
@@ -575,7 +575,7 @@ protected function getItem($id)
 	protected function getItems($offset, $limit, $query = null)
 	{
 		// Get the content items to index.
-		$this->db->setQuery($this->getListQuery($query), $offset, $limit);
+		$this->db->setQuery($this->getListQuery($query)->setLimit($limit, $offset));
 		$items = $this->db->loadObjectList(null, Result::class);
 
 		foreach ($items as $item)

diff --git a/administrator/components/com_finder/Indexer/Taxonomy.php b/administrator/components/com_finder/Indexer/Taxonomy.php
@@ -318,7 +318,8 @@ public static function getNodeByTitle($branch, $title)
 			->where('t2.title = ' . $db->quote($branch));
 
 		// Get the node.
-		$db->setQuery($query, 0, 1);
+		$query->setLimit(1);
+		$db->setQuery($query);
 
 		return $db->loadObject();
 	}

diff --git a/administrator/components/com_languages/Model/StringsModel.php b/administrator/components/com_languages/Model/StringsModel.php
@@ -149,7 +149,8 @@ public function search()
 			}
 
 			// Consider the limitstart according to the 'more' parameter and load the results.
-			$db->setQuery($query, $limitstart, 10);
+			$query->setLimit(10, $limitstart);
+			$db->setQuery($query);
 			$results['results'] = $db->loadObjectList();
 
 			// Check whether there are more results than already loaded.

diff --git a/administrator/components/com_postinstall/Model/MessagesModel.php b/administrator/components/com_postinstall/Model/MessagesModel.php
@@ -156,7 +156,8 @@ public function getExtensionName($eid)
 			->from($db->quoteName('#__extensions'))
 			->where($db->quoteName('extension_id') . ' = ' . (int) $eid);
 
-		$db->setQuery($query, 0, 1);
+		$query->setLimit(1);
+		$db->setQuery($query);
 
 		$extension = $db->loadObject();
 

diff --git a/components/com_contact/Model/ContactModel.php b/components/com_contact/Model/ContactModel.php
@@ -382,7 +382,8 @@ protected function buildContactExtendedData($contact)
 				}
 			}
 
-			$db->setQuery($query, 0, (int) $articles_display_num);
+			$query->setLimit((int) $articles_display_num);
+			$db->setQuery($query);
 			$contact->articles = $db->loadObjectList();
 		}
 		else

diff --git a/libraries/src/Form/Field/EditorField.php b/libraries/src/Form/Field/EditorField.php
@@ -298,7 +298,8 @@ protected function getEditor()
 						->where('enabled = 1');
 
 					// Check of the editor exists.
-					$db->setQuery($query, 0, 1);
+					$query->setLimit(1);
+					$db->setQuery($query);
 					$editor = $db->loadResult();
 
 					// If an editor was found stop looking.

diff --git a/libraries/src/Table/Asset.php b/libraries/src/Table/Asset.php
@@ -114,7 +114,9 @@ public function check()
 				->from($this->_db->quoteName($this->_tbl))
 				->where($this->_db->quoteName('id') . ' = ' . $this->parent_id);
 
-			if ($this->_db->setQuery($query, 0, 1)->loadResult())
+			$query->setLimit(1);
+
+			if ($this->_db->setQuery($query)->loadResult())
 			{
 				return true;
 			}

diff --git a/libraries/src/Table/ContentHistory.php b/libraries/src/Table/ContentHistory.php
@@ -174,7 +174,9 @@ public function getHashMatch()
 			->where($db->quoteName('ucm_item_id') . ' = ' . (int) $this->get('ucm_item_id'))
 			->where($db->quoteName('ucm_type_id') . ' = ' . (int) $this->get('ucm_type_id'))
 			->where($db->quoteName('sha1_hash') . ' = ' . $db->quote($this->get('sha1_hash')));
-		$db->setQuery($query, 0, 1);
+
+		$query->setLimit(1);
+		$db->setQuery($query);
 
 		return $db->loadObject();
 	}
@@ -201,7 +203,9 @@ public function deleteOldVersions($maxVersions)
 			->where($db->quoteName('ucm_type_id') . ' = ' . (int) $this->get('ucm_type_id'))
 			->where($db->quoteName('keep_forever') . ' != 1')
 			->order($db->quoteName('save_date') . ' DESC ');
-		$db->setQuery($query, 0, (int) $maxVersions);
+
+		$query->setLimit((int) $maxVersions);
+		$db->setQuery($query);
 		$idsToSave = $db->loadColumn(0);
 
 		// Don't process delete query unless we have at least the maximum allowed versions

diff --git a/libraries/src/Table/Nested.php b/libraries/src/Table/Nested.php
@@ -420,7 +420,9 @@ public function moveByReference($referenceId, $position = 'after', $pk = null, $
 				->from($this->_tbl)
 				->where('parent_id = 0')
 				->order('lft DESC');
-			$this->_db->setQuery($query, 0, 1);
+
+			$query->setLimit(1);
+			$this->_db->setQuery($query);
 			$reference = $this->_db->loadObject();
 
 			if ($this->_debug)
@@ -794,7 +796,9 @@ public function store($updateNulls = false)
 						->from($this->_tbl)
 						->where('parent_id = 0')
 						->order('lft DESC');
-					$this->_db->setQuery($query, 0, 1);
+
+					$query->setLimit(1);
+					$this->_db->setQuery($query);
 					$reference = $this->_db->loadObject();
 
 					if ($this->_debug)
@@ -1021,7 +1025,8 @@ public function publish($pks = null, $state = 1, $userId = 0)
 					->where($published . ' < ' . (int) $compareState);
 
 				// Just fetch one row (one is one too many).
-				$this->_db->setQuery($query, 0, 1);
+				$query->setLimit(1);
+				$this->_db->setQuery($query);
 
 				if ($this->_db->loadResult())
 				{
@@ -1637,7 +1642,8 @@ protected function _getNode($id, $key = null)
 			->from($this->_tbl)
 			->where($k . ' = ' . (int) $id);
 
-		$row = $this->_db->setQuery($query, 0, 1)->loadObject();
+		$query->setLimit(1);
+		$row = $this->_db->setQuery($query)->loadObject();
 
 		// Check for no $row returned
 		if (empty($row))

diff --git a/libraries/src/Table/Table.php b/libraries/src/Table/Table.php
@@ -1702,7 +1702,8 @@ public function move($delta, $where = '')
 		$this->getDispatcher()->dispatch('onTableBeforeMove', $event);
 
 		// Select the first row with the criteria.
-		$this->_db->setQuery($query, 0, 1);
+		$query->setLimit(1);
+		$this->_db->setQuery($query);
 		$row = $this->_db->loadObject();
 
 		// If a row is found, move the item.

diff --git a/modules/mod_related_items/Helper/RelatedItemsHelper.php b/modules/mod_related_items/Helper/RelatedItemsHelper.php
@@ -37,7 +37,6 @@ public static function getList(&$params)
 		$app     = Factory::getApplication();
 		$input   = $app->input;
 		$groups  = implode(',', Factory::getUser()->getAuthorisedViewLevels());
-		$maximum = (int) $params->get('maximum', 5);
 		$factory = $app->bootComponent('com_content')->getMVCFactory();
 
 		// Get an instance of the generic articles model
@@ -125,7 +124,8 @@ public static function getList(&$params)
 					$query->where('a.language in (' . $db->quote(Factory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
 				}
 
-				$db->setQuery($query, 0, $maximum);
+				$query->setLimit((int) $params->get('maximum', 5));
+				$db->setQuery($query);
 
 				try
 				{

diff --git a/modules/mod_tags_similar/Helper/TagsSimilarHelper.php b/modules/mod_tags_similar/Helper/TagsSimilarHelper.php
@@ -51,7 +51,6 @@ public static function getList(&$params)
 		$user       = Factory::getUser();
 		$groups     = implode(',', $user->getAuthorisedViewLevels());
 		$matchtype  = $params->get('matchtype', 'all');
-		$maximum    = $params->get('maximum', 5);
 		$ordering   = $params->get('ordering', 'count');
 		$tagsHelper = new TagsHelper;
 		$prefix     = $option . '.' . $view;
@@ -148,7 +147,8 @@ public static function getList(&$params)
 			$query->order($query->rand());
 		}
 
-		$db->setQuery($query, 0, $maximum);
+		$query->setLimit((int) $params->get('maximum', 5));
+		$db->setQuery($query);
 
 		try
 		{

diff --git a/modules/mod_users_latest/Helper/UsersLatestHelper.php b/modules/mod_users_latest/Helper/UsersLatestHelper.php
@@ -54,7 +54,8 @@ public static function getUsers($params)
 				->where($db->quoteName('ug.id') . ' <> 1');
 		}
 
-		$db->setQuery($query, 0, $params->get('shownumber', 5));
+		$query->setLimit((int) $params->get('shownumber', 5));
+		$db->setQuery($query);
 
 		try
 		{