Commit c7843722 authored by fufroma's avatar fufroma

Revert "Commence a passer en mysqli"

This reverts commit faaf268d.
parent 41cee2ee
language: php language: php
php: php:
- 5.5
- 5.4 - 5.4
- 5.3 - 5.3
script: phpunit --coverage-clover=coverage.clover script: phpunit --coverage-clover=coverage.clover
......
...@@ -325,7 +325,7 @@ class DB_Sql { ...@@ -325,7 +325,7 @@ class DB_Sql {
$this->Seq_Table, $this->Seq_Table,
$seq_name, $seq_name,
$currentid); $currentid);
@mysql_query($q, $this->Link_ID); $id = @mysql_query($q, $this->Link_ID);
} else { } else {
$currentid = $res["nextid"]; $currentid = $res["nextid"];
} }
...@@ -334,7 +334,7 @@ class DB_Sql { ...@@ -334,7 +334,7 @@ class DB_Sql {
$this->Seq_Table, $this->Seq_Table,
$nextid, $nextid,
$seq_name); $seq_name);
@mysql_query($q, $this->Link_ID); $id = @mysql_query($q, $this->Link_ID);
$this->unlock(); $this->unlock();
} else { } else {
$this->halt("cannot lock ".$this->Seq_Table." - has it been created?"); $this->halt("cannot lock ".$this->Seq_Table." - has it been created?");
...@@ -345,6 +345,8 @@ class DB_Sql { ...@@ -345,6 +345,8 @@ class DB_Sql {
/* public: return table metadata */ /* public: return table metadata */
function metadata($table='',$full=false) { function metadata($table='',$full=false) {
$count = 0;
$id = 0;
$res = array(); $res = array();
/* /*
...@@ -479,7 +481,7 @@ class DB_Sql { ...@@ -479,7 +481,7 @@ class DB_Sql {
$this->query("SHOW TABLES"); $this->query("SHOW TABLES");
$i=0; $i=0;
$return=array(); $return=array();
while ($info=mysqli_fetch_row($this->Query_ID)) while ($info=mysql_fetch_row($this->Query_ID))
{ {
$return[$i]["table_name"]= $info[0]; $return[$i]["table_name"]= $info[0];
$return[$i]["tablespace_name"]=$this->Database; $return[$i]["tablespace_name"]=$this->Database;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment