(REVERT) Quick hack for SQL escaping

civicrm · Mar 26, 2024 · 01318ca · 01318ca
1 parent fcb5d2b
commit 01318ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CRM/Core/I18n.php b/CRM/Core/I18n.php
@@ -44,7 +44,7 @@ class CRM_Core_I18n {
    * @param string $mode
    * @return string
    */
-  protected static function escape($text, $mode) {
+  public static function escape($text, $mode) {
     switch ($mode) {
       case 'sql':
         if (self::$SQL_ESCAPER == NULL) {

diff --git a/mixin/lib/civimix-schema/src/SqlGenerator.php b/mixin/lib/civimix-schema/src/SqlGenerator.php
@@ -99,7 +99,7 @@ private function generateCreateTableSql(array $entity): string {
       }
       $fieldSql .= self::getDefaultSql($field);
       if (!empty($field['description'])) {
-        $fieldSql .= " COMMENT '" . \CRM_Core_DAO::escapeString($field['description']) . "'";
+        $fieldSql .= " COMMENT '" . \CRM_Core_I18n::escape($field['description'], 'sql') . "'";
       }
       $definition[] = $fieldSql;
     }
@@ -157,7 +157,7 @@ private static function getDefaultSql(array $field): string {
       $default = $field['default'];
     }
     else {
-      $default = "'" . \CRM_Core_DAO::escapeString($field['default']) . "'";
+      $default = "'" . \CRM_Core_I18n::escape($field['default'], 'sql') . "'";
     }
     return ' DEFAULT ' . $default;
   }