Some tweaks from the last merge

Author: mbabker

src/DatabaseQuery.php

@@ -656,8 +656,10 @@ public function currentTimestamp()
 
 	/**
 	 * Add to the current date and time.
+	 *
 	 * Usage:
 	 * $query->select($query->dateAdd());
+	 *
 	 * Prefixing the interval with a - (negative sign) will cause subtraction to be used.
 	 * Note: Not all drivers support all units.
 	 *
@@ -807,7 +809,7 @@ public function exec($columns)
 	 * @param   string  $value  The value to search for.
 	 * @param   string  $set    The set of values.
 	 *
-	 * @return  string  Returns the find_in_set() MySQL function and must be translated in each driver.
+	 * @return  string  A representation of the MySQL find_in_set() function for the driver.
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
@@ -1264,6 +1266,38 @@ public function quoteName($name, $as = null)
 		return $this->db->quoteName($name, $as);
 	}
 
+	/**
+	 * Get the function to return a random floating-point value
+	 *
+	 * Usage:
+	 * $query->rand();
+	 *
+	 * @return  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function rand()
+	{
+		return '';
+	}
+
+	/**
+	 * Get the regular expression operator
+	 *
+	 * Usage:
+	 * $query->where('field ' . $query->regexp($search));
+	 *
+	 * @param   string  $value  The regex pattern.
+	 *
+	 * @return  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function regexp($value)
+	{
+		return ' ' . $value;
+	}
+
 	/**
 	 * Add a RIGHT JOIN clause to the query.
 	 *
@@ -1592,14 +1626,13 @@ public function union($query, $distinct = false, $glue = '')
 	 * $query->union('SELECT name FROM  #__foo')
 	 * $query->union(array('SELECT name FROM  #__foo','SELECT name FROM  #__bar'))
 	 *
-	 * @param   mixed    $query     The JDatabaseQuery object or string to union.
-	 * @param   boolean  $distinct  Not used - ignored.
-	 * @param   string   $glue      Not used - ignored.
+	 * @param   DatabaseQuery|string  $query     The DatabaseQuery object or string to union.
+	 * @param   boolean               $distinct  Not used - ignored.
+	 * @param   string                $glue      The glue by which to join the conditions.
 	 *
-	 * @return  Query\QueryElement  Returns this object to allow chaining.
+	 * @return  DatabaseQuery  Returns this object to allow chaining.
 	 *
 	 * @see     union
-	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
 	public function unionAll($query, $distinct = false, $glue = '')

src/Mysql/MysqlQuery.php

@@ -193,6 +193,21 @@ public function concatenate($values, $separator = null)
 		}
 	}
 
+	/**
+	 * Get the function to return a random floating-point value
+	 *
+	 * Usage:
+	 * $query->rand();
+	 *
+	 * @return  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function rand()
+	{
+		return ' RANDOM() ';
+	}
+
 	/**
 	 * Sets the offset and limit for the result set, if the database driver supports it.
 	 *

src/Mysqli/MysqliQuery.php

@@ -213,16 +213,14 @@ public function setLimit($limit = 0, $offset = 0)
 	}
 
 	/**
-	 * Return correct regexp operator for mysqli.
-	 *
-	 * Ensure that the regexp operator is mysqli compatible.
+	 * Get the regular expression operator
 	 *
 	 * Usage:
 	 * $query->where('field ' . $query->regexp($search));
 	 *
 	 * @param   string  $value  The regex pattern.
 	 *
-	 * @return  string  Returns the regex operator.
+	 * @return  string
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
@@ -232,18 +230,16 @@ public function regexp($value)
 	}
 
 	/**
-	 * Return correct rand() function for Mysqli.
+	 * Get the function to return a random floating-point value
 	 *
-	 * Ensure that the rand() function is Mysqli compatible.
-	 * 
 	 * Usage:
-	 * $query->Rand();
-	 * 
-	 * @return  string  The correct rand function.
+	 * $query->rand();
+	 *
+	 * @return  string
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
-	public function Rand()
+	public function rand()
 	{
 		return ' RAND() ';
 	}
@@ -257,10 +253,9 @@ public function Rand()
 	 * $query->findInSet((int) $parent->id, 'a.assigned_cat_ids')
 	 *
 	 * @param   string  $value  The value to search for.
-	 *
 	 * @param   string  $set    The set of values.
 	 *
-	 * @return  string  Returns the find_in_set() Mysql translation.
+	 * @return  string  A representation of the MySQL find_in_set() function for the driver.
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */

