select raw within suql syntax

Author: arutyunyan

src/syntax/RawSuQL.php

@@ -0,0 +1,36 @@
+<?php
+
+use core\SuQLObject;
+
+class RawSuQL extends SuQLObject implements SuQLInterface
+{
+  protected $driver = 'mysql';
+
+  public function query()
+  {
+    return 'main';
+  }
+
+  public function table()
+  {
+    return null;
+  }
+
+  public function getRawSql()
+  {
+    return parent::getSQL([$this->query()]);
+  }
+
+  public static function find()
+  {
+    $instance = new static();
+    $instance->addSelect($instance->query());
+    return $instance;
+  }
+
+  public function field($raw)
+  {
+    $this->getQuery($this->query())->addField($this->table(), $raw);
+    return $this;
+  }
+}

src/syntax/SuQL.php

@@ -108,6 +108,12 @@ public function field($name, $modifiers = [], $visible = true)
     return $this;
   }
 
+  public function raw($field)
+  {
+    $this->getQuery($this->query())->addField(null, $field);
+    return $this;
+  }
+
   public function join($model)
   {
     $this->currentModel = $model;

tests/SuQLObjectTest.php

@@ -54,8 +54,8 @@ public function testSelect1(): void
     // Select raw expression
     $this->osuql->addSelect('main');
     $this->osuql->getQuery('main')->addField(null, "2 * 2");
-    $this->osuql->getQuery('main')->addField(null, "'project' as f");
-    $this->assertEquals($this->osuql->getSQL('all'), "select 2 * 2, 'project' as f");
+    $this->osuql->getQuery('main')->addField(null, "'Yuriy' as author");
+    $this->assertEquals($this->osuql->getSQL('all'), "select 2 * 2, 'Yuriy' as author");
     $this->assertNull($this->osuql->getSQL(['main']));
   }
 

tests/SuQLTest.php

@@ -28,6 +28,18 @@ public function testSelect(): void
       User::find()->select(['id' => 'uid', 'name' => 'uname'])->getRawSql(),
       'select users.id as uid, users.name as uname from users'
     );
+
+    // Select raw expression
+    $this->assertEquals(
+      RawSuQL::find()->field('2 * 2')->field("'Yuriy' as author")->getRawSql(),
+      "select 2 * 2, 'Yuriy' as author"
+    );
+
+    // Select raw within a real model
+    $this->assertEquals(
+      User::find()->field('id')->raw('2 * 2')->getRawSql(),
+      'select users.id, 2 * 2 from users'
+    );
   }
 
   public function testJoin(): void