Merge pull request joomla#70 from photodude/patch-8

Port new functions from CMS

Author: mbabker

src/DatabaseQuery.php

@@ -187,6 +187,14 @@ abstract class DatabaseQuery
 	 */
 	protected $union = null;
 
+	/**
+	 * The unionAll element.
+	 *
+	 * @var    Query\QueryElement
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $unionAll = null;
+
 	/**
 	 * Magic method to provide method alias support for quote() and quoteName().
 	 *
@@ -646,6 +654,27 @@ public function currentTimestamp()
 		return 'CURRENT_TIMESTAMP()';
 	}
 
+	/**
+	 * 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.
+	 *
+	 * @param   mixed   $date      The date to add to. May be date or datetime
+	 * @param   string  $interval  The string representation of the appropriate number of units
+	 * @param   string  $datePart  The part of the date to perform the addition on
+	 *
+	 * @return  string  The string with the appropriate sql for addition of dates
+	 *
+	 * @see     http://dev.mysql.com/doc/en/date-and-time-functions.html
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function dateAdd($date, $interval, $datePart)
+	{
+		return trim("DATE_ADD('" . $date . "', INTERVAL " . $interval . ' ' . $datePart . ')');
+	}
+
 	/**
 	 * Returns a PHP date() function compliant date format for the database driver.
 	 *
@@ -767,6 +796,26 @@ public function exec($columns)
 		return $this;
 	}
 
+	/**
+	 * Find a value in a varchar used like a set.
+	 *
+	 * Ensure that the value is an integer before passing to the method.
+	 *
+	 * Usage:
+	 * $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 function and must be translated in each driver.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function findInSet($value, $set)
+	{
+		return '';
+	}
+
 	/**
 	 * Add a table to the FROM clause of the query.
 	 *
@@ -1503,7 +1552,7 @@ public function __clone()
 	public function union($query, $distinct = false, $glue = '')
 	{
 		// Clear any ORDER BY clause in UNION query
-		// See http://dev.mysql.com/doc/refman/5.0/en/union.html
+		// See http://dev.mysql.com/doc/en/union.html
 		if (!is_null($this->order))
 		{
 			$this->clear('order');
@@ -1535,6 +1584,44 @@ public function union($query, $distinct = false, $glue = '')
 		return $this;
 	}
 
+	/**
+	 * Add a query to UNION ALL with the current query.
+	 * Multiple unions each require separate statements and create an array of unions.
+	 *
+	 * Usage:
+	 * $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.
+	 *
+	 * @return  Query\QueryElement  Returns this object to allow chaining.
+	 *
+	 * @see     union
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function unionAll($query, $distinct = false, $glue = '')
+	{
+		$glue = ')' . PHP_EOL . 'UNION ALL (';
+		$name = 'UNION ALL ()';
+
+		// Get the QueryElement if it does not exist
+		if (is_null($this->unionAll))
+		{
+			$this->unionAll = new Query\QueryElement($name, $query, "$glue");
+		}
+
+		// Otherwise append the second UNION.
+		else
+		{
+			$this->unionAll->append($query);
+		}
+
+		return $this;
+	}
+
 	/**
 	 * Add a query to UNION DISTINCT with the current query. Simply a proxy to Union with the Distinct clause.
 	 *

src/Mysqli/MysqliQuery.php

@@ -211,4 +211,61 @@ public function setLimit($limit = 0, $offset = 0)
 
 		return $this;
 	}
+
+	/**
+	 * Return correct regexp operator for mysqli.
+	 *
+	 * Ensure that the regexp operator is mysqli compatible.
+	 *
+	 * Usage:
+	 * $query->where('field ' . $query->regexp($search));
+	 *
+	 * @param   string  $value  The regex pattern.
+	 *
+	 * @return  string  Returns the regex operator.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function regexp($value)
+	{
+		return ' REGEXP ' . $value;
+	}
+
+	/**
+	 * Return correct rand() function for Mysqli.
+	 *
+	 * Ensure that the rand() function is Mysqli compatible.
+	 * 
+	 * Usage:
+	 * $query->Rand();
+	 * 
+	 * @return  string  The correct rand function.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function Rand()
+	{
+		return ' RAND() ';
+	}
+
+	/**
+	 * Find a value in a varchar used like a set.
+	 *
+	 * Ensure that the value is an integer before passing to the method.
+	 *
+	 * Usage:
+	 * $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.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function findInSet($value, $set)
+	{
+		return ' find_in_set(' . $value . ', ' . $set . ')';
+	}
 }

src/Postgresql/PostgresqlQuery.php

@@ -695,4 +695,89 @@ public function processLimit($query, $limit, $offset = 0)
 
 		return $query;
 	}
+
+	/**
+	 * Add to the current date and time in Postgresql.
+	 * 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
+	 * @param   string    $interval  The string representation of the appropriate number of units
+	 * @param   string    $datePart  The part of the date to perform the addition on
+	 *
+	 * @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)
+	{
+		if (substr($interval, 0, 1) != '-')
+		{
+			return "timestamp '" . $date . "' + interval '" . $interval . " " . $datePart . "'";
+		}
+		else
+		{
+			return "timestamp '" . $date . "' - interval '" . ltrim($interval, '-') . " " . $datePart . "'";
+		}
+	}
+
+	/**
+	 * Return correct regexp operator for Postgresql.
+	 *
+	 * Ensure that the regexp operator is Postgresql compatible.
+	 *
+	 * Usage:
+	 * $query->where('field ' . $query->regexp($search));
+	 *
+	 * @param   string  $value  The regex pattern.
+	 *
+	 * @return  string  Returns the regex operator.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function regexp($value)
+	{
+		return ' ~* ' . $value;
+	}
+
+	/**
+	 * Return correct rand() function for Postgresql.
+	 *
+	 * Ensure that the rand() function is Postgresql compatible.
+	 * 
+	 * Usage:
+	 * $query->Rand();
+	 * 
+	 * @return  string  The correct rand function.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function Rand()
+	{
+		return ' RANDOM() ';
+	}
+
+	/**
+	 * Find a value in a varchar used like a set.
+	 *
+	 * Ensure that the value is an integer before passing to the method.
+	 *
+	 * Usage:
+	 * $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.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function findInSet($value, $set)
+	{
+		return " $value = ANY (string_to_array($set, ',')::integer[]) ";
+	}
 }

src/Sqlsrv/SqlsrvQuery.php

@@ -270,4 +270,42 @@ public function group($columns)
 
 		return $this;
 	}
+
+	/**
+	 * Return correct rand() function for MSSQL.
+	 *
+	 * Ensure that the rand() function is MSSQL compatible.
+	 *
+	 * Usage:
+	 * $query->Rand();
+	 *
+	 * @return  string  The correct rand function.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function Rand()
+	{
+		return ' NEWID() ';
+	}
+
+	/**
+	 * Find a value in a varchar used like a set.
+	 *
+	 * Ensure that the value is an integer before passing to the method.
+	 *
+	 * Usage:
+	 * $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.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function findInSet($value, $set)
+	{
+		return "CHARINDEX(',$value,', ',' + $set + ',') > 0";
+	}
 }