Skip to content

Commit

Permalink
refs #1753 : added - extend method.
Browse files Browse the repository at this point in the history 
 - Extend method adds functionality for JOIN queries.
 - One example is added on blog.entry.
  • Loading branch information
@inureyes
inureyes committed Jan 20, 2015
1 parent 74e6ee3 commit cbb7c2b
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 26 deletions.
92 changes: 75 additions & 17 deletions framework/data/DBModel.php
View file
Expand Up @@ -31,11 +31,12 @@ function doesExistTable($tablename) {
}

/* DBModel */
/* 1.8.0.20150120 */
/* 2.0.0.20150121 */
class DBModel extends Singleton implements IModel {
protected $_attributes, $_qualifiers, $_projections, $_query;
protected $_relations, $_glues, $_filters, $_order, $_limit, $table, $id, $_querysetCount;
protected $_reservedFields, $_isReserved, $param;
protected $_extended_objects, $_object_aliases;

function __construct($table = null) {
$this->context = Model_Context::getInstance();
Expand All @@ -47,7 +48,7 @@ public static function getInstance() {
}

public function reset($table = null, $param = null) {
if(!is_null($table)) $this->table = $this->context->getProperty('database.prefix').$table;
if(!is_null($table)) $this->table = $table;
else $this->table = null;
$this->id = null;
$this->_attributes = array();
Expand All @@ -59,6 +60,8 @@ public function reset($table = null, $param = null) {
$this->_order = array();
$this->_limit = array();
$this->_isReserved = array();
$this->_extended_objects = array();
$this->_object_aliases = array();
$this->param = array();
$this->_querysetCount = 0;
$this->_reservedFields = POD::reservedFieldNames();
Expand Down Expand Up @@ -194,6 +197,10 @@ public function setQualifierSet() {
return $this;
}

public function getOrder() {
return $this->_order;
}

public function setOrder($standard, $order = 'ASC') {
$this->_order['attribute'] = $standard;
if(!in_array(strtoupper($order), array('ASC','DESC'))) $order = 'ASC';
Expand All @@ -217,40 +224,68 @@ public function unsetLimit() {
return $this;
}

public function setAlias($table, $alias) {
$this->_object_aliases[$table] = $alias;
return $this;
}

public function getAlias($table) {
if (array_key_exists($table,$this->_object_aliases)) {
return $this->_object_aliases[$table];
}
return null;
}

public function extend($table, $type, $relations) {
$this->_extended_objects[$table] = array();
$this->_extended_objects[$table]['type'] = $type;
$args = $relations;
$glues = array();
foreach($relations as $rel) {
$attribute1 = $rel[0];
$condition = $rel[1];
$attribute2 = $rel[2];
list($dummy, $condition) = $this->getQualifierModel($attribute1, $condition, $attribute2, false, false);
array_push($glues, $attribute1.' '.$condition.' '.$attribute2);
}
$this->_extended_objects[$table]['relations'] = implode(' AND ',$glues);
return $this;
}

/* CRUDs */
public function doesExist($field = '*') {
$field = $this->_treatReservedFields($field);
return POD::queryExistence('SELECT '. $field . ' FROM ' . $this->table . $this->_makeWhereClause() . ' LIMIT 1');
return POD::queryExistence('SELECT '. $field . ' FROM ' . $this->_getTableName() . $this->_extendClause() . $this->_makeWhereClause() . ' LIMIT 1');
}

public function getCell($field = '*') {
$field = $this->_treatReservedFields($field);
return POD::queryCell('SELECT ' . $field . ' FROM ' . $this->table . $this->_makeWhereClause() . ' LIMIT 1');
return POD::queryCell('SELECT ' . $field . ' FROM ' . $this->_getTableName() . $this->_extendClause() . $this->_makeWhereClause() . ' LIMIT 1');
}

public function getRow($field = '*') {
$field = $this->_treatReservedFields($field);
return POD::queryRow('SELECT ' . $field . ' FROM ' . $this->table . $this->_makeWhereClause());
return POD::queryRow('SELECT ' . $field . ' FROM ' . $this->_getTableName() . $this->_extendClause() . $this->_makeWhereClause());
}

public function getColumn($field = '*') {
$field = $this->_treatReservedFields($field);
return POD::queryColumn('SELECT ' . $field . ' FROM ' . $this->table . $this->_makeWhereClause());
return POD::queryColumn('SELECT ' . $field . ' FROM ' . $this->_getTableName() . $this->_extendClause() . $this->_makeWhereClause());
}

public function getAll($field = '*') {
$field = $this->_treatReservedFields($field);
return POD::queryAll('SELECT ' . $field . ' FROM ' . $this->table . $this->_makeWhereClause());
return POD::queryAll('SELECT ' . $field . ' FROM ' . $this->_getTableName() . $this->_extendClause() . $this->_makeWhereClause());
}

public function getCount($field = '*') { /// Returns the 'selection count'
$field = $this->_treatReservedFields($field);
return POD::queryCell('SELECT COUNT(' . $field . ') FROM ' . $this->table . $this->_makeWhereClause());
// return POD::queryCount('SELECT ' . $field . ' FROM ' . $this->table . $this->_makeWhereClause() . ' LIMIT 1');
return POD::queryCell('SELECT COUNT(' . $field . ') FROM ' . $this->_getTableName() . $this->_extendClause() . $this->_makeWhereClause());
}

public function getSize($field = '*') { /// Returns the table size
$field = $this->_treatReservedFields($field);
return POD::queryCell('SELECT COUNT(' . $field . ') FROM ' . $this->table . ' WHERE 1');
return POD::queryCell('SELECT COUNT(*) FROM ' . $this->_getTableName() . $this->_extendClause() . $this->_makeWhereClause());
}

public function insert($option = null) {
Expand All @@ -270,7 +305,7 @@ public function insert($option = null) {
$pairs = $attributes;
foreach($pairs as $key => $value) if (is_null($value)) $pairs[$key] = 'NULL';

$this->_query = 'INSERT INTO ' . $this->table . ' (' . implode(',', $this->_capsulateFields(array_keys($attributes))) . ') VALUES (' . implode(',', $pairs) . ')';
$this->_query = 'INSERT INTO ' . $this->_getTableName() . ' (' . implode(',', $this->_capsulateFields(array_keys($attributes))) . ') VALUES (' . implode(',', $pairs) . ')';
if($option == 'count') return POD::queryCount($this->_query);
if (POD::query($this->_query)) {
// $this->id = POD::insertId();
Expand All @@ -289,7 +324,7 @@ public function update($option = null) {
(array_key_exists($name, $this->_isReserved) ? '"'.$name.'"' : $name) . '=' .
(is_null($value) ? ' NULL' : $value ));

$this->_query = 'UPDATE ' . $this->table . ' SET ' . implode(',', $attributes) . $this->_makeWhereClause();
$this->_query = 'UPDATE ' . $this->_getTableName() . ' SET ' . implode(',', $attributes) . $this->_makeWhereClause();
if($option == 'count') return POD::queryCount($this->_query);
if (POD::query($this->_query))
return true;
Expand All @@ -314,15 +349,15 @@ public function replace($option = null) {
foreach($pairs as $key => $value) if (is_null($value)) $pairs[$key] = 'NULL';
$attributeFields = $this->_capsulateFields(array_keys($attributes));
if (in_array(POD::dbms(), array('MySQL','MySQLi','SQLite3'))) { // Those supports 'REPLACE'
$this->_query = 'REPLACE INTO ' . $this->table . ' (' . implode(',', $attributeFields) . ') VALUES(' . implode(',', $pairs) . ')';
$this->_query = 'REPLACE INTO ' . $this->_getTableName() . ' (' . implode(',', $attributeFields) . ') VALUES(' . implode(',', $pairs) . ')';
if($option == 'count') return POD::queryCount($this->_query);
if (POD::query($this->_query)) {
$this->id = POD::insertId();
return true;
}
return false;
} else {
$this->_query = 'SELECT * FROM ' . $this->table . $this->_makeWhereClause() . ' LIMIT 1';
$this->_query = 'SELECT * FROM ' . $this->_getTableName() . $this->_makeWhereClause() . ' LIMIT 1';
if(POD::queryExistence($this->_query)) {
return $this->update($option);
} else {
Expand All @@ -335,7 +370,7 @@ public function delete($count = null, $option = null) {
if (empty($this->table))
return false;
if(!is_null($count)) $this->setLimit($count);
$this->_query = 'DELETE FROM ' . $this->table . $this->_makeWhereClause();
$this->_query = 'DELETE FROM ' . $this->_getTableName() . $this->_makeWhereClause();
if($option == 'count') return POD::queryCount($this->_query);
if (POD::query($this->_query))
return true;
Expand All @@ -346,7 +381,7 @@ public function delete($count = null, $option = null) {
public function create() {
if(!isset($this->structure) || empty($this->structure) || !is_array($this->structure)) return false;
/// TO DO : implementing create method by structure
$sql = "CREATE ".$this->table." (".CRLF;
$sql = "CREATE ".$this->_getTableName()." (".CRLF;

foreach($this->structure as $field => $attributes) {
$sql .= $field;
Expand All @@ -372,12 +407,21 @@ public function create() {
}

public function discard() {
$this->_query = 'DROP '. $this->table;
$this->_query = 'DROP '. $this->_getTableName();
if(POD::query($this->_query))
return true;
return false;
}

protected function _getTableName($table = null) {
if (is_null($table)) $table = $this->table;
if (array_key_exists($table, $this->_object_aliases)) {
return $this->context->getProperty('database.prefix').$table.' '.$this->_object_aliases[$table];
} else {
return $this->context->getProperty('database.prefix').$table;
}
}

protected function _makeWhereClause() {
$clause = '';
if (count($this->_qualifiers) == 0) {
Expand Down Expand Up @@ -429,6 +473,20 @@ protected function _canonicalWhereClause($relations, $value) {
return array($relations, $value);
}

protected function _extendClause() {
$clause = '';
if (!empty($this->_extended_objects)) {
foreach ($this->_extended_objects as $table => $property) {
$clause .= strtoupper($property['type']).' JOIN '.$this->context->getProperty('database.prefix').$table.' ';
if (array_key_exists($table, $this->_object_aliases)) {
$clause .= $this->_object_aliases[$table].' ';
}
$clause .= 'ON '.$property['relations'].' ';
}
}
return (strlen($clause) ? ' ' . $clause : '');
}

protected function _treatReservedFields($fields) {
if (!empty($this->_projections) && $fields == '*') $fields = implode(',',$this->_projections);
if(empty($this->_reservedFields)) return $fields;
Expand Down
5 changes: 4 additions & 1 deletion framework/legacy/Textcube.Model.Paging.php
View file
Expand Up @@ -112,14 +112,17 @@ function fetch($sqlmodel, $page, $count, $url = null, $prefix = '?page=', $count
if (empty($sqlmodel))
return array(array(), $paging);

if (get_class($sqlmodel) == "DBModel") { // It's DBModel.
if (gettype($sqlmodel) == "object" && get_class($sqlmodel) == "DBModel") { // It's DBModel.
$isDBModel = true;
} else { // It's SQL
$isDBModel = false;
}

if ($isDBModel) {
$order = $sqlmodel->getOrder();
$sqlmodel->unsetOrder();
$paging['total'] = $sqlmodel->getSize(); // get record size
$sqlmodel->setOrder($order['attribute'],$order['order']);
} else { // It's SQL
if (preg_match('/\s(FROM.*)(ORDER BY.*)$/si', $sqlmodel, $matches)) {
$from = $matches[1];
Expand Down
27 changes: 19 additions & 8 deletions library/model/blog.entry.php
View file
Expand Up @@ -232,14 +232,25 @@ function getEntryListWithPagingBySearch($blogid, $search, $page, $count) {

function getEntriesWithPaging($blogid, $page, $count) {
$ctx = Model_Context::getInstance();
$visibility = doesHaveOwnership() ? '' : 'AND e.visibility > 0 AND (c.visibility > 1 OR e.category = 0)';
$visibility .= (doesHaveOwnership() && !Acl::check('group.editors')) ? ' AND (e.userid = '.getUserId().' OR e.visibility > 0)' : '';
$sql = "SELECT e.*, c.label AS categoryLabel
FROM ".$ctx->getProperty('database.prefix')."Entries e
LEFT JOIN ".$ctx->getProperty('database.prefix')."Categories c ON e.blogid = c.blogid AND e.category = c.id
WHERE e.blogid = $blogid AND e.draft = 0 $visibility AND e.category >= 0
ORDER BY e.published DESC";
return Paging::fetch($sql, $page, $count);
$pool = DBModel::getInstance();
$pool->reset("Entries");
$pool->setAlias("Entries","e");
$pool->extend("Categories","LEFT", array(array('e.blogid','eq','c.blogid'),array('e.category','eq','c.id')));
$pool->setAlias("Categories","c");

if (!doesHaveOwnership()) {
$pool->setQualifier("e.visibility",">",0);
$pool->setQualifierSet(array('c.visibility','>',1),'OR',array('e.category','eq',0));
}
if (doesHaveOwnership() && !Acl::check('group.editors')) {
$pool->setQualifierSet(array('e.userid','eq',getUserId()),'OR',array('e.visibility','eq',0));
}
$pool->setQualifier("e.blogid","eq",$blogid);
$pool->setQualifier("e.draft","eq",0);
$pool->setQualifier("e.category",">=",0);
$pool->setOrder("e.published","DESC");
$pool->setProjection("e.*","c.label AS categoryLabel");
return Paging::fetch($pool, $page, $count);
}

function getEntriesWithPagingByCategory($blogid, $category, $page, $count, $countItem) {
Expand Down

0 comments on commit cbb7c2b

Please sign in to comment.