Krai/Struct/Dbquery/Select.php @@ -52,11 +52,12 @@ abstract class Krai_Db_Handler * * This function executes a specified SQL query using the passed parameters. * + * @param string $querytype The type of query that is to be executed (one of "select","insert","update","delete","transaction" -- use "select" for things like DESCRIBE) * @param string $sql The query to execute * @param array $params Parameters for the query * @return mixed */ - abstract public function Query($sql, array $params = array()); + abstract public function Query($querytype, $sql, array $params = array()); /** * Fetch a database record from a query as an object @@ -97,7 +98,7 @@ abstract class Krai_Db_Handler * @param Krai_Db_Query $qid The query * @return integer The number of rows (-1 for an error) */ - abstract public function Rows(Krai_Db_Query $qid); + //abstract public function Rows(Krai_Db_Query $qid); /** * Get the error from a query @@ -107,7 +108,7 @@ abstract class Krai_Db_Handler * @param Krai_Db_Query $qid The query * @param string $ret The error format */ - abstract public function Error(Krai_Db_Query $qid, $ret); + //abstract public function Error(Krai_Db_Query $qid, $ret); /** * Return the number of rows affected by the last query @@ -116,7 +117,7 @@ abstract class Krai_Db_Handler * * @param Krai_Db_Query $qid The query */ - abstract public function Affected(Krai_Db_Query $qid); + //abstract public function Affected(Krai_Db_Query $qid); /** * Return the last inserted id @@ -125,7 +126,7 @@ abstract class Krai_Db_Handler * * @param Krai_Db_Query $qid The query */ - abstract public function Inserted(Krai_Db_Query $qid); + //abstract public function Inserted(Krai_Db_Query $qid); /** * Process a query struct according to its type. @@ -204,13 +205,13 @@ abstract class Krai_Db_Handler * @param mixed $tables * @return Krai_Struct_Dbquery_Find */ - final public function FindQuery($tables) + final public function SelectQuery($tables) { if(!is_array($tables)) { $tables = array($tables); } - return new Krai_Struct_Dbquery_Find($tables); + return new Krai_Struct_Dbquery_Select($tables); } /** Krai/Db/Handler.php @@ -50,9 +50,9 @@ class Krai_Db_Handler_Mysql extends Krai_Db_Handler { switch($query->action) { - case "find": + case "select": $sql = "SELECT ".((count($query->fields) > 0) ? implode(", ", $query->fields) : "*")." FROM ".$this->GetJoins($query->tables).(($query->conditions != "") ? " WHERE ".$query->conditions : "").(($query->order != "") ? " ORDER BY ". $query->order : "").(($query->limit != "") ? " LIMIT ".$query->limit : ""); - $q = $this->Query($sql, $query->parameters); + $q = $this->Query("select", $sql, $query->parameters); if($query->limit != "1") { @@ -70,15 +70,7 @@ class Krai_Db_Handler_Mysql extends Krai_Db_Handler break; case "delete": $sql = "DELETE FROM ".$this->GetJoins($query->tables).(($query->conditions != "") ? " WHERE ".$query->conditions : "").(($query->limit != "") ? " LIMIT ".$query->limit : ""); - $res = $this->Query($sql, $query->parameters); - if($res instanceOf Krai_Db_Query) - { - return $this->Affected($res); - } - else - { - return $res; - } + return $this->Query("delete", $sql, $query->parameters); break; case "insert": $ks = array(); @@ -125,15 +117,7 @@ class Krai_Db_Handler_Mysql extends Krai_Db_Handler $ks = implode(", ", $ks); $sql = "INSERT INTO ".$this->GetJoins($query->tables)." (".$ks.") VALUES ".$vss; - $q = $this->Query($sql, $vals); - if($this->Affected($q) > 0) - { - return $this->Inserted($q); - } - else - { - return false; - } + return $this->Query("insert", $sql, $vals); break; case "update": $flds = array(); @@ -152,42 +136,46 @@ class Krai_Db_Handler_Mysql extends Krai_Db_Handler } $flds = implode(", ", $flds); $sql = "UPDATE ".$this->GetJoins($query->tables)." SET ".$flds." WHERE ".$query->conditions.(($query->limit != "") ? " LIMIT ".$query->limit : ""); - $q = $this->Query($sql, array_merge($vals, $query->parameters)); - if($q instanceOf Krai_Db_Query) - { - return $this->Affected($q); - } - else - { - return $q; - } + return $this->Query("update", $sql, array_merge($vals, $query->parameters)); break; } } - public function Query($sql, array $params = array()) + public function Query($querytype, $sql, array $params = array()) { + if(!in_array($querytype, array("select","update","insert","delete","transaction"))) + { + throw new Krai_Db_Exception("Unrecognized query type provided."); + } + $tstart = microtime(true); list($spats, $bpars) = $this->ParseQueryParams($params); $sql_real = preg_replace("#/\?#","?",preg_replace($spats, $bpars, $sql, 1)); if($this->CONFIG["DEBUG"]) { - Krai::Notice($sql); - Krai::Notice($sql_real); + print $sql; + print $sql_real; } $query = $this->_dbc->query($sql_real); $tstop = microtime(true); - Krai::WriteLog($sql_real, Krai::LOG_DEBUG, array("sql")); + Krai::WriteLog($sql_real. ":: ".($tstop - $tstart)."s", Krai::LOG_DEBUG, array("sql")); - if(!$query) + /*if(!$query) { - throw new Krai_Db_Exception($this->error("text"), $this->error("number")); - } - return new Krai_Db_Query(($query instanceOf mysqli_result) ? $query : array($query, $this->_dbc->affected_rows, $this->_dbc->insert_id)); + throw new Krai_Db_Exception($this->error("text").$this->error("number")); + }*/ + + return new Krai_Db_Query($query, array( + "affected" => ($querytype != "select" && $querytype != "transaction") ? $this->_dbc->affected_rows : null, + "insertid" => ($querytype == "insert") ? $this->_dbc->insert_id : null, + "numrows" => ($querytype == "select") ? $query->num_rows : null, + "successful" => ($querytype != "select" && $querytype != "transaction") ? $query : (($query) ? true : false ), + "error" => array($this->_dbc->error, $this->_dbc->errno) + )); } @@ -196,19 +184,19 @@ class Krai_Db_Handler_Mysql extends Krai_Db_Handler switch(strtolower($_action)) { case "start": - if(!$this->Query("START TRANSACTION")) + if(!$this->Query("transaction","START TRANSACTION")) { throw new Krai_Db_Exception("Unable to start transaction."); } break; case "commit": - if(!$this->Query("COMMIT")) + if(!$this->Query("transaction","COMMIT")) { throw new Krai_Db_Exception("Unable to commit transaction."); } break; case "rollback": - if(!$this->Query("ROLLBACK")) + if(!$this->Query("transaction","ROLLBACK")) { throw new Krai_Db_Exception("Unable to rollback transaction."); } @@ -276,8 +264,8 @@ class Krai_Db_Handler_Mysql extends Krai_Db_Handler public function Fetch(Krai_Db_Query &$qid) { - $row = (!$qid->IsClosed() && $this->Rows($qid) > 0) ? $qid->fetch_object("Krai_Db_Object") : null; - if(!$qid->IsClosed() && (!$row || $this->Rows($qid) == 1)) + $row = (!$qid->IsClosed() && $qid->NumRows() > 0) ? $qid->fetch_object("Krai_Db_Object") : null; + if(!$qid->IsClosed() && (!$row || $qid->NumRows() == 1)) { $qid->Close(); } @@ -287,7 +275,7 @@ class Krai_Db_Handler_Mysql extends Krai_Db_Handler public function FetchArray(Krai_Db_Query &$qid) { $row = (!$qid->IsClosed()) ? $qid->fetch_assoc() : null; - if(!$qid->IsClosed() && (!$row || $this->Rows($qid) == 1)) + if(!$qid->IsClosed() && (!$row || $qid->NumRows() == 1)) { $qid->Close(); } @@ -297,19 +285,14 @@ class Krai_Db_Handler_Mysql extends Krai_Db_Handler public function FetchOne(Krai_Db_Query &$qid) { $row = (!$qid->IsClosed()) ? $qid->fetch_row() : null; - if(!$qid->IsClosed() && (!$row || $this->Rows($qid) == 1)) + if(!$qid->IsClosed() && (!$row || $qid->NumRows() == 1)) { $qid->Close(); } return $row[0]; } - public function Rows(Krai_Db_Query $qid) - { - return $qid->num_rows; - } - - public function Error(Krai_Db_Query $qid, $ret) + /*public function Error(Krai_Db_Query $qid, $ret) { if($ret == "text") { @@ -327,34 +310,39 @@ class Krai_Db_Handler_Mysql extends Krai_Db_Handler { throw new Krai_Db_Exception("Un-recognized return type option passed to Krai_DbMysql::Error."); } - } + }*/ - public function Affected(Krai_Db_Query $qid) + /*public function Affected(Krai_Db_Query $qid) { $d = $qid->GetQuery(); if(is_array($d)) { return $d[1]; } - } + }*/ - public function Inserted(Krai_Db_Query $qid) + /*public function Inserted(Krai_Db_Query $qid) { $d = $qid->GetQuery(); if(is_array($d)) { return $d[2]; } - } + }*/ - public function Result(Krai_Db_Query $qid) + /*public function Result(Krai_Db_Query $qid) { $d = $qid->GetQuery(); if(is_array($d)) { return $d[0]; } - } + }*/ + + /*public function Rows(Krai_Db_Query $qid) + { + return $qid->num_rows; + }*/ /** * Escape the parameter so it is safe to insert into a query Krai/Db/Handler/Mysql.php @@ -11,9 +11,9 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -Krai::Uses( +/*Krai::Uses( Krai::$FRAMEWORK."/Db/Querypdo.php" -); +);*/ /** * PDO database handler @@ -58,9 +58,9 @@ class Krai_Db_Handler_Pdo extends Krai_Db_Handler { switch($query->action) { - case "find": + case "select": $sql = "SELECT ".((count($query->fields) > 0) ? implode(", ", $query->fields) : "*")." FROM ".$this->GetJoins($query->tables).(($query->conditions != "") ? " WHERE ".$query->conditions : "").(($query->order != "") ? " ORDER BY ". $query->order : "").(($query->limit != "") ? " LIMIT ".$query->limit : ""); - $q = $this->Query($sql, $query->parameters); + $q = $this->Query("select", $sql, $query->parameters); if($query->limit != "1") { @@ -78,16 +78,7 @@ class Krai_Db_Handler_Pdo extends Krai_Db_Handler break; case "delete": $sql = "DELETE FROM ".$this->GetJoins($query->tables).(($query->conditions != "") ? " WHERE ".$query->conditions : "").(($query->limit != "") ? " LIMIT ".$query->limit : ""); - $res = $this->Query($sql, $query->parameters); - if($res instanceOf Krai_Db_Query) - { - return $this->Affected($res); - } - else - { - return $res; - } - //return $this->Query($sql, $query->parameters); + return $this->Query("delete", $sql, $query->parameters); break; case "insert": $ks = array(); @@ -134,15 +125,7 @@ class Krai_Db_Handler_Pdo extends Krai_Db_Handler $ks = implode(", ", $ks); $sql = "INSERT INTO ".$this->GetJoins($query->tables)." (".$ks.") VALUES ".$vss; - $q = $this->Query($sql, $vals); - if($this->Affected($q) > 0) - { - return $this->Inserted($q); - } - else - { - return false; - } + return $this->Query("insert", $sql, $vals); break; case "update": $flds = array(); @@ -161,25 +144,21 @@ class Krai_Db_Handler_Pdo extends Krai_Db_Handler } $flds = implode(", ", $flds); $sql = "UPDATE ".$this->GetJoins($query->tables)." SET ".$flds." WHERE ".$query->conditions.(($query->limit != "") ? " LIMIT ".$query->limit : ""); - $q = $this->Query($sql, array_merge($vals, $query->parameters)); - if($q instanceOf Krai_Db_Query) - { - return $this->Affected($q); - } - else - { - return $q; - } + return $this->Query("update",$sql, array_merge($vals, $query->parameters)); break; } } - public function Query($sql, array $params = array()) + public function Query($querytype, $sql, array $params = array()) { + if(!in_array($querytype, array("select","update","insert","delete","transaction"))) + { + throw new Krai_Db_Exception("Unrecognized query type provided."); + } $tstart = microtime(true); $stmtkey = md5($sql); - if(!array_key_exists($stmtkey,$this->_prepared_statements)) + if(!array_key_exists($stmtkey, $this->_prepared_statements)) { $stmt = $this->_dbc->prepare($sql); $this->_prepared_statements[$stmtkey] = $stmt; @@ -191,19 +170,12 @@ class Krai_Db_Handler_Pdo extends Krai_Db_Handler if($this->CONFIG["DEBUG"]) { - Krai::Notice($sql." ".serialize($params)); + print $sql." ".serialize($params); } $query = $stmt->execute($params); - Krai::WriteLog($sql." ".serialize($params), Krai::LOG_DEBUG, array("sql")); - - if(!$query) - { - throw new Krai_Db_Exception($this->Error("text"), is_integer($this->Error("number")) ? $this->Error("number") : 0); - } - - if(preg_match("#^SELECT\s#i",$sql)) + if($querytype == "select") { if(preg_match("#^SELECT\s.*?COUNT.*?\sFROM\s#i", $sql)) { @@ -211,8 +183,7 @@ class Krai_Db_Handler_Pdo extends Krai_Db_Handler } else { - - $sql2 = preg_replace("#^SELECT\s.*?\sFROM(\s)#i","SELECT COUNT(*) FROM$1",$sql); + $sql2 = preg_replace("#^SELECT\s.*?\sFROM(\s)#i","SELECT COUNT(*) FROM$1",$sql,1); $stmtkey2 = md5($sql2); if(!array_key_exists($stmtkey2, $this->_prepared_statements)) @@ -225,24 +196,33 @@ class Krai_Db_Handler_Pdo extends Krai_Db_Handler $stmt2 = $this->_prepared_statements[$stmtkey2]; } - Krai::WriteLog($sql2." ".serialize($params), Krai::LOG_DEBUG, array("sql")); - $countq = $stmt2->execute($params); $count = $stmt2->fetchColumn(); } - $sel = true; - } - else - { - $sel = false; } $tstop = microtime(true); + Krai::WriteLog($sql2." ".serialize($params), Krai::LOG_DEBUG, array("sql")); + Krai::WriteLog($sql." ".serialize($params)." :: ".($tstop - $tstart)."s", Krai::LOG_DEBUG, array("sql")); + + $error = $stmt->errorInfo(); + if(is_array($error)) + { + $error = array($error[2], $error[1]); + } + else + { + $error = array(null, null); + } - $ret = ($query) ? new Krai_Db_Querypdo($stmt, ($sel) ? $count : $query) : $query; - Krai::WriteLog(serialize(gettype($ret))." ".serialize($count), Krai::LOG_DEBUG, array("sql")); - return $ret; + return new Krai_Db_Query($stmt, array( + "affected" => ($querytype != "select" && $querytype != "transaction") ? $stmt->rowCount() : null, + "insertid" => ($querytype == "insert") ? $this->_dbc->lastInsertId() : null, + "numrows" => ($querytype == "select") ? $count : null, + "successful" => $query, + "error" => $error + )); } @@ -275,9 +255,8 @@ class Krai_Db_Handler_Pdo extends Krai_Db_Handler public function Fetch(Krai_Db_Query &$qid) { - $row = (!$qid->IsClosed() && $this->Rows($qid) > 0) ? $qid->fetchObject("Krai_Db_Object") : null; - Krai::WriteLog(serialize($qid->IsClosed())." ".serialize($this->Rows($qid))." ".serialize($row), Krai::LOG_DEBUG, array("sql")); - if(!$qid->IsClosed() && (!$row || $this->Rows($qid) == 1)) + $row = (!$qid->IsClosed() && $qid->NumRows() > 0) ? $qid->fetchObject("Krai_Db_Object") : null; + if(!$qid->IsClosed() && (!$row || $qid->NumRows() == 1)) { $qid->Close(); } @@ -286,8 +265,8 @@ class Krai_Db_Handler_Pdo extends Krai_Db_Handler public function FetchArray(Krai_Db_Query &$qid) { - $row = (!$qid->IsClosed()) ? $qid->fetch(PDO::FETCH_ASSOC) : null; - if(!$qid->IsClosed() && (!$row || $this->Rows($qid) == 1)) + $row = (!$qid->IsClosed() && $qid->NumRows() > 0) ? $qid->fetch(PDO::FETCH_ASSOC) : null; + if(!$qid->IsClosed() && (!$row || $qid->NumRows() == 1)) { $qid->Close(); } @@ -296,20 +275,20 @@ class Krai_Db_Handler_Pdo extends Krai_Db_Handler public function FetchOne(Krai_Db_Query &$qid) { - $row = (!$qid->IsClosed()) ? $qid->fetch(PDO::FETCH_NUM) : null; - if(!$qid->IsClosed() && (!$row || $this->Rows($qid) == 1)) + $row = (!$qid->IsClosed() && $qid->NumRows() > 0) ? $qid->fetch(PDO::FETCH_NUM) : null; + if(!$qid->IsClosed() && (!$row || $qid->NumRows() == 1)) { $qid->Close(); } return $row[0]; } - public function Rows(Krai_Db_Query $qid) + /*public function Rows(Krai_Db_Query $qid) { return $qid->NumRows(); - } + }*/ - public function Error(Krai_Db_Query $qid, $ret) + /*public function Error(Krai_Db_Query $qid, $ret) { $stmt = $qid->GetQuery(); $einfo = $stmt->errorInfo(); @@ -331,18 +310,18 @@ class Krai_Db_Handler_Pdo extends Krai_Db_Handler { throw new Krai_Db_Exception("Un-recognized return type option passed to Krai_Db_Handler_Pdo::Error."); } - } + }*/ - public function Affected(Krai_Db_Query $qid) + /*public function Affected(Krai_Db_Query $qid) { $stmt = $qid->GetQuery(); return $stmt->rowCount(); - } + }*/ - public function Inserted(Krai_Db_Query $qid) + /*public function Inserted(Krai_Db_Query $qid) { return $this->_dbc->lastInsertId(); - } + }*/ /** * Generates DSN strings for a variety of databases from the $dbinfo Krai/Db/Handler/Pdo.php @@ -39,13 +39,30 @@ class Krai_Db_Query protected $_Query = null; /** + * Holds query stats + * + * This variable holds statistics for a query such as number of rows in the result, + * whether it was successful, the inserted ID, and the number of affected rows. + * + * @var array + */ + protected $_Stats = array( + "successful" => false, + "insertid" => null, + "affected" => null, + "numrows" => null, + "error" => array(null, null) + ); + + /** * Constructor. Saves the passed query to the instance * * @param mixed $query */ - function __construct($query) + function __construct($query, $stats) { $this->_Query = $query; + $this->_Stats = array_merge($this->_Stats, $stats); } /** @@ -72,6 +89,7 @@ class Krai_Db_Query { $this->_Query->close(); } + $this->_Query = null; $this->_Closed = true; } @@ -87,24 +105,22 @@ class Krai_Db_Query */ public function __call($m, $p) { - if($m != "Close" && $m != "IsClosed") + if($this->_Closed) + { + throw new Krai_Db_Exception("Tried to call method on closed query."); + } + else { - if($this->_Closed) + if(is_callable(array($this->_Query, $m), false)) { - throw new Krai_Db_Exception("Tried to call method on closed query."); + return call_user_func_array(array($this->_Query, $m), $p); } else { - if(is_callable(array($this->_Query, $m), false)) - { - return call_user_func_array(array($this->_Query, $m), $p); - } - else - { - throw new Krai_Db_Exception("Unknown method called on a query."); - } + throw new Krai_Db_Exception("Unknown method called on a query."); } } + } /** @@ -118,17 +134,114 @@ class Krai_Db_Query */ public function __get($v) { - return $this->_Query->$v; + if($this->_Closed) + { + return null; + } + else + { + return $this->_Query->$v; + } } /** * Get a reference to the query object * * This function returns a reference to the query object wrapped in the instance + * + * @return mixed The Query object */ public function &GetQuery() { return $this->_Query; } + /** + * Returns whether or not the query was successful + * + * This function returns the value of the {@link Krai_Db_Query::$_Stats} + * "successful" key. + * + * @return boolean + * + */ + public function IsSuccessful() + { + return $this->_Stats["successful"]; + } + + /** + * Returns the number of rows in the resultset + * + * This function returns the value of the {@link Krai_Db_Query::$_Stats} + * "numrows" key. + * + * @return integer + * + */ + public function NumRows() + { + return $this->_Stats["numrows"]; + } + + /** + * Returns the number of affected rows + * + * This function returns the value of the {@link Krai_Db_Query::$_Stats} + * "affected" key. + * + * @return integer + * + */ + public function Affected() + { + return $this->_Stats["affected"]; + } + + /** + * Returns the last inserted id + * + * This function returns the value of the {@link Krai_Db_Query::$_Stats} + * "insertid" key. + * + * @return integer + * + */ + public function InsertID() + { + return $this->_Stats["insertid"]; + } + + /** + * Returns query error information + * + * This function returns the value of the {@link Krai_Db_Query::$_Stats} + * "error" key, formatted either as a string, as an error code, or an array of + * (string, error code). + * + * @param string $ret How to return the information ("text","number", or "array") + * @return mixed + * @throws Krai_Db_Exception + * + */ + public function Error($ret = "text") + { + if($ret == "text") + { + return $this->_Stats["error"][0]; + } + elseif($ret == "number") + { + return $this->_Stats["error"][1]; + } + elseif($ret == "array") + { + return $this->_Stats["error"]; + } + else + { + throw new Krai_Db_Exception("Un-recognized return type option passed to Krai_Db_Query::Error."); + } + } + } Krai/Db/Query.php @@ -14,7 +14,7 @@ Krai::Uses( Krai::$FRAMEWORK."/Struct/Dbquery/Delete.php", - Krai::$FRAMEWORK."/Struct/Dbquery/Find.php", + Krai::$FRAMEWORK."/Struct/Dbquery/Select.php", Krai::$FRAMEWORK."/Struct/Dbquery/Insert.php", Krai::$FRAMEWORK."/Struct/Dbquery/Update.php" ); Krai/Struct/Dbquery.php @@ -15,6 +15,9 @@ Removed Text_Wiki built-in library. Dependent on PEAR now. Merged Krai_Base with Krai. Removed Krai_Base. +Changed how Db handlers return data. Moved query stats into Query objects. Re-named + FindQuery to SelectQuery + == From KvFramework 2.0b6 == Renamed most things. MIGRATION @@ -75,7 +75,7 @@ class User public function __construct(Krai_Db_Object $_data) { $this->_DBDATA = $_data; - $q = Krai::$DB->FindQuery(array("user_roles as ur","roles as r")); + $q = Krai::$DB->SelectQuery(array("user_roles as ur","roles as r")); $q->conditions = "ur.user_id = ? AND ur.role_id = ? AND r.role_id = ur.role_id"; $q->parameters = array($this->_DBDATA->user_id, 'sysop'); $q->fields = array("ur.role_id"); @@ -140,7 +140,7 @@ class User $p .= "?, "; } - $q = Krai::$DB->FindQuery(array("user_roles as ur","roles as r")); + $q = Krai::$DB->SelectQuery(array("user_roles as ur","roles as r")); $q->conditions = "ur.user_id = ? AND ur.role_id IN (".substr($p,0,-2).") AND r.role_id = ur.role_id"; $q->parameters = array_merge(array($this->_DBDATA->user_id),$as->requires); $q->fields = array("ur.role_id"); @@ -190,7 +190,7 @@ class User self::$_PrivLookups[intval($_user_id)] = array(); } - $q = Krai::$DB->FindQuery(array("user_roles as ur","users as u","roles as r")); + $q = Krai::$DB->SelectQuery(array("user_roles as ur","users as u","roles as r")); $q->conditions = "ur.role_id = ? AND ur.user_id = ? AND u.user_id = ur.user_id AND r.role_id = ur.role_id"; $q->parameters = array($_priv_name, $_user_id); $q->fields = array("ur.role_id","ur.user_id"); script/demo/includes/lib/user.class.php @@ -138,7 +138,7 @@ class ApplicationModule extends Krai_Module } // check to see if user has an active session using the session string found in cookie - $q = self::$DB->FindQuery(array('sessions as s', 'users as u' => "s.user_id = u.user_id")); + $q = self::$DB->SelectQuery(array('sessions as s', 'users as u' => "s.user_id = u.user_id")); $q->fields = array('s.session_id','s.started','s.lastact','s.useragent','s.ipaddr','u.*'); $q->conditions = "s.session_id = ?"; $q->limit = "1"; @@ -182,7 +182,7 @@ class ApplicationModule extends Krai_Module $q->limit = "1"; $res = self::$DB->Process($q); - return ($res instanceOf Krai_Db_Query) ? self::$DB->Result($res) : $res; + return $res->IsSuccessful(); } /** script/demo/includes/modules/application.module/application.module.php @@ -166,11 +166,11 @@ class PageModule_EditAction extends Krai_Module_Action $res = self::$DB->Process($q); - if(self::$DB->Result($res)) + if($res->IsSuccessful()) { $q = self::$DB->UpdateQuery(array("pages")); $q->fields = array( - "page_revision" => $res, + "page_revision" => $res->InsertID(), "page_updated" => time() ); $q->conditions = "page_id = ?"; @@ -179,7 +179,7 @@ class PageModule_EditAction extends Krai_Module_Action $res2 = self::$DB->Process($q); - if(self::$DB->Result($res2)) + if($res2->IsSuccessful()) { self::$DB->Transaction("commit"); self::Notice("Revision saved successfully."); script/demo/includes/modules/page.module/actions/edit.action.php @@ -23,7 +23,7 @@ class PageModule_ListAction extends Krai_Module_Action public function Process() { - $q = self::$DB->FindQuery(array("pages as p", "page_revisions as r")); + $q = self::$DB->SelectQuery(array("pages as p", "page_revisions as r")); $q->conditions = "p.page_indexed = ? AND r.page_id = p.page_id AND r.rev_id = p.page_revision"; $q->parameters = array("yes"); $q->order = "r.rev_page_name AND p.page_id"; script/demo/includes/modules/page.module/actions/list.action.php @@ -83,7 +83,7 @@ class PageModule_SetrevAction extends Krai_Module_Action $res2 = self::$DB->Process($q); - if(self::$DB->Result($res2)) + if($res2->IsSuccessful()) { self::$DB->Transaction("commit"); self::Notice("Revision saved successfully."); script/demo/includes/modules/page.module/actions/setrev.action.php @@ -42,14 +42,14 @@ class PageModule extends ApplicationModule { if(is_null($_rev_id)) { - $q = self::$DB->FindQuery(array("pages as p","page_revisions as pr" => "pr.rev_id = p.page_revision","users as u" => "u.user_id = pr.rev_user")); + $q = self::$DB->SelectQuery(array("pages as p","page_revisions as pr" => "pr.rev_id = p.page_revision","users as u" => "u.user_id = pr.rev_user")); $q->fields = array("u.*","pr.*","p.*"); $q->conditions = "p.page_id = ?"; $q->parameters = array($_page_id); } else { - $q = self::$DB->FindQuery(array("pages as p","page_revisions as pr" => "pr.page_id = p.page_id","users as u" => "u.user_id = pr.rev_user")); + $q = self::$DB->SelectQuery(array("pages as p","page_revisions as pr" => "pr.page_id = p.page_id","users as u" => "u.user_id = pr.rev_user")); $q->fields = array("u.*","pr.*","p.*"); $q->conditions = "p.page_id = ? AND pr.rev_id = ?"; $q->parameters = array($_page_id, $_rev_id); @@ -69,7 +69,7 @@ class PageModule extends ApplicationModule */ public function GetAllRevisions($_page_id, $_orderby = null) { - $q = self::$DB->FindQuery(array("pages as p", "page_revisions as pr", "users as u" => "u.user_id = pr.rev_user")); + $q = self::$DB->SelectQuery(array("pages as p", "page_revisions as pr", "users as u" => "u.user_id = pr.rev_user")); $q->fields = array("u.*","pr.rev_page_name","pr.rev_date","pr.rev_id","p.*"); $q->conditions = "pr.page_id = p.page_id AND p.page_id = ?"; $q->parameters = array($_page_id); @@ -100,7 +100,7 @@ class PageModule extends ApplicationModule return true; } - $q = self::$DB->FindQuery(array("page_owners as po")); + $q = self::$DB->SelectQuery(array("page_owners as po")); $q->conditions = "po.user_id = ? AND po.page_id = ?"; $q->parameters = array(self::$_USER->user_id, $_page_id); $q->limit = "1"; script/demo/includes/modules/page.module/page.module.php @@ -92,7 +92,7 @@ class UserModule_ChangepassAction extends Krai_Module_Action ); $res = self::$DB->Process($q); - if(self::$DB->Result($res)) + if($res->IsSuccessful()) { self::$DB->Transaction("commit"); self::Notice("Password Changed."); script/demo/includes/modules/user.module/actions/changepass.action.php @@ -43,7 +43,7 @@ class UserModule_ConfirmAction extends Krai_Module_Action switch(self::$GET["type"]) { case "register": - $q = self::$DB->FindQuery(array("users")); + $q = self::$DB->SelectQuery(array("users")); $q->conditions = "user_id = ? AND activation_code = ?"; $q->parameters = array(self::$GET["id"], self::$GET["code"]); $q->fields = array("user_id"); @@ -65,8 +65,8 @@ class UserModule_ConfirmAction extends Krai_Module_Action ); $res = self::$DB->Process($q); - $res = self::$DB->Result($res); - if($res || $res === 0) + $res = $res->IsSuccessful(); + if($res) { $q = self::$DB->UpdateQuery(array("users")); $q->conditions = "user_id = ?"; @@ -87,7 +87,7 @@ class UserModule_ConfirmAction extends Krai_Module_Action } break; case "email": - $q = self::$DB->FindQuery(array("users")); + $q = self::$DB->SelectQuery(array("users")); $q->conditions = "user_id = ? AND confirmation_code = ?"; $q->parameters = array(self::$GET["id"], self::$GET["code"]); $q->fields = array("user_id","new_email"); @@ -105,7 +105,7 @@ class UserModule_ConfirmAction extends Krai_Module_Action $res = self::$DB->Process($q); - if(self::$DB->Result($res)) + if($res->IsSuccessful()) { self::$DB->Transaction("commit"); self::Notice("E-mail confirmation was successful."); script/demo/includes/modules/user.module/actions/confirm.action.php @@ -24,7 +24,7 @@ class UserModule_DirectoryAction extends Krai_Module_Action public function Process() { - $q = self::$DB->FindQuery(array("users as u")); + $q = self::$DB->SelectQuery(array("users as u")); $q->fields = array("u.*"); $q->conditions = "u.directory_list = 'yes'"; $q->order = "displayname, username"; script/demo/includes/modules/user.module/actions/directory.action.php @@ -79,7 +79,7 @@ class UserModule_EditAction extends Krai_Module_Action //Check for e-mail uniqueness if(!array_key_exists("email", $this->_errorfields)) { - $q = self::$DB->FindQuery(array("users")); + $q = self::$DB->SelectQuery(array("users")); $q->conditions = "(email = ? OR new_email = ?) AND user_id != ?"; $q->parameters = array(self::$POST["email"], self::$POST["email"], $this->_parent->USER->user_id); $q->limit = "1"; @@ -126,7 +126,7 @@ class UserModule_EditAction extends Krai_Module_Action $res = self::$DB->Process($q); - if(self::$DB->Result($res)) + if($res->IsSuccessful()) { if($this->_parent->USER->email != self::$POST["email"]) { script/demo/includes/modules/user.module/actions/edit.action.php @@ -89,7 +89,7 @@ class UserModule_LoginAction extends Krai_Module_Action { $password = "0x".bin2hex(sha1(self::$POST['password'])); - $q = self::$DB->FindQuery(array('users as u')); + $q = self::$DB->SelectQuery(array('users as u')); $q->fields = array('u.user_id'); $q->conditions = "username = ? AND password = ?"; $q->parameters = array(self::$POST["username"], $password); @@ -152,7 +152,7 @@ class UserModule_LoginAction extends Krai_Module_Action $sessionID .= $charDump{mt_rand(0,strlen($charDump)-1)}; } // check to see if 32-character string already exists - $q = self::$DB->FindQuery('sessions'); + $q = self::$DB->SelectQuery('sessions'); $q->conditions = "session_id = ?"; $q->limit = "1"; $q->parameters = array($sessionID); script/demo/includes/modules/user.module/actions/login.action.php @@ -69,7 +69,7 @@ class UserModule_LostpassAction extends Krai_Module_Action $thecode .= $dump{mt_rand(0,strlen($dump)-1)}; } - $q = self::$DB->FindQuery(array("users")); + $q = self::$DB->SelectQuery(array("users")); $q->conditions = "username = ?"; $q->parameters = array(self::$POST["username"]); $q->fields = array("user_id","email"); @@ -92,7 +92,7 @@ class UserModule_LostpassAction extends Krai_Module_Action ); $res = self::$DB->Process($q); - if(self::$DB->Result($res)) + if($res->IsSuccessful()) { //Send activation email $mail = Krai_Mail::NewMail(); script/demo/includes/modules/user.module/actions/lostpass.action.php @@ -31,7 +31,7 @@ class UserModule_ProfileAction extends Krai_Module_Action public function Process() { - $q = self::$DB->FindQuery(array("users as u")); + $q = self::$DB->SelectQuery(array("users as u")); $q->conditions = "u.username = ?"; $q->parameters = array(self::$PARAMS["id"]); $q->limit = "1"; script/demo/includes/modules/user.module/actions/profile.action.php @@ -45,7 +45,7 @@ function page_edit_cancel() function LoadRevChooser(page_id) { - $.getJSON(_BASEURI_+'page/revisions/'+page_id, {}, function(response){ + $.getJSON(CONFIG.BASEURI+'page/revisions/'+page_id, {}, function(response){ if(response.result == 0) { if(response.message != "ok") @@ -63,7 +63,7 @@ function LoadRevChooser(page_id) var sb = $.create('select',{'class': 'selectbox single', 'size': '1', 'style': 'width: auto;', 'id': 'revision_select', 'name': 'revision_select'}, options); sb.change(function(){ShowRevision(page_id);}); $('#rev_chooser').append( - $.create('form', {'method':'post', 'action': _BASEURI_+'page/setrev/'+page_id}, [ + $.create('form', {'method':'post', 'action': CONFIG.BASEURI+'page/setrev/'+page_id}, [ sb, ' ', $.create('input',{'type': 'submit','class': 'button', 'value': 'set revision'},[]) @@ -90,7 +90,7 @@ function ShowRevision(page_id) { $('#revision_select').attr("disabled","disabled"); var rev_id = $('#revision_select option:selected').val(); - $.getJSON(_BASEURI_+'page/revisions/'+page_id, {'rid': rev_id}, function(response){ + $.getJSON(CONFIG.BASEURI+'page/revisions/'+page_id, {'rid': rev_id}, function(response){ if(response.result == 0) { if(response.message != "ok") script/demo/public/javascripts/application.js Krai/Struct/Dbquery/Find.php 958211c017cb09695019db68a89d8fd13350202d Greg McWhirter greg@hallofkvasir.org http://github.com/gsmcwhirter/krai/commit/d95c7e4fbc2e573341dde1ced953ad9325d3a409 d95c7e4fbc2e573341dde1ced953ad9325d3a409 2008-07-19T13:16:40-07:00 2008-07-19T13:16:40-07:00 Refactoring some database things. Hopefully this makes PDO support more feasible again. 5794b0b53c89e19e6b3b3e3d16114d857c1bbd50 Greg McWhirter greg@hallofkvasir.org