mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Rename DBA::any_value_fallback to DBA::anyValueFallback

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-20 21:58:30 -04:00
parent e42cf4d4fc
commit 910e832dc2
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/dba.php
View file

@ -29,7 +29,7 @@ function q($sql) {
} }
$sql = DBA::clean_query($sql); $sql = DBA::clean_query($sql);
$sql = DBA::any_value_fallback($sql); $sql = DBA::anyValueFallback($sql);
$stmt = @vsprintf($sql, $args); $stmt = @vsprintf($sql, $args);

4
src/Database/DBA.php
View file

@ -288,7 +288,7 @@ class DBA
* @param string $sql An SQL string without the values * @param string $sql An SQL string without the values
* @return string The input SQL string modified if necessary. * @return string The input SQL string modified if necessary.
*/ */
public static function any_value_fallback($sql) { public static function anyValueFallback($sql) {
$server_info = self::server_info(); $server_info = self::server_info();
if (version_compare($server_info, '5.7.5', '<') || if (version_compare($server_info, '5.7.5', '<') ||
(stripos($server_info, 'MariaDB') !== false)) { (stripos($server_info, 'MariaDB') !== false)) {
@ -397,7 +397,7 @@ class DBA
} }
$sql = self::clean_query($sql); $sql = self::clean_query($sql);
$sql = self::any_value_fallback($sql); $sql = self::anyValueFallback($sql);
$orig_sql = $sql; $orig_sql = $sql;

2
src/Database/DBStructure.php
View file

@ -460,7 +460,7 @@ class DBStructure
if ($ignore != "") { if ($ignore != "") {
echo "SET session old_alter_table=0;\n"; echo "SET session old_alter_table=0;\n";
} else { } else {
echo "INSERT INTO `".$temp_name."` SELECT ".DBA::any_value_fallback($field_list)." FROM `".$name."`".$group_by.";\n"; echo "INSERT INTO `".$temp_name."` SELECT ".DBA::anyValueFallback($field_list)." FROM `".$name."`".$group_by.";\n";
echo "DROP TABLE `".$name."`;\n"; echo "DROP TABLE `".$name."`;\n";
echo "RENAME TABLE `".$temp_name."` TO `".$name."`;\n"; echo "RENAME TABLE `".$temp_name."` TO `".$name."`;\n";
} }