Rename SelectComponent to Expression

Author: technicalguru

src/TgDatabase/Criterion/AliasedProjection.php

@@ -2,10 +2,10 @@
 
 namespace TgDatabase\Criterion;
 
-use TgDatabase\SelectComponent;
+use TgDatabase\Expression;
 use TgDatabase\Query;
 
-class AliasedProjection implements SelectComponent {
+class AliasedProjection implements Expression {
 
 	public function __construct($component, $alias) {
 		$this->component = $component;

src/TgDatabase/Criterion/Distinct.php

@@ -2,10 +2,10 @@
 
 namespace TgDatabase\Criterion;
 
-use TgDatabase\SelectComponent;
+use TgDatabase\Expression;
 use TgDatabase\Query;
 
-class Distinct implements SelectComponent {
+class Distinct implements Expression {
 
 	public function __construct($component) {
 		$this->component = $component;

src/TgDatabase/Criterion/MultiSelect.php

@@ -2,12 +2,12 @@
 
 namespace TgDatabase\Criterion;
 
-use TgDatabase\SelectComponent;
+use TgDatabase\Expression;
 use TgDatabase\Query;
 
-class MultiSelect implements SelectComponent {
+class MultiSelect implements Expression {
 
-	public function __construct(SelectComponent ...$components) {
+	public function __construct(Expression ...$components) {
 		if ((count($components) == 1) && is_array($components[0])) {
 			$this->components = $components[0];
 		} else {
@@ -18,7 +18,7 @@ public function __construct(SelectComponent ...$components) {
 	/**
 	 * Add another component in combination.
 	 */
-	public function add(SelectComponent ...$components) {
+	public function add(Expression ...$components) {
 		if ((count($components) == 1) && is_array($components[0])) {
 			$arr = $components[0];
 		} else {

src/TgDatabase/Criterion/PropertySelect.php

@@ -2,10 +2,10 @@
 
 namespace TgDatabase\Criterion;
 
-use TgDatabase\SelectComponent;
+use TgDatabase\Expression;
 use TgDatabase\Query;
 
-class PropertySelect implements SelectComponent {
+class PropertySelect implements Expression {
 
 	public function __construct($propertyName) {
 		$this->propertyName = $propertyName;

src/TgDatabase/Criterion/QueryImpl.php

@@ -6,7 +6,7 @@
 use TgDatabase\Criterion;
 use TgDatabase\Order;
 use TgDatabase\Projection;
-use TgDatabase\SelectComponent;
+use TgDatabase\Expression;
 use TgDatabase\Projections;
 
 
@@ -70,7 +70,7 @@ public function addOrder(Order ...$orders) {
 	  * Attention! This class removes any result class name from the query. Use #setResultClass() after calling.
 	  * @deprecated Use #setColumns() instead
 	  */
-	public function setProjection(SelectComponent ...$components) {
+	public function setProjection(Expression ...$components) {
 		$this->projections = array();
 		$this->_addColumns($components);
 		$this->resultClassName = NULL;
@@ -81,7 +81,7 @@ public function setProjection(SelectComponent ...$components) {
 	  * Set select columns for the query.
 	  * Attention! This class removes any result class name from the query. Use #setResultClass() after calling.
 	  */
-	public function setColumns(SelectComponent ...$components) {
+	public function setColumns(Expression ...$components) {
 		$this->projections = array();
 		$this->_addColumns($components);
 		$this->resultClassName = NULL;
@@ -91,7 +91,7 @@ public function setColumns(SelectComponent ...$components) {
 	/**
 	  * Add select columns for the query.
 	  */
-	public function addColumns(SelectComponent ...$components) {
+	public function addColumns(Expression ...$components) {
 		$this->_addColumns($components);
 		return $this;
 	}

src/TgDatabase/Criterion/SqlProjection.php

@@ -3,9 +3,9 @@
 namespace TgDatabase\Criterion;
 
 use TgDatabase\Query;
-use TgDatabase\SelectComponent;
+use TgDatabase\Expression;
 
-class SqlProjection implements SelectComponent {
+class SqlProjection implements Expression {
 
 	public function __construct($sql) {
 		$this->sql = $sql;

src/TgDatabase/Projection.php

@@ -7,6 +7,6 @@
  * Built-in projection types are provided by the Projections factory class. This interface 
  * might be implemented by application classes that define custom projections. 
  */
-interface Projection extends SelectComponent {
+interface Projection extends Expression {
 
 }

src/TgDatabase/Projections.php

@@ -27,7 +27,7 @@ public static function properties(string ...$properties) {
 		return $rc;
 	}
 
-	public static function combine(SelectComponent ...$components) {
+	public static function combine(Expression ...$components) {
 		return new MultiSelect($components);
 	}
 

src/TgDatabase/Query.php

@@ -29,19 +29,19 @@ public function addOrder(Order ...$order);
 	/**
 	  * Add select columns for the query.
 	  */
-	public function addColumns(SelectComponent ...$components);
+	public function addColumns(Expression ...$components);
 
 	/**
 	  * Set select columns for the query.
 	  * Attention! This class removes any result class name from the query. Use #setResultClass() after calling.
 	  */
-	public function setColumns(SelectComponent ...$components);
+	public function setColumns(Expression ...$components);
 
 	/**
 	  * Add projections for the query.
 	  * @deprecated Use #setColumns()
 	  */
-	public function setProjection(SelectComponent ...$components);
+	public function setProjection(Expression ...$components);
 
 	/**
 	  * Set the index of the first result to be retrieved.

src/TgDatabase/SelectComponent.php

@@ -101,7 +101,7 @@ public function testAlias(): void {
         $this->testSqlString('MAX(`aName`) AS `anotherName`', $expr);
     }
 
-    protected function testSqlString(string $expected, SelectComponent $expr, $alias = NULL): void {
+    protected function testSqlString(string $expected, Expression $expr, $alias = NULL): void {
         $query = TestHelper::createQuery(NULL, NULL, $alias);
         if ($query != NULL) {
             $this->assertEquals($expected, $expr->toSqlString($query,$query));