From 5330ba05cafe0c33ea7f6d0e0a0b7117117f246f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 6 Jun 2010 20:35:36 +0200 Subject: Introduce CommonTable, TableIterator, TablePearRepo classes (and use it in refresh) --- class/CommonTable.php | 368 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 368 insertions(+) create mode 100644 class/CommonTable.php (limited to 'class/CommonTable.php') diff --git a/class/CommonTable.php b/class/CommonTable.php new file mode 100644 index 0000000..721a224 --- /dev/null +++ b/class/CommonTable.php @@ -0,0 +1,368 @@ +. + * + * @category Main + * @package RPMPHP + * + * @author Remi Collet + * @author Johan Cwiklinski + * @copyright 2010 Remi Collet + * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version + * @link http://github.com/remicollet/rpmphp/ + * @since The begining of times. +*/ + +abstract class CommonTable { + + protected $db; + protected $table; + + function __construct(PDO $db, $table) { + + $this->db = $db; + $this->table = $table; + + if (!$this->existsTable($table)) { + $this->createTable($table); + } + } + + public function existsTable($table) { + $req = new TableIterator($this->db, "SHOW TABLES LIKE '$table'"); + foreach ($req as $data) { + return true; + } + return false; + } + + protected function exec($sql) { + $res = $this->db->exec($sql); + if ($res===false) { + $err = $this->db->errorInfo(); + throw new Exception($err[2]); + } + } + + protected function add(array $fields) { + $col = array(); + $val = array(); + foreach ($fields as $name => $value) { + $col[] = "`$name`"; + if (is_null($value)) { + $val[] = 'NULL'; + } else if (is_numeric($value)) { + $val[] = $value; + } else { + $val[] = "'$value'"; + } + } + $sql = "INSERT INTO `".$this->table."` (".implode(',',$col).") + VALUE (".implode(',',$val).")"; + $this->exec($sql); + } + abstract protected function createTable(); + + /** + * Instanciate a Simple DBIterator + * + * Examples = + * foreach ($DB->request("select * from glpi_states") as $data) { ... } + * foreach ($DB->request("glpi_states") as $ID => $data) { ... } + * foreach ($DB->request("glpi_states", "ID=1") as $ID => $data) { ... } + * foreach ($DB->request("glpi_states", "", "name") as $ID => $data) { ... } + * foreach ($DB->request("glpi_computers",array("name"=>"SBEI003W","entities_id"=>1),array("serial","otherserial")) { ... } + * + * @param $tableorsql table name, array of names or SQL query + * @param $crit string or array of field/values, ex array("id"=>1), if empty => all rows + * + * Examples = + * array("id"=>NULL) + * array("OR"=>array("id"=>1, "NOT"=>array("state"=>3))); + * array("AND"=>array("id"=>1, array("NOT"=>array("state"=>array(3,4,5),"toto"=>2)))) + * + * param 'FIELDS' name or array of field names + * param 'ORDER' filed name or array of field names + * param 'LIMIT' max of row to retrieve + * param 'START' first row to retrieve + * + * @return DBIterator + **/ + public function request ($crit='') { + return new TableIterator ($this->db, $this->table, $crit); + } + + public function getAllArray($fieldkey, $fieldvalue) { + $crit = array('FIELDS' => array($fieldkey, $fieldvalue), + 'ORDER' => $fieldkey); + $tab = array(); + foreach ($this->request($crit) as $data) { + $tab[$data[$fieldkey]] = $data[$fieldvalue]; + } + return $tab; + } +} + +class TablePearRepo extends CommonTable { + + function __construct($db) { + parent::__construct($db, 'pearrepo'); + } + + protected function createTable() { + + // Table schema + $sql = "CREATE TABLE `pearrepo` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `alias` varchar(30) NOT NULL, + `url` varchar(255) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `alias` (`alias`) + ) DEFAULT CHARSET=utf8"; + + $this->exec($sql); + + // Some known repo, other could be add manually + // no reply from "phpdb" => "pear.phpdb.org" + $channels = array( + "pear" => "pear.php.net" + ,"doctrine" => "pear.phpdoctrine.org" + ,"ezc" => "components.ez.no" + ,"pdepend" => "pear.pdepend.org" + ,"phing" => "pear.phing.info" + ,"phpmd" => "pear.phpmd.org" + ,"phpunit" => "pear.phpunit.de" + ,"swift" => "pear.swiftmailer.org" + ,"symphony" => "pear.symfony-project.com" + ); + + foreach ($channels as $alias => $url) { + $this->add(array('alias'=>$alias, 'url'=>$url)); + } + } + + function getAllRepo() { + return $this->getAllArray('alias', 'url'); + } +} + +/* + * Helper for simple query => see $DBmysql->requete + */ +class TableIterator implements Iterator { + + private $con; + private $sql; + private $res = false; + private $row; + private $pos; + + /** + * Constructor + * + * @param $dbconnexion Database Connnexion (must be a CommonDBTM object) + * @param $table table name + * @param $crit string or array of filed/values, ex array("id"=>1), if empty => all rows + * + **/ + function __construct (PDO $dbconnexion, $table, $crit='') { + + $this->conn = $dbconnexion; + if (is_string($table) && strpos($table, " ")) { + $this->sql = $table; + } else { + // check field, orderby, limit, start in criterias + $field=""; + $orderby=""; + $limit=0; + $start=0; + + if (is_array($crit) && count($crit)) { + foreach ($crit as $key => $val) { + if ($key==="FIELDS") { + $field = $val; + unset($crit[$key]); + } else if ($key==="ORDER") { + $orderby = $val; + unset($crit[$key]); + } else if ($key==="LIMIT") { + $limit = $val; + unset($crit[$key]); + } else if ($key==="START") { + $start = $val; + unset($crit[$key]); + } + } + } + + // SELECT field list + if (is_array($field)) { + $this->sql = ""; + foreach ($field as $t => $f) { + if (is_numeric($t)) { + $this->sql .= (empty($this->sql) ? "SELECT " : ",") . $f; + } else if (is_array($f)) { + $this->sql .= (empty($this->sql) ? "SELECT $t." : ",$t.") . implode(",$t.",$f); + } else { + $this->sql .= (empty($this->sql) ? "SELECT " : ",") . "$t.$f"; + } + } + } else if (empty($field)) { + $this->sql = "SELECT *"; + } else { + $this->sql = "SELECT `$field`"; + } + // FROM table list + if (is_array($table)) { + $this->sql .= " FROM `".implode("`, `",$table)."`"; + } else { + $this->sql .= " FROM `$table`"; + } + // WHERE criteria list + if (!empty($crit)) { + print_r($crit); + $this->sql .= " WHERE ".$this->analyseCrit($crit); + } + // ORDER BY + if (is_array($orderby)) { + $this->sql .= " ORDER BY `".implode("`, `",$orderby)."`"; + } else if (!empty($orderby)) { + $this->sql .= " ORDER BY `$orderby`"; + } + if (is_numeric($limit) && $limit>0) { + $this->sql .= " LIMIT $limit"; + if (is_numeric($start) && $start>0) { + $this->sql .= " OFFSET $start"; + } + } + } + //echo "SQL: ".$this->sql."\n"; + $this->res = $this->conn->prepare($this->sql); + if ($this->res===false) { + $err = $this->db->errorInfo(); + throw new Exception($err[2]); + } + + $this->pos = -1; + } + + function __destruct () { + + if ($this->res) { + $this->res->closeCursor(); + } + } + + private function analyseCrit ($crit, $bool="AND") { + + if (!is_array($crit)) { + return $crit; + } + $ret = ""; + foreach ($crit as $name => $value) { + if (!empty($ret)) { + $ret .= " $bool "; + } + if (is_numeric($name)) { + // No Key case => recurse. + $ret .= "(" . $this->analyseCrit($value, $bool) . ")"; + } else if ($name==="OR" || $name==="AND") { + // Binary logical operator + $ret .= "(" . $this->analyseCrit($value, $name) . ")"; + } else if ($name==="NOT") { + // Uninary logicial operator + $ret .= " NOT (" . $this->analyseCrit($value, "AND") . ")"; + } else if ($name==="FKEY") { + // Foreign Key condition + if (is_array($value) && count($value)==2) { + reset($value); + list($t1,$f1)=each($value); + list($t2,$f2)=each($value); + $ret .= (is_numeric($t1) ? "$f1" : "$t1.$f1") . "=" . + (is_numeric($t2) ? "$f2" : "$t2.$f2"); + } else { + trigger_error("BAD FOREIGN KEY", E_USER_ERROR); + } + } else if (is_array($value)) { + // Array of Value + $ret .= "$name IN ('". implode("','",$value)."')"; + } else if (is_null($value)) { + // NULL condition + $ret .= "$name IS NULL"; + } else if (is_numeric($value)) { + // Integer + $ret .= "$name=$value"; + } else { + // String + $ret .= "$name='$value'"; + } + } + return $ret; + } + + public function rewind () { + + if ($this->res && $this->pos>=0) { + $this->res->closeCursor(); + $this->pos = -1; + } + + if ($this->res && $this->pos<0) { + if (!$this->res->execute()) { + $err = $this->res->errorInfo(); + throw new Exception($err[2]); + } + } + return $this->next(); + } + + public function current() { + + return $this->row; + } + + public function key() { + + return (isset($this->row["id"]) ? $this->row["id"] : $this->pos); + } + + public function next() { + + if (!$this->res) { + return false; + } + $this->row = $this->res->fetch(PDO::FETCH_ASSOC); + $this->pos++; + return $this->row; + } + + public function valid() { + + return $this->res && $this->row; + } + + public function numrows() { + + return ($this->res ? $this->res->rowCount() : 0); + } +} +?> -- cgit From 358fc123a50e23389b0f48f3afa0468bc9fae51a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 6 Jun 2010 20:57:48 +0200 Subject: add some docs --- class/CommonTable.php | 63 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 55 insertions(+), 8 deletions(-) (limited to 'class/CommonTable.php') diff --git a/class/CommonTable.php b/class/CommonTable.php index 721a224..66e1c27 100644 --- a/class/CommonTable.php +++ b/class/CommonTable.php @@ -37,6 +37,12 @@ abstract class CommonTable { protected $db; protected $table; + /** + * Instanciate a CommonTable + * + * @param $db object PDO instance of the DB connection + * @param $table string with table name + */ function __construct(PDO $db, $table) { $this->db = $db; @@ -47,6 +53,13 @@ abstract class CommonTable { } } + /** + * Check if the table already exists + * + * @param $table string with table name + * + * @return boolean + */ public function existsTable($table) { $req = new TableIterator($this->db, "SHOW TABLES LIKE '$table'"); foreach ($req as $data) { @@ -55,6 +68,11 @@ abstract class CommonTable { return false; } + /** + * Execute an SQL statement (INSERT, DELETE, ...) + * + * @param $sql string + */ protected function exec($sql) { $res = $this->db->exec($sql); if ($res===false) { @@ -63,6 +81,11 @@ abstract class CommonTable { } } + /** + * Add a new row in the table + * + * @param fields hashtable of fieldname => value + */ protected function add(array $fields) { $col = array(); $val = array(); @@ -80,19 +103,21 @@ abstract class CommonTable { VALUE (".implode(',',$val).")"; $this->exec($sql); } + + /** + * Create the table + */ abstract protected function createTable(); /** - * Instanciate a Simple DBIterator + * Instanciate a Simple TableIterator on the current table * * Examples = - * foreach ($DB->request("select * from glpi_states") as $data) { ... } - * foreach ($DB->request("glpi_states") as $ID => $data) { ... } - * foreach ($DB->request("glpi_states", "ID=1") as $ID => $data) { ... } - * foreach ($DB->request("glpi_states", "", "name") as $ID => $data) { ... } - * foreach ($DB->request("glpi_computers",array("name"=>"SBEI003W","entities_id"=>1),array("serial","otherserial")) { ... } + * foreach ($DB->request() as $ID => $data) { ... } + * foreach ($DB->request("ID=1") as $ID => $data) { ... } + * foreach ($DB->request("", "name") as $ID => $data) { ... } + * foreach ($DB->request(array("name"=>"SBEI003W","entities_id"=>1),array("serial","otherserial")) { ... } * - * @param $tableorsql table name, array of names or SQL query * @param $crit string or array of field/values, ex array("id"=>1), if empty => all rows * * Examples = @@ -111,6 +136,14 @@ abstract class CommonTable { return new TableIterator ($this->db, $this->table, $crit); } + /** + * Retrieve 2 columns of all the table's row in a hashtable + * + * @param $fieldkey string name of the field to use as index + * @param $fieldvalue string name of the field to use as value + * + * @return hashtable + */ public function getAllArray($fieldkey, $fieldvalue) { $crit = array('FIELDS' => array($fieldkey, $fieldvalue), 'ORDER' => $fieldkey); @@ -124,10 +157,16 @@ abstract class CommonTable { class TablePearRepo extends CommonTable { + /** + * Instanciate a TablePearRepo to manage pearrepo table + */ function __construct($db) { parent::__construct($db, 'pearrepo'); } + /** + * Create the table and populate it with known repo + */ protected function createTable() { // Table schema @@ -160,13 +199,18 @@ class TablePearRepo extends CommonTable { } } + /** + * Retrieve all the known repository + * + * @return hastable of alias => url + */ function getAllRepo() { return $this->getAllArray('alias', 'url'); } } /* - * Helper for simple query => see $DBmysql->requete + * Helper for simple query => use directly or through CommonTable::request() */ class TableIterator implements Iterator { @@ -272,6 +316,9 @@ class TableIterator implements Iterator { } } + /** + * Build WHERE clause + */ private function analyseCrit ($crit, $bool="AND") { if (!is_array($crit)) { -- cgit From a6b39fd500d6419dc9e268efc52474e06a11458f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 6 Jun 2010 21:21:06 +0200 Subject: missing ref to GLPI --- class/CommonTable.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'class/CommonTable.php') diff --git a/class/CommonTable.php b/class/CommonTable.php index 66e1c27..a913edd 100644 --- a/class/CommonTable.php +++ b/class/CommonTable.php @@ -211,6 +211,10 @@ class TablePearRepo extends CommonTable { /* * Helper for simple query => use directly or through CommonTable::request() + * + * Freely inspired from DBmysqlIterator class from GLPI + * (already written by Remi, and ported to PDO) + * See http://www.glpi-project.org/ */ class TableIterator implements Iterator { -- cgit From a6282ca0e8a13fd53b4bea6eeff7a69f1312eef3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 8 Jun 2010 18:39:20 +0200 Subject: autoload --- class/CommonTable.php | 316 +------------------------------------------------- 1 file changed, 1 insertion(+), 315 deletions(-) (limited to 'class/CommonTable.php') diff --git a/class/CommonTable.php b/class/CommonTable.php index 1ed47f8..57c701b 100644 --- a/class/CommonTable.php +++ b/class/CommonTable.php @@ -170,318 +170,4 @@ abstract class CommonTable } } -class TablePearRepo extends CommonTable -{ - - /** - * Instanciate a TablePearRepo to manage pearrepo table - * - * @param object $db PDO instance of the DB connection - */ - function __construct($db) - { - parent::__construct($db, 'pearrepo'); - } - - /** - * Create the table and populate it with known repo - * - * @return void - */ - protected function createTable() - { - - // Table schema - $sql = "CREATE TABLE `pearrepo` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `alias` varchar(30) NOT NULL, - `url` varchar(255) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `alias` (`alias`) - ) DEFAULT CHARSET=utf8"; - - $this->exec($sql); - - // Some known repo, other could be add manually - // no reply from "phpdb" => "pear.phpdb.org" - $channels = array( - "pear" => "pear.php.net" - ,"doctrine" => "pear.phpdoctrine.org" - ,"ezc" => "components.ez.no" - ,"pdepend" => "pear.pdepend.org" - ,"phing" => "pear.phing.info" - ,"phpmd" => "pear.phpmd.org" - ,"phpunit" => "pear.phpunit.de" - ,"swift" => "pear.swiftmailer.org" - ,"symphony" => "pear.symfony-project.com" - ); - - foreach ($channels as $alias => $url) { - $this->add(array('alias'=>$alias, 'url'=>$url)); - } - } - - /** - * Retrieve all the known repository - * - * @return hastable of alias => url - */ - function getAllRepo() - { - return $this->getAllArray('alias', 'url'); - } -} - -/** - * Helper for simple query => use directly or through CommonTable::request() - * - * Freely inspired from DBmysqlIterator class from GLPI - * (already written by Remi, and ported to PDO) - * See http://www.glpi-project.org/ - */ -class TableIterator implements Iterator -{ - private $con; - private $sql; - private $res = false; - private $row; - private $pos; - - /** - * Constructor - * - * @param CommonDBTM $dbconnexion Database Connnexion - * (must be a CommonDBTM object) - * @param string $table table name - * @param string|array $crit string or array of filed/values, - * ex array("id"=>1), if empty => all rows - */ - function __construct (PDO $dbconnexion, $table, $crit='') - { - - $this->conn = $dbconnexion; - if (is_string($table) && strpos($table, " ")) { - $this->sql = $table; - } else { - // check field, orderby, limit, start in criterias - $field=""; - $orderby=""; - $limit=0; - $start=0; - - if (is_array($crit) && count($crit)) { - foreach ($crit as $key => $val) { - if ($key==="FIELDS") { - $field = $val; - unset($crit[$key]); - } else if ($key==="ORDER") { - $orderby = $val; - unset($crit[$key]); - } else if ($key==="LIMIT") { - $limit = $val; - unset($crit[$key]); - } else if ($key==="START") { - $start = $val; - unset($crit[$key]); - } - } - } - - // SELECT field list - if (is_array($field)) { - $this->sql = ""; - foreach ($field as $t => $f) { - if (is_numeric($t)) { - $this->sql .= (empty($this->sql) - ? "SELECT " : ",") . $f; - } else if (is_array($f)) { - $this->sql .= (empty($this->sql) - ? "SELECT $t." : ",$t.") . implode(",$t.", $f); - } else { - $this->sql .= (empty($this->sql) - ? "SELECT " : ",") . "$t.$f"; - } - } - } else if (empty($field)) { - $this->sql = "SELECT *"; - } else { - $this->sql = "SELECT `$field`"; - } - // FROM table list - if (is_array($table)) { - $this->sql .= " FROM `".implode("`, `", $table)."`"; - } else { - $this->sql .= " FROM `$table`"; - } - // WHERE criteria list - if (!empty($crit)) { - print_r($crit); - $this->sql .= " WHERE ".$this->_analyseCrit($crit); - } - // ORDER BY - if (is_array($orderby)) { - $this->sql .= " ORDER BY `".implode("`, `", $orderby)."`"; - } else if (!empty($orderby)) { - $this->sql .= " ORDER BY `$orderby`"; - } - if (is_numeric($limit) && $limit>0) { - $this->sql .= " LIMIT $limit"; - if (is_numeric($start) && $start>0) { - $this->sql .= " OFFSET $start"; - } - } - } - //echo "SQL: ".$this->sql."\n"; - $this->res = $this->conn->prepare($this->sql); - if ($this->res===false) { - $err = $this->db->errorInfo(); - throw new Exception($err[2]); - } - - $this->pos = -1; - } - - /** - * Class destructor - */ - function __destruct () - { - if ($this->res) { - $this->res->closeCursor(); - } - } - - /** - * Build WHERE clause - * - * @param TODO $crit To document - * @param TODO $bool To document - * - * @return To document - */ - private function _analyseCrit ($crit, $bool="AND") - { - - if (!is_array($crit)) { - return $crit; - } - $ret = ""; - foreach ($crit as $name => $value) { - if (!empty($ret)) { - $ret .= " $bool "; - } - if (is_numeric($name)) { - // No Key case => recurse. - $ret .= "(" . $this->_analyseCrit($value, $bool) . ")"; - } else if ($name==="OR" || $name==="AND") { - // Binary logical operator - $ret .= "(" . $this->_analyseCrit($value, $name) . ")"; - } else if ($name==="NOT") { - // Uninary logicial operator - $ret .= " NOT (" . $this->_analyseCrit($value, "AND") . ")"; - } else if ($name==="FKEY") { - // Foreign Key condition - if (is_array($value) && count($value)==2) { - reset($value); - list($t1,$f1)=each($value); - list($t2,$f2)=each($value); - $ret .= (is_numeric($t1) ? "$f1" : "$t1.$f1") . "=" . - (is_numeric($t2) ? "$f2" : "$t2.$f2"); - } else { - trigger_error("BAD FOREIGN KEY", E_USER_ERROR); - } - } else if (is_array($value)) { - // Array of Value - $ret .= "$name IN ('". implode("','", $value)."')"; - } else if (is_null($value)) { - // NULL condition - $ret .= "$name IS NULL"; - } else if (is_numeric($value)) { - // Integer - $ret .= "$name=$value"; - } else { - // String - $ret .= "$name='$value'"; - } - } - return $ret; - } - - /** - * To document - * - * @return To document - */ - public function rewind () - { - - if ($this->res && $this->pos>=0) { - $this->res->closeCursor(); - $this->pos = -1; - } - - if ($this->res && $this->pos<0) { - if (!$this->res->execute()) { - $err = $this->res->errorInfo(); - throw new Exception($err[2]); - } - } - return $this->next(); - } - - /** - * To document - * - * @return To document - */ - public function current() - { - return $this->row; - } - - /** - * To document - * - * @return To document - */ - public function key() - { - return (isset($this->row["id"]) ? $this->row["id"] : $this->pos); - } - - /** - * To document - * - * @return To document - */ - public function next() - { - if (!$this->res) { - return false; - } - $this->row = $this->res->fetch(PDO::FETCH_ASSOC); - $this->pos++; - return $this->row; - } - - /** - * To document - * - * @return To document - */ - public function valid() - { - return $this->res && $this->row; - } - - /** - * To document - * - * @return To document - */ - public function numrows() - { - return ($this->res ? $this->res->rowCount() : 0); - } -} -?> +?> \ No newline at end of file -- cgit From e671ebe6e140b4fd2bf671c07b0b59aa070ea23b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 8 Jun 2010 19:24:25 +0200 Subject: add CommonTable->delete() method --- class/CommonTable.php | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) (limited to 'class/CommonTable.php') diff --git a/class/CommonTable.php b/class/CommonTable.php index 57c701b..f08b29e 100644 --- a/class/CommonTable.php +++ b/class/CommonTable.php @@ -73,6 +73,8 @@ abstract class CommonTable * Execute an SQL statement (INSERT, DELETE, ...) * * @param string $sql The SQL clause + * + * @param integer number of affected rows */ protected function exec($sql) { @@ -81,14 +83,17 @@ abstract class CommonTable $err = $this->db->errorInfo(); throw new Exception($err[2]); } + return $res; } /** * Add a new row in the table * * @param hashtable $fields hashtable of fieldname => value + * + * @return integer primary key of inserted row */ - protected function add(array $fields) + public function add(array $fields) { $col = array(); $val = array(); @@ -99,14 +104,47 @@ abstract class CommonTable } else if (is_numeric($value)) { $val[] = $value; } else { - $val[] = "'$value'"; + $val[] = "'".addslashes($value)."'"; } } $sql = "INSERT INTO `".$this->table."` (".implode(',', $col).") VALUE (".implode(',', $val).")"; $this->exec($sql); + + $id = $this->db->lastInsertId(); + + return $id; } + /** + * Delete a row in the table + * + * @param hashtable $crit of key => value + * + * @return integer : number of row deleted + */ + public function delete(array $crit) + { + $sql = "DELETE FROM `".$this->table."` "; + + $link="WHERE"; + foreach ($crit as $key => $value) { + $sql .= " $link `$key`"; + + if (is_null($value)) { + $sql .= 'IS NULL'; + } else if (is_numeric($value)) { + $sql .= '='.$value; + } else { + $sql .= "='".addslashes($value)."'"; + } + + $link = "AND"; + } + $nb = $this->exec($sql); + + return $nb; + } /** * Create the table */ -- cgit From 53454761ed4d619b328d7cb5f628daafe127efb7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 8 Jun 2010 19:34:49 +0200 Subject: some docs --- class/CommonTable.php | 1 + 1 file changed, 1 insertion(+) (limited to 'class/CommonTable.php') diff --git a/class/CommonTable.php b/class/CommonTable.php index f08b29e..1102c4d 100644 --- a/class/CommonTable.php +++ b/class/CommonTable.php @@ -145,6 +145,7 @@ abstract class CommonTable return $nb; } + /** * Create the table */ -- cgit From 3c22a10c40837b1695ae04d120bbfc68da01059c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 8 Jun 2010 20:04:48 +0200 Subject: add TableRRepo class and use it --- class/CommonTable.php | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'class/CommonTable.php') diff --git a/class/CommonTable.php b/class/CommonTable.php index 1102c4d..e049188 100644 --- a/class/CommonTable.php +++ b/class/CommonTable.php @@ -81,7 +81,7 @@ abstract class CommonTable $res = $this->db->exec($sql); if ($res===false) { $err = $this->db->errorInfo(); - throw new Exception($err[2]); + throw new Exception("\nSQL: $sql\nERROR: ".$err[2]."\nCODE:"); } return $res; } @@ -197,7 +197,7 @@ abstract class CommonTable * * @return hashtable */ - public function getAllArray($fieldkey, $fieldvalue) + public function getHashtable($fieldkey, $fieldvalue) { $crit = array('FIELDS' => array($fieldkey, $fieldvalue), 'ORDER' => $fieldkey); @@ -207,6 +207,22 @@ abstract class CommonTable } return $tab; } + + /** + * Retrieve a big array with all date from the table + * + * @param array|string $crit for the request + * + * @return array, index is rowid, value is a hastable + */ + public function getArray($crit='') + { + $tab = array(); + foreach ($this->request($crit) as $id => $data) { + $tab[$id] = $data; + } + return $tab; + } } ?> \ No newline at end of file -- cgit From 825c4679551854f48c6c6b67e5c5b7f7322d24d2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 8 Jun 2010 20:25:59 +0200 Subject: improves previous, add active field to pearrepo table --- class/CommonTable.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'class/CommonTable.php') diff --git a/class/CommonTable.php b/class/CommonTable.php index e049188..8fd0471 100644 --- a/class/CommonTable.php +++ b/class/CommonTable.php @@ -194,13 +194,15 @@ abstract class CommonTable * * @param string $fieldkey name of the field to use as index * @param string $fieldvalue name of the field to use as value + * @param array $crit for request * * @return hashtable */ - public function getHashtable($fieldkey, $fieldvalue) + public function getHashtable($fieldkey, $fieldvalue, array $crit=array()) { - $crit = array('FIELDS' => array($fieldkey, $fieldvalue), - 'ORDER' => $fieldkey); + $crit['FIELDS'] = array($fieldkey, $fieldvalue); + $crit['ORDER'] = $fieldkey; + $tab = array(); foreach ($this->request($crit) as $data) { $tab[$data[$fieldkey]] = $data[$fieldvalue]; -- cgit