Rename DBA::clean_query to DBA::cleanQuery

diff --git a/include/dba.php b/include/dba.php
index 4b7fb8009ed75ee6e1b7a0eba736bf927a6e9654..32d3b1dde01eef07fcb9925525f8dc9e09b83db4 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -28,7 +28,7 @@ function q($sql) {
                return false;
        }
 
-       $sql = DBA::clean_query($sql);
+       $sql = DBA::cleanQuery($sql);
        $sql = DBA::anyValueFallback($sql);
 
        $stmt = @vsprintf($sql, $args);

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 79c4422718c6057fb9280a011472ceb19451b42d..62283b3b360a33e472414d516ea88452029c8e93 100644 (file)
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -306,7 +306,7 @@ class DBA
         * @param string $sql An SQL string without the values
         * @return string The input SQL string modified if necessary.
         */
-       public static function clean_query($sql) {
+       public static function cleanQuery($sql) {
                $search = ["\t", "\n", "\r", "  "];
                $replace = [' ', ' ', ' ', ' '];
                do {
@@ -396,7 +396,7 @@ class DBA
                        logger('Parameter mismatch. Query "'.$sql.'" - Parameters '.print_r($args, true), LOGGER_DEBUG);
                }
 
-               $sql = self::clean_query($sql);
+               $sql = self::cleanQuery($sql);
                $sql = self::anyValueFallback($sql);
 
                $orig_sql = $sql;

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index d0db9e572ebf9afc55bbdeed7ab64c92ec56cfb2..33e9c0d4d3bf78fc0987ba3e78be57543d987013 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -322,8 +322,8 @@ class DBStructure
                                                        $parameters['comment'] = "";
                                                }
 
-                                               $current_field_definition = DBA::clean_query(implode(",", $field_definition));
-                                               $new_field_definition = DBA::clean_query(implode(",", $parameters));
+                                               $current_field_definition = DBA::cleanQuery(implode(",", $field_definition));
+                                               $new_field_definition = DBA::cleanQuery(implode(",", $parameters));
                                                if ($current_field_definition != $new_field_definition) {
                                                        $sql2 = self::modifyTableField($fieldname, $parameters);
                                                        if ($sql3 == "") {