Changeset 30 for database.php

Timestamp:

Dec 16, 2008, 8:15:34 AM (16 years ago)

Author:

george

Message:

• Přidáno: Podpora pro určování v definicích krom tabulky také jméno databáze a jméno primárního identifikačního sloupce.

File:

• database.php (modified) (6 diffs)

database.php

@@ -2 +2 @@
 
 // Extended database class
-// Date: 2008-10-13
+// Date: 2008-12-15
 
 class Database extends mysqli
@@ -16 +16 @@
     if(($this->ShowError == TRUE) and ($this->error != ''))
     {
-      echo('<strong>Database error:</strong> '.$this->error.'<br /><strong>Query:</strong> '.$Query.'<br />');
+      echo('<strong>Database error:</strong> '.$this->error.'<br />');
+      echo('<strong>Query:</strong> '.$Query.'<br />');
       echo('<pre style="font-size: 9px">'); print_r(debug_backtrace()); echo('</pre>');
     }
@@ -22 +23 @@
   }
 
-  function select($Table, $What = '*', $Condition = 1)
+  function select($Parameters) // Database, Table, Columns, Condition, Order
   {
-    return($this->query("SELECT ".$What." FROM `".$this->Prefix.$Table."` WHERE ".$Condition));
+    $Query = 'SELECT ';
+    if(array_key_exists('Columns', $Parameters)) $Query .= $Parameters['Columns']; else $Query .= '*';
+    $Query .= ' FROM ';
+    if(array_key_exists('Database', $Parameters) and ($Parameters['Database'] != '')) $Query .= '`'.$Parameters['Database'].'`.';
+    $Query .= '`'.$this->Prefix.$Parameters['Table'].'`';
+    if(array_key_exists('Condition', $Parameters)) $Query .= ' WHERE '.$Parameters['Condition'];
+    return($this->query($Query)); 
   }
 
-  function delete($Table, $Condition)
+  function delete($Parameters)
   {
-    $this->query("DELETE FROM `".$this->Prefix.$Table."` WHERE ".$Condition);
+    $Query = 'DELETE FROM ';
+    if(array_key_exists('Database', $Parameters) and ($Parameters['Database'] != '')) $Query .= '`'.$Parameters['Database'].'`.';
+    $Query .= '`'.$this->Prefix.$Parameters['Table'].'`';
+    if(array_key_exists('Condition', $Parameters)) $Query .= ' WHERE '.$Parameters['Condition'];
+    $this->query($Query);
   }
 
-  function insert($Table, $Data)
+  function insert($Parameters, $Data)
   {
     $Name = '';
@@ -45 +56 @@
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
-    $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
+    $Query = 'INSERT INTO ';
+    if(array_key_exists('Database', $Parameters) and ($Parameters['Database'] != '')) $Query .= '`'.$Parameters['Database'].'`.';
+    $Query .= '`'.$this->Prefix.$Parameters['Table'].'`';
+    $Query .= ' ('.$Name.') VALUES ('.$Values.')';
+    $this->query($Query);
   }
 
-  function update($Table, $Condition, $Data)
+  function update($Parameters, $Data)
   {
     $Values = '';
@@ -58 +73 @@
     }
     $Values = substr($Values, 2);
-    $this->query('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
+    $Query = 'UPDATE ';
+    if(array_key_exists('Database', $Parameters) and ($Parameters['Database'] != '')) $Query .= '`'.$Parameters['Database'].'`.';
+    $Query .= '`'.$this->Prefix.$Parameters['Table'].'`';
+    $Query .= ' SET '.$Values;
+    if(array_key_exists('Condition', $Parameters)) $Query .= ' WHERE '.$Parameters['Condition'];
+    $this->query($Query);
   }
 
-  function replace($Table, $Data)
+  function replace($Parameters, $Data)
   {
     $Name = '';
@@ -75 +95 @@
     $Values = substr($Values, 1);
     //echo('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES ('.$Values.')<br>');
-    $this->query('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
+    $Query = 'REPLACE INTO ';
+    if(array_key_exists('Database', $Parameters) and ($Parameters['Database'] != '')) $Query .= '`'.$Parameters['Database'].'`.';
+    $Query .= '`'.$this->Prefix.$Parameters['Table'].'`';
+    $Query .= ' ('.$Name.') VALUES ('.$Values.')';
+    $this->query($Query);
   }