Merge pull request #212 from sagittaracc/develop

Develop

Author: sagittaracc

README.md

@@ -26,14 +26,6 @@
 ### What is this?
 SuQL is syntactic sugar for SQL.
 
-### How does this work?
-Click on the image below to see the whole demo on YouTube.
-<p align="center">
-  <a href="https://www.youtube.com/watch?v=9-WSjChYwn4">
-    <img src="https://s7.gifyu.com/images/suql-demo-by-sagittaracc.gif" alt="Sugar SQL (SuQL) demo by sagittaracc"/>
-  </a>
-</p>
-
 ### Why do you need this?
 1. Write queries once, use for every DBMS.
 2. Write queries that are easy to read and write.

src/modifier/SQLWhereModifier.php

@@ -51,6 +51,9 @@ public static function mod_endsWith($ofield, $params) {
   }
 
   public static function mod_where($ofield, $params) {
-    // TODO: Custom where
+    if ($ofield->hasAlias())
+      $ofield->getOSelect()->addHaving(str_replace('$', $ofield->getAlias(), trim($params[0], "'")));
+    else
+      $ofield->getOSelect()->addWhere(str_replace('$', $ofield->getField(), trim($params[0], "'")));
   }
 }

tests/SuQLTest.php

@@ -4,7 +4,7 @@
 
 final class SuQLTest extends TestCase
 {
-  private $suql;
+  private $suql = null;
 
   private function init()
   {
@@ -81,6 +81,40 @@ public function testSelectWhere(): void
     );
   }
 
+  public function testCustomWhere(): void
+  {
+    $this->init();
+
+    $this->assertEquals(
+      $this->suql->query("
+        select
+          users {
+            id.where('$ mod 2 = 0')
+          }
+        ;
+      ")->getSQL(),
+      "select users.id from users where users.id mod 2 = 0"
+    );
+  }
+
+  public function testQueryNestedInWhere(): void
+  {
+    $this->init();
+
+    $this->assertEquals(
+      $this->suql->query("
+        @q1 = select users {};
+
+        select
+          groups {
+            name.where($ not in @q1)
+          }
+        ;
+      ")->getSQL(),
+      "select groups.name from groups where groups.name not in (select * from users)"
+    );
+  }
+
   public function testJoin(): void
   {
     $this->init();