phpBO/MySQLDumper
1
0
Fork 0
Code Issues Pull-Requests Releases Aktivität

Convert to mysqli

Quellcode durchsuchen 
This commit converts all mysql_* function to the appropriate counterparts
in mysqli.
I used this tool for most of it:
https://github.com/philip/MySQLConverterTool
This makes it possible to continue using MysqlDumper with PHP 7.0
Dieser Commit ist enthalten in:
Hannes Rosenögger 2016-02-01 20:02:15 +01:00
Ursprung dd0e8aede7
Commit 5b995d339d
23 geänderte Dateien mit 210 neuen und 214 gelöschten Zeilen
Patch-Datei herunterladen Diff-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

70
inc/functions_sql.php
Datei anzeigen

@ -79,15 +79,15 @@ function SQL_ComboBox()
function Table_ComboBox()
{
global $db,$config,$lang,$nl;
$tabellen=mysql_query('SHOW TABLES FROM `' . $db . '`',$config['dbconnection']);
$tabellen=mysqli_query($config['dbconnection'], 'SHOW TABLES FROM `' . $db . '`');
$num_tables = 0;
if (is_resource($tabellen)) {
$num_tables=mysql_num_rows($tabellen);
$num_tables=mysqli_num_rows($tabellen);
}
$s=$nl . $nl . '<select class="SQLCombo" name="tablecombo" onchange="this.form.sqltextarea.value=this.options[this.selectedIndex].value;this.form.execsql.click();">' . $nl . '<option value="" selected> --- </option>' . $nl;
for ($i=0; $i < $num_tables; $i++)
{
$t=mysql_fetch_row($tabellen);
$t=mysqli_fetch_row($tabellen);
$s.='<option value="SELECT * FROM `' . $db . '`.`' . $t[0] . '`">' . $lang['L_TABLE'] . ' `' . $t[0] . '`</option>' . $nl;
}
$s.='</select>' . $nl . $nl;
@ -97,12 +97,12 @@ function Table_ComboBox()
function TableComboBox($default='')
{
global $db,$config,$lang,$nl;
$tabellen=mysql_list_tables($db,$config['dbconnection']);
$num_tables=mysql_num_rows($tabellen);
$tabellen=mysqli_query($config['dbconnection'], "SHOW TABLES FROM $db");
$num_tables=mysqli_num_rows($tabellen);
$s='<option value="" ' . ( ( $default == '' ) ? 'selected' : '' ) . '> </option>' . $nl;
for ($i=0; $i < $num_tables; $i++)
{
$t=mysql_tablename($tabellen,$i);
$t=((mysqli_data_seek($tabellen, $i) && (($___mysqli_tmp = mysqli_fetch_row($tabellen)) !== NULL)) ? array_shift($___mysqli_tmp) : false);
$s.='<option value="`' . $t . '`"' . ( ( $default == '`' . $t . '`' ) ? 'selected' : '' ) . '>`' . $t . '`</option>' . $nl;
}
return $s;
@ -113,8 +113,8 @@ function DB_Exists($db)
global $config;
if (!isset($config['dbconnection'])) MSD_mysql_connect();
$erg=false;
$dbs=mysql_list_dbs($config['dbconnection']);
while ($row=mysql_fetch_object($dbs))
$dbs=(($___mysqli_tmp = mysqli_query($config['dbconnection'], "SHOW DATABASES")) ? $___mysqli_tmp : false);
while ($row=mysqli_fetch_object($dbs))
{
if (strtolower($row->Database) == strtolower($db))
{
@ -134,7 +134,7 @@ function Table_Exists($db, $table)
if ($res)
{
$tables=array();
WHILE ($row=mysql_fetch_row($res))
WHILE ($row=mysqli_fetch_row($res))
{
$tables[]=$row[0];
}
@ -207,16 +207,16 @@ function DB_Copy($source, $destination, $drop_source=0, $insert_data=1)
}
}
$SQL_Array.="USE `$destination` ;\n";
$tabellen=mysql_list_tables($source,$config['dbconnection']);
$num_tables=mysql_num_rows($tabellen);
$tabellen=mysqli_query($config['dbconnection'], "SHOW TABLES FROM $source");
$num_tables=mysqli_num_rows($tabellen);
for ($i=0; $i < $num_tables; $i++)
{
$table=mysql_tablename($tabellen,$i);
$table=((mysqli_data_seek($tabellen, $i) && (($___mysqli_tmp = mysqli_fetch_row($tabellen)) !== NULL)) ? array_shift($___mysqli_tmp) : false);
$sqlt="SHOW CREATE TABLE `$source`.`$table`";
$res=MSD_query($sqlt);
if ($res)
{
$row=mysql_fetch_row($res);
$row=mysqli_fetch_row($res);
$c=$row[1];
if (substr($c,-1) == ";") $c=substr($c,0,strlen($c) - 1);
$SQL_Array.=( $insert_data == 1 ) ? "$c SELECT * FROM `$source`.`$table` ;\n" : "$c ;\n";
@ -226,7 +226,7 @@ function DB_Copy($source, $destination, $drop_source=0, $insert_data=1)
return false;
}
}
mysql_select_db($destination);
((bool)mysqli_query($GLOBALS["___mysqli_ston"], "USE " . $destination));
$res=MSD_DoSQL($SQL_Array);
if ($drop_source == 1 && $res) MSD_query("DROP DATABASE `$source`;");
return $res;
@ -239,7 +239,7 @@ function Table_Copy($source, $destination, $insert_data, $destinationdb="")
$SQL_Array=$t="";
$sqlc="SHOW CREATE TABLE $source";
$res=MSD_query($sqlc);
$row=mysql_fetch_row($res);
$row=mysqli_fetch_row($res);
$c=$row[1];
$a1=strpos($c,"`");
$a2=strpos($c,"`",$a1 + 1);
@ -483,16 +483,16 @@ function GetCreateTable($db, $tabelle)
{
global $config;
if (!isset($config['dbconnection'])) MSD_mysql_connect();
$res=mysql_query("SHOW CREATE TABLE `$db`.`$tabelle`");
$res=mysqli_query($GLOBALS["___mysqli_ston"], "SHOW CREATE TABLE `$db`.`$tabelle`");
if ($res)
{
$row=mysql_fetch_array($res);
$row=mysqli_fetch_array($res);
if (isset($row['Create Table'])) return $row['Create Table'];
elseif (isset($row['Create View'])) return $row['Create View'];
else return false;
}
else
return mysql_error();
return ((is_object($GLOBALS["___mysqli_ston"])) ? mysqli_error($GLOBALS["___mysqli_ston"]) : (($___mysqli_res = mysqli_connect_error()) ? $___mysqli_res : false));
}
@ -587,11 +587,11 @@ function EngineCombo($default="")
}
else
{
$res=mysql_query("SHOW ENGINES");
$num=mysql_num_rows($res);
$res=mysqli_query($GLOBALS["___mysqli_ston"], "SHOW ENGINES");
$num=mysqli_num_rows($res);
for ($i=0; $i < $num; $i++)
{
$row=mysql_fetch_array($res);
$row=mysqli_fetch_array($res);
$r.='<option value="' . $row['Engine'] . '" ' . ( ( $row['Engine'] == $default ) ? "selected" : "" ) . '>' . $row['Engine'] . '</option>';
}
}
@ -608,13 +608,13 @@ function CharsetCombo($default="")
else
{
if (!isset($config['dbconnection'])) MSD_mysql_connect();
$res=mysql_query("SHOW Charset");
$num=mysql_num_rows($res);
$res=mysqli_query($GLOBALS["___mysqli_ston"], "SHOW Charset");
$num=mysqli_num_rows($res);
$r='<option value="" ' . ( ( $default == "" ) ? "selected" : "" ) . '></option>';
$charsets=array();
for ($i=0; $i < $num; $i++)
{
$charsets[]=mysql_fetch_array($res);
$charsets[]=mysqli_fetch_array($res);
}
if (is_array($charsets))
@ -634,14 +634,14 @@ function GetCollationArray()
global $config;
if (!isset($config['dbconnection'])) MSD_mysql_connect();
$res=mysql_query("SHOW Collation");
$num=@mysql_num_rows($res);
$res=mysqli_query($GLOBALS["___mysqli_ston"], "SHOW Collation");
$num=@mysqli_num_rows($res);
$r=Array();
if (is_array($r))
{
for ($i=0; $i < $num; $i++)
{
$row=mysql_fetch_array($res);
$row=mysqli_fetch_array($res);
$r[$i]['Collation']=isset($row['Collation']) ? $row['Collation'] : '';
$r[$i]['Charset']=isset($row['Charset']) ? $row['Charset'] : '';
$r[$i]['Id']=isset($row['Id']) ? $row['Id'] : '';
@ -840,7 +840,7 @@ function getFieldinfos($db, $tabelle)
$t=GetCreateTable($db,$tabelle);
$sqlf="SHOW FULL FIELDS FROM `$db`.`$tabelle`;";
$res=MSD_query($sqlf);
$anz_fields=mysql_num_rows($res);
$anz_fields=mysqli_num_rows($res);
$fields_infos['_primarykeys_']=array();
$fields_infos['_key_']=array();
@ -867,7 +867,7 @@ function getFieldinfos($db, $tabelle)
$fields_infos[$i]['type']='';
$fields_infos[$i]['privileges']='';
$row=mysql_fetch_array($res,MYSQL_ASSOC);
$row=mysqli_fetch_array($res, MYSQLI_ASSOC);
//v($row);
if (isset($row['Collation'])) $fields_infos[$i]['collate']=$row['Collation'];
if (isset($row['COLLATE'])) $fields_infos[$i]['collate']=$row['COLLATE']; // MySQL <4.1
@ -898,7 +898,7 @@ function getFieldinfos($db, $tabelle)
// now get key definitions of the table and add info to fields
$sql='SHOW KEYS FROM `' . $db . '`.`' . $tabelle . '`';
$res=MSD_query($sql);
WHILE ($row=mysql_fetch_array($res,MYSQL_ASSOC))
WHILE ($row=mysqli_fetch_array($res, MYSQLI_ASSOC))
{
//v($row);
$key_name=isset($row['Key_name']) ? $row['Key_name'] : '';
@ -947,12 +947,12 @@ function getExtendedFieldInfo($db, $table)
$t=GetCreateTable($db,$table);
$sqlf="SHOW FULL FIELDS FROM `$db`.`$table`;";
$res=MSD_query($sqlf);
$num_fields=mysql_num_rows($res);
$num_fields=mysqli_num_rows($res);
$f=array(); //will hold all info
for ($x=0; $x < $num_fields; $x++)
{
$row=mysql_fetch_array($res,MYSQL_ASSOC);
$row=mysqli_fetch_array($res, MYSQLI_ASSOC);
//v($row);
$i=$row['Field']; // define name of field as index of array
//define field defaults - this way the index of the array is defined anyway
@ -997,7 +997,7 @@ function getExtendedFieldInfo($db, $table)
// now get key definitions of the table and add info to field-array
$sql='SHOW KEYS FROM `' . $db . '`.`' . $table . '`';
$res=MSD_query($sql);
WHILE ($row=mysql_fetch_array($res,MYSQL_ASSOC))
WHILE ($row=mysqli_fetch_array($res, MYSQLI_ASSOC))
{
//echo "<br>Keys of $table: ";v($row);
$key_name=isset($row['Key_name']) ? $row['Key_name'] : '';
@ -1077,7 +1077,7 @@ function getPrimaryKeys($db, $table)
$keys=Array();
$sqlk="SHOW KEYS FROM `" . $db . "`.`" . $table . "`;";
$res=MSD_query($sqlk);
while ($row=mysql_fetch_array($res))
while ($row=mysqli_fetch_array($res))
{
//wenn Primaerschluessel
if ($row['Key_name'] == "PRIMARY") $keys['name'][]=$row['Column_name'];
@ -1105,7 +1105,7 @@ function getAllFields($db, $table)
$fields=Array();
$sqlk="DESCRIBE `" . $db . "`.`" . $table . "`;";
$res=MSD_query($sqlk);
while ($row=mysql_fetch_array($res))
while ($row=mysqli_fetch_array($res))
{
$fields[]=$row['Field'];
}