src/Postgresql/PostgresqlQuery.php

@@ -697,9 +697,11 @@ public function processLimit($query, $limit, $offset = 0)
 	}
 
 	/**
-	 * Add to the current date and time in Postgresql.
+	 * Add to the current date and time.
+	 *
 	 * Usage:
 	 * $query->select($query->dateAdd());
+	 *
 	 * Prefixing the interval with a - (negative sign) will cause subtraction to be used.
 	 *
 	 * @param   datetime  $date      The date to add to
@@ -709,7 +711,6 @@ public function processLimit($query, $limit, $offset = 0)
 	 * @return  string  The string with the appropriate sql for addition of dates
 	 *
 	 * @since   __DEPLOY_VERSION__
-	 * @note    Not all drivers support all units. Check appropriate references
 	 * @link    http://www.postgresql.org/docs/9.0/static/functions-datetime.html.
 	 */
 	public function dateAdd($date, $interval, $datePart)
@@ -725,16 +726,14 @@ public function dateAdd($date, $interval, $datePart)
 	}
 
 	/**
-	 * Return correct regexp operator for Postgresql.
-	 *
-	 * Ensure that the regexp operator is Postgresql compatible.
+	 * Get the regular expression operator
 	 *
 	 * Usage:
 	 * $query->where('field ' . $query->regexp($search));
 	 *
 	 * @param   string  $value  The regex pattern.
 	 *
-	 * @return  string  Returns the regex operator.
+	 * @return  string
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
@@ -744,18 +743,16 @@ public function regexp($value)
 	}
 
 	/**
-	 * Return correct rand() function for Postgresql.
+	 * Get the function to return a random floating-point value
 	 *
-	 * Ensure that the rand() function is Postgresql compatible.
-	 * 
 	 * Usage:
-	 * $query->Rand();
-	 * 
-	 * @return  string  The correct rand function.
+	 * $query->rand();
+	 *
+	 * @return  string
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
-	public function Rand()
+	public function rand()
 	{
 		return ' RANDOM() ';
 	}
@@ -769,10 +766,9 @@ public function Rand()
 	 * $query->findInSet((int) $parent->id, 'a.assigned_cat_ids')
 	 *
 	 * @param   string  $value  The value to search for.
-	 *
 	 * @param   string  $set    The set of values.
 	 *
-	 * @return  string  Returns the find_in_set() postgresql translation.
+	 * @return  string  A representation of the MySQL find_in_set() function for the driver.
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */

src/Sqlsrv/SqlsrvQuery.php

@@ -272,18 +272,16 @@ public function group($columns)
 	}
 
 	/**
-	 * Return correct rand() function for MSSQL.
-	 *
-	 * Ensure that the rand() function is MSSQL compatible.
+	 * Get the function to return a random floating-point value
 	 *
 	 * Usage:
-	 * $query->Rand();
+	 * $query->rand();
 	 *
-	 * @return  string  The correct rand function.
+	 * @return  string
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
-	public function Rand()
+	public function rand()
 	{
 		return ' NEWID() ';
 	}
@@ -297,10 +295,9 @@ public function Rand()
 	 * $query->findInSet((int) $parent->id, 'a.assigned_cat_ids')
 	 *
 	 * @param   string  $value  The value to search for.
-	 *
 	 * @param   string  $set    The set of values.
 	 *
-	 * @return  string  Returns the find_in_set() Mysql translation.
+	 * @return  string  A representation of the MySQL find_in_set() function for the driver.
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */