Added raw method to select query

Author: Daniel Opitz

docs/selects.md

@@ -118,7 +118,7 @@ To create a raw expression, you may use the RawExp value object:
 
 ```php
 $users = $db->select()
-    ->columns(new RawExp('count(*) as user_count'), 'status')
+    ->columns(new RawExp('count(*) AS user_count'), 'status')
     ->from('payments')
     ->where('status', '<>', 1)
     ->groupBy('status')
@@ -127,7 +127,19 @@ $users = $db->select()
 ```
 
 ```sql
-SELECT count(*) as user_count, `status` FROM `payments` WHERE `status` <> 1 GROUP BY `status`;
+SELECT count(*) AS user_count, `status` FROM `payments` WHERE `status` <> 1 GROUP BY `status`;
+```
+
+Creating raw expressions with the function builder:
+
+```php
+$query = $db->select();
+$query->columns($query->raw('count(*) AS user_count'), 'status');
+$query->from('payments');
+```
+
+```sql
+SELECT count(*) AS user_count,`status` FROM `payments`;
 ```
 
 #### Aggregates

src/Database/FunctionBuilder.php

@@ -115,15 +115,4 @@ public function now(): FunctionExpression
     {
         return new FunctionExpression('NOW()', $this->db->getQuoter());
     }
-
-    /**
-     * Returns a Raw Expression.
-     *
-     * @param string $value A raw value. Be careful!
-     * @return RawExp Raw Expression
-     */
-    public function raw(string $value): RawExp
-    {
-        return new RawExp($value);
-    }
 }

src/Database/SelectQuery.php

@@ -454,6 +454,18 @@ public function offset(float $offset): self
         return $this;
     }
 
+    /**
+     * Returns a Raw Expression.
+     *
+     * @param string $value A raw value. Be careful!
+     *
+     * @return RawExp Raw Expression
+     */
+    public function raw(string $value): RawExp
+    {
+        return new RawExp($value);
+    }
+
     /**
      * Executes an SQL statement, returning a result set as a PDOStatement object.
      *

tests/FunctionBuilderTest.php

@@ -109,17 +109,4 @@ public function testNow()
         $this->assertEquals('NOW()', $func->now());
         $this->assertEquals('NOW() AS `alias_field`', $func->now()->alias('alias_field')->getValue());
     }
-
-    /**
-     * Test.
-     *
-     * @return void
-     */
-    public function testRaw()
-    {
-        $func = $this->getConnection()->select()->func();
-
-        $this->assertInstanceOf(RawExp::class, $func->raw(''));
-        $this->assertEquals('value', $func->raw('value')->getValue());
-    }
 }

tests/SelectQueryTest.php

@@ -552,6 +552,25 @@ public function testLimit()
         $this->assertSame('SELECT `id` FROM `test` LIMIT 10;', $select->build());
     }
 
+    /**
+     * Test.
+     *
+     * @return void
+     */
+    public function testRaw()
+    {
+        $query = $this->getConnection()->select();
+
+        $this->assertInstanceOf(RawExp::class, $query->raw(''));
+        $this->assertEquals('value', $query->raw('value')->getValue());
+
+        $query = $this->getConnection()->select();
+        $query->columns($query->raw('count(*) AS user_count'), 'status');
+        $query->from('payments');
+
+        $this->assertEquals('SELECT count(*) AS user_count,`status` FROM `payments`;', $query->build());
+    }
+
     /**
      * Set Up.
      *