From ab01d0a41fe80d8545241922b6f5f69f9fddadce Mon Sep 17 00:00:00 2001 From: Alexander Demidov Date: Thu, 19 Sep 2013 10:05:00 +0400 Subject: [PATCH] Refactoring. Add SqlResultProvider. Add TODO in SqlDbDriver.whereExpr(). --- model/SqlCriteria.php | 55 ++++++------ model/SqlDbDriver.php | 1 + model/SqlModel.php | 215 ++++++++------------------------------------ model/SqlResultProvider.php | 73 +++++++++++++++ 4 files changed, 140 insertions(+), 204 deletions(-) create mode 100644 model/SqlResultProvider.php diff --git a/model/SqlCriteria.php b/model/SqlCriteria.php index 747ffee..695e776 100644 --- a/model/SqlCriteria.php +++ b/model/SqlCriteria.php @@ -2,44 +2,50 @@ class SqlCriteria { - public $select = '*'; + private $select = array(); - public $distinct = ''; + private $distinct = ''; - public $where = array(); + private $where = array(); - public $order = array(); + private $order = array('sort' => array(), 'order' => array()); - public $limit = ''; + private $limit = ''; /** - * @return SqlCriteria + * @var SqlModel */ - public static function getInstance() + private $model; + + public function find() { - return self; + } /** - * @param $conditions array @ex array('field=?' => $value, 'field in ? => new DbExpr('(1,2,3)')) + * @param $cond string Condition with "?" placeholder @ex 'field=?' + * @param $value string|array|DbExpr Value. Array transformed to DbExpr(implode(',' Array)) All elements in the array mast be integer * @return SqlCriteria + * @desc Allow multiple calls */ - public function where($conditions) + public function where($cond, $value) { - $this->where = $conditions; + $this->where[$cond] = $value; return $this; } /** - * @param $fields array @ex array('field1', 'field2' => SqlModel::ORDER_DESC) + * @param $field string Field @ex 'field' + * @param $order_desc bool Descendant sort direction * @return SqlCriteria + * @desc Allow multiple calls */ - public function order($fields) + public function order($field, $order_desc = false) { - if (!is_array($fields)) { - $fields = array($fields); + $this->order['sort'][] = $field; + if ($order_desc) { + $this->order['order'][$field] = 'desc'; } - $this->order = $fields; return $this; } @@ -50,23 +56,20 @@ class SqlCriteria */ public function limit($limit, $offset = 0) { - if (empty($offset)) { - $this->limit = (int) $limit; + if ($offset) { + $this->limit = (int) $offset . ','; } - $this->limit = (int)$limit . ',' . (int) $offset; + $this->limit .= (int) $limit; return $this; } /** - * @param mixed $select array @ex array('field1', 'field2', 'field3' => 'field') - * @return string + * @param string $field + * @return SqlCriteria */ - public function select($select) + public function select($field) { - if (!is_array($select)) { - $select = array($select); - } - $this->select = $select; + $this->select[] = $field; return $this; } diff --git a/model/SqlDbDriver.php b/model/SqlDbDriver.php index 1952136..4714578 100644 --- a/model/SqlDbDriver.php +++ b/model/SqlDbDriver.php @@ -127,6 +127,7 @@ abstract class SqlDbDriver extends DbDriver /** * @param mixed $where * @return string + * TODO: Если cond Это int и term Это тоже int - кидать Exception (иначе эта ошибка повлечет обновление всех записей в таблице */ protected function whereExpr($where) { diff --git a/model/SqlModel.php b/model/SqlModel.php index 4abcdc2..a284786 100644 --- a/model/SqlModel.php +++ b/model/SqlModel.php @@ -15,29 +15,6 @@ */ abstract class SqlModel extends Model { - const SELECT = 10; - const DISTINCT = 11; - const WHERE = 12; - const ORDER = 13; - const LIMIT = 15; - const OFFSET = 16; - - const ORDER_DESC = 20; - const ORDER_ASC = 21; - - const ASSOC_BY_FIELD = 30; - const ASSOC_AS_ARRAY = 31; - const ASSOC_BY_FIELD_IN_ARRAY = 32; - - protected static $criteria_data_keys = array( - self::SELECT, - self::DISTINCT, - self::WHERE, - self::ORDER, - self::LIMIT, -/** self::OFFSET // that key no to be a process in foreach criteria_data @see SqlModel::find() */ - ); - /** * @param string $ident * @return string Quoted identifier. @@ -100,9 +77,21 @@ abstract class SqlModel extends Model { $sql = ''; if (isset($params['sort'])) { - $order = (isset($params['order']) && $params['order'] == 'desc') ? 'DESC' : 'ASC'; - if (in_array($params['sort'], $sortable)) { - $sql = ' ORDER BY ' . $this->identify($params['sort']) . ' ' . $order; + if (!is_array($params['sort'])) { + if (isset($params['order'])) { + $params['order'] = array($params['sort'] => $params['order']); + } + $params['sort'] = array($params['sort']); + } + $order_list = array(); + for ($i = 0; $i < count($params['sort']); $i++) { + $order = (isset($params['order'][$params['sort'][$i]]) && $params['order'][$params['sort'][$i]] == 'desc') ? 'DESC' : 'ASC'; + if (in_array($params['sort'][$i], $sortable)) { + $order_list[] = $this->identify($params['sort'][$i]) . ' ' . $order; + } + } + if ($order_list) { + $sql = ' ORDER BY ' . implode(',', $order_list); } } return $sql; @@ -200,16 +189,13 @@ abstract class SqlModel extends Model return $result; } - /** - * @param $criteria SqlCriteria - * @return string Sql string expression - */ - protected function criteria($criteria) + + public function find($select, $distinct, $where, $order, $limit) { - if (!is_array($criteria->select)) { - $criteria->select = array(new DbExpr($criteria->select)); + if (!$select) { + $select = array(new DbExpr('*')); } - foreach ($criteria->select as $field => &$term) { + foreach ($select as $field => &$term) { if (is_int($field)) { if ($term instanceof DbExpr) { $term = (string) $term; @@ -220,158 +206,31 @@ abstract class SqlModel extends Model $term = $this->db->quoteIdentifier($field) . ' as ' . $this->db->quoteIdentifier($term); } } - foreach ($criteria->where as $cond => &$term) { - if (is_int($cond)) { - if ($term instanceof DbExpr) { - $term = (string) $term; - } - } else { - if (is_array($term)) { - $term = new DbExpr('(' . implode(',', array_map(function($item){return intval($item);}, $term)) . ')'); - } - $term = $this->db->quoteInto($cond, $term); - } - } - foreach ($criteria->order as $field => $term) { - if (is_int($field)) { - $term = $this->db->quoteIdentifier($term); - } else { - $order_direction = ''; - switch ($term) { - case self::ORDER_DESC: - $order_direction .= ' DESC'; - break; - case self::ORDER_ASC: - $order_direction .= ' ASC'; - break; - } - $term = $this->db->quoteIdentifier($field) . $order_direction; - - } - } - if ($criteria->distinct != '') { - $criteria->distinct = 'DISTINCT ' . $this->db->quoteIdentifier($criteria->distinct); - } - if ($criteria->limit != '') { - $criteria->limit = implode(',',array_map(function($item){return intval($item);},explode(',',$criteria->limit))); - } - return 'SELECT ' . (($criteria->distinct) ? $criteria->distinct : implode(',', $criteria->select)) - . ' FROM ' . $this->table() - . (($criteria->where) ? (' WHERE ' . implode(' AND ', $criteria->where)) : '') - . (($criteria->order) ? (' ORDER BY ' . implode(',', $criteria->order)) : '') - . (($criteria->limit) ? (' LIMIT ' . $criteria->limit) : ''); - } - - /** - * @param $criteria_data array - * @ex array( - * SqlModel::SELECT => '*', - * SqlModel::WHERE => array('field=?', 1), - * SqlModel::ORDER => array('last_name', 'first_name' => SqlModel::ORDER_DESC), - * SqlModel::LIMIT => 10) - * @return mixed|DbStatement[] - */ - public function find($criteria_data) - { - $criteria = new SqlCriteria(); - foreach (self::$criteria_data_keys as $criteria_data_key) { - if (isset($criteria_data[$criteria_data_key])) { - $value = $criteria_data[$criteria_data_key]; - switch ($criteria_data_key) { - case self::SELECT: - $criteria->select($value); - break; - case self::DISTINCT: - $criteria->distinct($value); - break; - case self::WHERE: - $criteria->where($value); - break; - case self::ORDER: - $criteria->order($value); - break; - case self::LIMIT: - $criteria->limit($value, ((isset($criteria_data[self::OFFSET])) ? $criteria_data[self::OFFSET] : null)); - break; - } + foreach ($where as $cond => &$term) { + if (is_array($term)) { + $term = new DbExpr('(' . implode(',', array_map(function($item){return intval($item);}, $term)) . ')'); } + $term = $this->db->quoteInto($cond, $term); } - $data = $this->criteria($criteria); - if (isset($criteria_data[self::ASSOC_BY_FIELD])) { - return self::fetchAllAssocByField($data, array(), $criteria_data[self::ASSOC_BY_FIELD], ((isset($criteria_data[self::ASSOC_AS_ARRAY])) ? $criteria_data[self::ASSOC_AS_ARRAY] : false), ((isset($criteria_data[self::ASSOC_BY_FIELD_IN_ARRAY])) ? $criteria_data[self::ASSOC_BY_FIELD_IN_ARRAY] : null)); - } else { - return self::fetchAll($data); + if ($distinct != '') { + $distinct = 'DISTINCT ' . $this->db->quoteIdentifier($distinct); } - } - - - /** - * @param $data string - * @param $params array - * @param null|string $field - * @param bool $assoc_as_array - * @param null|string $field_assoc_in_array - * @return array - * @throws ErrorException|GeneralException - */ - protected function fetchAllAssocByField($data, $params, $field = null, $assoc_as_array = false, $field_assoc_in_array = null) - { - $items = self::fetchAll($data, $params); - if (is_null($field)) { - $field = $this->key; + if ($limit != '') { + $limit = implode(',',array_map(function($item){return intval($item);},explode(',',$limit))); } - return self::assocByField($items, $field, $assoc_as_array, $field_assoc_in_array); + $result_items = parent::fetchAll('SELECT ' . (($distinct) ? $distinct : implode(',', $select)) + . ' FROM ' . $this->table() + . (($where) ? (' WHERE ' . implode(' AND ', $where)) : '') + . (($order) ? ($this->order($order, $order['sort'])) : '') + . (($limit) ? (' LIMIT ' . $limit) : '')); + return new SqlResultProvider($result_items); } /** - * @param $items - * @param $field - * @param bool $assoc_as_array - * @param $field_assoc_in_array null|string - * @param $disable_assoc_in_array bool - * @return array - * @throws ErrorException|GeneralException + * @return SqlCriteria */ - public function assocByField($items, $field, $assoc_as_array = false, $field_assoc_in_array = null, $disable_assoc_in_array = false) - { - $items_assoc_by_field = array(); - $primary_key_not_exists_in_items = false; - foreach ($items as $item) { - if (!isset($item->{$field})) { - throw new GeneralException('Undefined field. ' . $field); - } - if ($assoc_as_array) { - if (!isset($items_assoc_by_field[$item->{$field}])) { - $items_assoc_by_field[$item->{$field}] = array(); - } - $items_assoc_by_field[$item->{$field}][] = $item; - if (!$primary_key_not_exists_in_items && $this->key && !isset($item->{$this->key})) { - $primary_key_not_exists_in_items = true; - } - } else { - if (isset($items_assoc_by_field[$item->{$field}])) { - throw new ErrorException('Field not unique. May be use assoc_as_array. ' . $field); - } - $items_assoc_by_field[$item->{$field}] = $item; - } - } - // Ассоциирование внутри каждого элемента массива по первичному ключу - // Если первичного ключа нет (не указан в модели или нет поля с первичным ключом в результах выборки) - ассоциирование внутри не производится - // Если указан $field_assoc_in_array - ассоциирование произовдится по этому полю (вернет ошибку, если этого поля нет в результатх выборки) - // Параметр $disable_assoc_in_array отключает ассоциирование внутри результирующего массива - if ($assoc_as_array && !$disable_assoc_in_array && - (($this->key && !$primary_key_not_exists_in_items) || $field_assoc_in_array) - ) { - foreach ($items_assoc_by_field as $key => $value) { - $items_assoc_by_field[$key] = self::assocByField($items_assoc_by_field[$key], (($field_assoc_in_array) ? $field_assoc_in_array : $this->key)); - } - } - return $items_assoc_by_field; - } - - public function assocByFieldAndGetKeys($items, $field) + public function criteria() { - $items = self::assocByField($items, $field, true, null, true); - return array_keys($items); + return new SqlCriteria(); } } \ No newline at end of file diff --git a/model/SqlResultProvider.php b/model/SqlResultProvider.php new file mode 100644 index 0000000..fa7f2b8 --- /dev/null +++ b/model/SqlResultProvider.php @@ -0,0 +1,73 @@ +result_items = $result_items; + } + + public function assoc($field, $assoc_as_array = false, $field_assoc_in_array = null) + { + if (is_null($this->result_items_base)) { + $this->result_items_base = $this->result_items; + } + $result_items_assoc = array(); + foreach ($this->result_items_base as $item) { + if (!isset($item->{$field})) { + throw new ErrorException('Undefined field. ' . $field); + } + if ($assoc_as_array) { + if (!isset($result_items_assoc[$item->{$field}])) { + $result_items_assoc[$item->{$field}] = array(); + } + $result_items_assoc[$item->{$field}][] = $item; + } else { + if (isset($result_items_assoc[$item->{$field}])) { + throw new ErrorException('Field not unique. May be use assoc_as_array. ' . $field); + } + $result_items_assoc[$item->{$field}] = $item; + } + } + // Ассоциирование внутри каждого элемента массива + // $field_assoc_in_array - ассоциирование произовдится по этому полю (вернет ошибку, если этого поля нет в результатх выборки) + if ($assoc_as_array && $field_assoc_in_array) { + foreach ($result_items_assoc as &$value) { + $sql_result_provider = new SqlResultProvider($value); + $value = $sql_result_provider->assoc($field_assoc_in_array)->fetchAll(); + } + } + $this->result_items = $result_items_assoc; + return $this; + } + + public function getKeys() + { + return array_keys($this->result_items); + } + + public function fetchAll() + { + return $this->result_items; + } + + public function fetchKey($key) + { + return $this->result_items[$key]; + } + + public function fetch() + { + return current($this->result_items); + } +} \ No newline at end of file