Sync database package

joomla · Jul 14, 2017 · c3c39f8 · c3c39f8
1 parent e4b5658
commit c3c39f8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/libraries/vendor/composer/installed.json b/libraries/vendor/composer/installed.json
@@ -1084,12 +1084,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/joomla-framework/database.git",
-            "reference": "bcda1f013a83159b2aa083ff2d25f3ec55978dcf"
+            "reference": "2e760c99d9e6953de2376f0f8b5028bb299e5045"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/joomla-framework/database/zipball/bcda1f013a83159b2aa083ff2d25f3ec55978dcf",
-            "reference": "bcda1f013a83159b2aa083ff2d25f3ec55978dcf",
+            "url": "https://api.github.com/repos/joomla-framework/database/zipball/2e760c99d9e6953de2376f0f8b5028bb299e5045",
+            "reference": "2e760c99d9e6953de2376f0f8b5028bb299e5045",
             "shasum": ""
         },
         "require": {
@@ -1113,7 +1113,7 @@
             "joomla/di": "To use the Database ServiceProviderInterface objects, install joomla/di.",
             "joomla/registry": "To use the Database ServiceProviderInterface objects, install joomla/registry."
         },
-        "time": "2017-07-07T10:57:45+00:00",
+        "time": "2017-07-12T00:53:12+00:00",
         "type": "joomla-package",
         "extra": {
             "branch-alias": {

diff --git a/libraries/vendor/joomla/database/src/DatabaseInterface.php b/libraries/vendor/joomla/database/src/DatabaseInterface.php
@@ -37,8 +37,8 @@ public function connected();
 	/**
 	 * Create a new database using information from $options object.
 	 *
-	 * @param   stdClass  $options  Object used to pass user and database name to database driver. This object must have "db_name" and "db_user" set.
-	 * @param   boolean   $utf      True if the database supports the UTF-8 character set.
+	 * @param   \stdClass  $options  Object used to pass user and database name to database driver. This object must have "db_name" and "db_user" set.
+	 * @param   boolean    $utf      True if the database supports the UTF-8 character set.
 	 *
 	 * @return  boolean|resource
 	 *

diff --git a/libraries/vendor/joomla/database/src/DatabaseQuery.php b/libraries/vendor/joomla/database/src/DatabaseQuery.php
@@ -224,6 +224,11 @@ public function __toString()
 
 		if ($this->sql)
 		{
+			if ($this instanceof Query\LimitableInterface)
+			{
+				return $this->processLimit($this->sql, $this->limit, $this->offset);
+			}
+
 			return $this->sql;
 		}