APIv4 - Convert mysql-style CURRENT_TIMESTAMP to api-style 'now'

diff --git a/Civi/Api4/Utils/FormattingUtil.php b/Civi/Api4/Utils/FormattingUtil.php
index e05f3bd7f5bf821a0c9820c23e7e463927c2a7f5..ba93b4a2787599899fb0f92f37b39ea2ebb701ac 100644 (file)
--- a/Civi/Api4/Utils/FormattingUtil.php
+++ b/Civi/Api4/Utils/FormattingUtil.php
@@ -401,9 +401,16 @@ class FormattingUtil {
         case 'Float':
           return (float) $value;
 
+        case 'Timestamp':
         case 'Date':
+          // Convert mysql-style default to api-style default
+          if (str_contains($value, 'CURRENT_TIMESTAMP')) {
+            return 'now';
+          }
           // Strip time from date-only fields
-          return substr($value, 0, 10);
+          if ($dataType === 'Date' && $value) {
+            return substr($value, 0, 10);
+          }
       }
     }
     return $value;

diff --git a/tests/phpunit/api/v4/Action/GetFieldsTest.php b/tests/phpunit/api/v4/Action/GetFieldsTest.php
index 9d148e8a8cc46729679c2dc76264c4939a4b9248..8a3bea82bee4db637da8f1282bfbc4902c149b21 100644 (file)
--- a/tests/phpunit/api/v4/Action/GetFieldsTest.php
+++ b/tests/phpunit/api/v4/Action/GetFieldsTest.php
@@ -162,6 +162,8 @@ class GetFieldsTest extends Api4TestBase implements TransactionalInterface {
     $this->assertTrue($actFields['subject']['nullable']);
     $this->assertFalse($actFields['subject']['deprecated']);
     $this->assertTrue($actFields['phone_id']['deprecated']);
+    $this->assertEquals('now', $actFields['created_date']['default_value']);
+    $this->assertEquals('now', $actFields['activity_date_time']['default_value']);
 
     $getFields = Activity::getFields(FALSE)
       ->setAction('get')