Merge pull request #21691 from colemanw/sqlExprTitles

APIv4 - Give every SQL expression a title
civicrm · Oct 2, 2021 · ed72890 · ed72890
2 parents 489e0ce + 4e16179
commit ed72890
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 5 deletions.
diff --git a/Civi/Api4/Query/SqlEquation.php b/Civi/Api4/Query/SqlEquation.php
@@ -116,4 +116,8 @@ public function formatOutputValue($value, &$dataType) {
     return $value;
   }
 
+  public static function getTitle(): string {
+    return ts('Equation');
+  }
+
 }
diff --git a/Civi/Api4/Query/SqlExpression.php b/Civi/Api4/Query/SqlExpression.php
@@ -171,6 +171,11 @@ public function getType(): string {
     return substr($className, strrpos($className, '\\') + 1);
   }
 
+  /**
+   * @return string
+   */
+  abstract public static function getTitle(): string;
+
   /**
    * @return string|NULL
    */

diff --git a/Civi/Api4/Query/SqlField.php b/Civi/Api4/Query/SqlField.php
@@ -41,4 +41,8 @@ public function render(array $fieldList): string {
     return $fieldList[$this->expr]['sql_name'];
   }
 
+  public static function getTitle(): string {
+    return ts('Field');
+  }
+
 }
diff --git a/Civi/Api4/Query/SqlFunction.php b/Civi/Api4/Query/SqlFunction.php
@@ -195,11 +195,6 @@ public static function getCategory(): string {
     return static::$category;
   }
 
-  /**
-   * @return string
-   */
-  abstract public static function getTitle(): string;
-
   /**
    * @return string
    */

diff --git a/Civi/Api4/Query/SqlNull.php b/Civi/Api4/Query/SqlNull.php
@@ -23,4 +23,8 @@ public function render(array $fieldList): string {
     return 'NULL';
   }
 
+  public static function getTitle(): string {
+    return ts('Null');
+  }
+
 }
diff --git a/Civi/Api4/Query/SqlNumber.php b/Civi/Api4/Query/SqlNumber.php
@@ -26,4 +26,8 @@ public function render(array $fieldList): string {
     return $this->expr;
   }
 
+  public static function getTitle(): string {
+    return ts('Number');
+  }
+
 }
diff --git a/Civi/Api4/Query/SqlString.php b/Civi/Api4/Query/SqlString.php
@@ -31,4 +31,8 @@ public function render(array $fieldList): string {
     return '"' . \CRM_Core_DAO::escapeString($this->expr) . '"';
   }
 
+  public static function getTitle(): string {
+    return ts('Text');
+  }
+
 }
diff --git a/Civi/Api4/Query/SqlWild.php b/Civi/Api4/Query/SqlWild.php
@@ -23,4 +23,8 @@ public function render(array $fieldList): string {
     return '*';
   }
 
+  public static function getTitle(): string {
+    return ts('Wild');
+  }
+
 }