@@ -51,6 +51,11 @@ * ezDB Constants */ +define('EZSQL_VERSION','2.03'); +define('OBJECT','OBJECT', true); +define('ARRAY_A','ARRAY_A', true); +define('ARRAY_N','ARRAY_N', true); + /** * Simple exception container class * @@ -130,6 +135,7 @@ class ezDB_Base public $cache_inserts = false; public $use_disk_cache = false; + protected $last_result; public function __construct() { @@ -648,7 +654,8 @@ class ezDB_Base */ public function get_results($query=null, $output = '') { - if($output == '') $output = $this->default_type; + if($output == '') $output = $this->default_type; + // Log how the function was called $this->func_call = "\$db->get_results(\"$query\", $output)"; @@ -657,7 +664,7 @@ class ezDB_Base { $this->query($query); } - + // Send back array of objects. Each row is an object if ( $output == OBJECT ) { @@ -731,7 +738,7 @@ class ezDB_Base */ public function store_cache($query,$is_insert) { - if(!$this->cache_queries || $is_insert) + if($this->cache_queries === false || $is_insert) return false; $result_cache = array('col_info' => $this->col_info, @@ -773,8 +780,9 @@ class ezDB_Base */ public function get_cache($query) { + if($this->cache_queries === false || $is_insert) + return false; - echo $this->cache_type; # Check if we want to us memcache, and whether it's available if($this->cache_type == 'memcache') { ezDB_Base.class.php @@ -105,7 +105,9 @@ class ezDB_mysql extends ezDB_Base */ public function connect($dbuser='', $dbpassword='', $dbhost='localhost') { - if(!$this->dbh = mysql_connect($dbhost, $dbuser, $dbpassword, true)) + $this->dbh = mysql_connect($dbhost, $dbuser, $dbpassword, true); + + if(!$this->dbh) { if($this->use_exceptions) throw new ezDB_Error(mysql_error(), mysql_errno()); @@ -113,7 +115,6 @@ class ezDB_mysql extends ezDB_Base $this->register_error(mysql_error(), mysql_errno()); return false; } - $this->clear_errors(); return true; @@ -147,7 +148,7 @@ class ezDB_mysql extends ezDB_Base return false; } - if(!@mysql_select_db($dbname, $this->dbh)) + if(!mysql_select_db($dbname, $this->dbh)) { if($this->use_exceptions) throw new ezDB_Error(mysql_error(), mysql_errno()); @@ -221,7 +222,7 @@ class ezDB_mysql extends ezDB_Base } // Make sure connection is ALIVEE! - if (!isset($this->dbh) || !$this->dbh ) + if (!$this->dbh ) { if($this->use_exceptions) throw new ezDB_Error(mysql_error(), mysql_errno()); @@ -231,10 +232,10 @@ class ezDB_mysql extends ezDB_Base } // Perform the query via std mysql_query function.. - $this->result = @mysql_query($query); + $this->result = mysql_query($query, $this->dbh); // If there is an error then take note of it.. - if(!$this->result && mysql_errno() != 0) + if(!$this->result && mysql_errno($this->dbh) != 0) { // Something went wrong if($this->use_exceptions) @@ -252,12 +253,12 @@ class ezDB_mysql extends ezDB_Base $is_insert = false; if(preg_match("/^(insert|delete|update|replace)\s+/i",$query)) { - $this->rows_affected = @mysql_affected_rows(); + $this->rows_affected = mysql_affected_rows($this->dbh); $this->num_rows = $this->rows_affected; if(mysql_insert_id() > 0) { - $this->insert_id = @mysql_insert_id(); + $this->insert_id = mysql_insert_id($this->dbh); $is_insert = true; } @@ -270,23 +271,23 @@ class ezDB_mysql extends ezDB_Base // Take note of column info $i=0; - while ($i < @mysql_num_fields($this->result)) + while ($i < mysql_num_fields($this->result)) { - $this->col_info[$i] = @mysql_fetch_field($this->result); + $this->col_info[$i] = mysql_fetch_field($this->result); $i++; } // Store Query Results $num_rows=0; - while($row = @mysql_fetch_object($this->result)) + while($row = mysql_fetch_object($this->result)) { // Store relults as an objects within main array $this->last_result[$num_rows] = $row; $num_rows++; } - @mysql_free_result($this->result); + mysql_free_result($this->result); // Log number of rows the query returned $this->rows_affected = $num_rows; ezDB_MySQL.class.php @@ -233,7 +233,7 @@ class ezDB_mysqli extends ezDB_Base } // If there is no existing database connection then try to connect - if ( ! isset($this->dbh) || ! $this->dbh ) + if ( ! $this->dbh ) { if($this->use_exceptions) throw new ezDB_Error($this->dbh->error, $this->dbh->errno); ezDB_MySQLi.class.php 38f93c5e962ff8dfee3294bdbda4e16d9533ebea Nabeel Shahzad nabeel@myorigin=$mydomain.(none) http://github.com/nshahzad/ezdb/commit/ed6e5cbe05e4e5a53fd167aca04620457a345917 ed6e5cbe05e4e5a53fd167aca04620457a345917 2009-07-09T07:44:32-07:00 2009-07-09T07:44:32-07:00 Fixed bug with results not showing 98e980f735de735a6c408b03f3b95446f47ce08d Nabeel Shahzad nabeel@myorigin=$mydomain.(none)