Fix #251: add modifiers as anonymous functions

Author: sagittaracc

src/builder/SQLBuilder.php

@@ -101,10 +101,15 @@ public function applyModifier($query)
     foreach ($oselect->getSelect() as $field => $ofield) {
       if ($ofield->hasModifier()) {
         foreach ($ofield->getModifierList() as $name => $params) {
-          $modifierHandler = "mod_$name";
-          $modifierClass = $this->osuql->getModifierClass($modifierHandler);
-          if ($modifierClass)
-            $modifierClass::$modifierHandler($ofield, $params);
+          if ($name === 'callback' && $params instanceof Closure) {
+            $params($ofield);
+          }
+          else {
+            $modifierHandler = "mod_$name";
+            $modifierClass = $this->osuql->getModifierClass($modifierHandler);
+            if ($modifierClass)
+              $modifierClass::$modifierHandler($ofield, $params);
+            }
         }
       }
     }

src/core/SuQLField.php

@@ -32,6 +32,10 @@ public function addModifier($name, $params = []) {
     $this->modifier[$name] = $params;
   }
 
+  public function addCallbackModifier($callback) {
+    $this->modifier["callback"] = $callback;
+  }
+
   public function delModifier($name) {
     unset($this->modifier[$name]);
   }

src/syntax/SuQL.php

@@ -95,7 +95,11 @@ public function field($name, $modifiers = [], $visible = true)
 
     $this->getQuery($this->query())->addField($currentModel->table(), $name, $visible);
 
-    if (ArrayHelper::isSequential($modifiers))
+    if ($modifiers instanceof Closure)
+    {
+      $this->getQuery($this->query())->getField($currentModel->table(), $name)->addCallbackModifier($modifiers);
+    }
+    else if (ArrayHelper::isSequential($modifiers))
     {
       foreach ($modifiers as $modifier)
       {

tests/SuQLObjectTest.php

@@ -288,4 +288,20 @@ public function testEmptyDriver(): void
       'error' => [SuQLError::DRIVER_NOT_DEFINED],
     ]);
   }
+
+  public function testCallbackModifier(): void
+  {
+    $this->init();
+
+    $this->osuql->addSelect('main');
+    $this->osuql->getQuery('main')->addFrom('users');
+    $this->osuql->getQuery('main')->addField('users', 'id');
+    $this->osuql->getQuery('main')->getField('users', 'id')->addCallbackModifier(function($ofield){
+      $ofield->getOSelect()->addWhere("{$ofield->getField()} > 5");
+    });
+    $this->assertEquals($this->osuql->getSQL(['main']),
+      'select users.id from users where users.id > 5'
+    );
+    $this->assertNull($this->osuql->getSQL('all'));
+  }
 }

tests/SuQLTest.php

@@ -211,4 +211,14 @@ public function testToStringSuQL(): void
       'select users.id, users.name from users'
     );
   }
+
+  public function testCallbackModifier(): void
+  {
+    $this->assertEquals(
+      User::find()->field('id', function($ofield){
+        $ofield->getOSelect()->addWhere("{$ofield->getField()} > 5");
+      })->getRawSql(),
+      'select users.id from users where users.id > 5'
+    );
+  }
 }