Skip to content

Commit

Permalink
Split Mapper into two, more specialized classes
Browse files Browse the repository at this point in the history
  • Loading branch information
mrow4a committed Oct 5, 2017
1 parent e4b5127 commit 240150d
Show file tree
Hide file tree
Showing 2 changed files with 162 additions and 119 deletions.
156 changes: 156 additions & 0 deletions lib/public/AppFramework/Db/Access.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
<?php
/**
* @author Piotr Mrowczynski <piotr@owncloud.com>
*
* @copyright Copyright (c) 2017, ownCloud GmbH
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/


namespace OCP\AppFramework\Db;

use OCP\IDBConnection;
use OCP\IDb;


/**
* Simple parent class for inheriting your data access layer from. This class
* may be subject to change in the future
* @since 10.0.0
*/
abstract class Access {

protected $tableName;
protected $db;

/**
* @param IDBConnection $db Instance of the Db abstraction layer
* @param string $tableName the name of the table. set this to allow entity
* mapped to queries without using sql
* @since 10.0.0
*/
public function __construct(IDBConnection $db, $tableName){
$this->db = $db;
$this->tableName = '*PREFIX*' . $tableName;
}

/**
* @return string the table name
* @since 10.0.0
*/
public function getTableName() {
return $this->tableName;
}

/**
* @return \OCP\IDBConnection
* @since 10.0.0
*/
public function getDbConnection() {
return $this->db;
}

/**
* Checks if an array is associative
* @param array $array
* @return bool true if associative
* @since 10.0.0
*/
private function isAssocArray(array $array) {
return array_values($array) !== $array;
}

/**
* Returns the correct PDO constant based on the value type
* @param $value
* @return int PDO constant
* @since 10.0.0
*/
private function getPDOType($value) {
switch (gettype($value)) {
case 'integer':
return \PDO::PARAM_INT;
case 'boolean':
return \PDO::PARAM_BOOL;
default:
return \PDO::PARAM_STR;
}
}

/**
* Runs an sql query
* @param string $sql the prepare string
* @param array $params the params which should replace the ? in the sql query
* @param int $limit the maximum number of rows
* @param int $offset from which row we want to start
* @return \PDOStatement the database query result
* @since 10.0.0
*/
protected function execute($sql, array $params=[], $limit=null, $offset=null) {
if ($this->db instanceof IDb) {
$query = $this->db->prepareQuery($sql, $limit, $offset);
} else {
$query = $this->db->prepare($sql, $limit, $offset);
}

if ($this->isAssocArray($params)) {
foreach ($params as $key => $param) {
$pdoConstant = $this->getPDOType($param);
$query->bindValue($key, $param, $pdoConstant);
}
} else {
$index = 1; // bindParam is 1 indexed
foreach ($params as $param) {
$pdoConstant = $this->getPDOType($param);
$query->bindValue($index, $param, $pdoConstant);
$index++;
}
}

$result = $query->execute();

// this is only for backwards compatibility reasons and can be removed
// in owncloud 10. IDb returns a StatementWrapper from execute, PDO,
// Doctrine and IDbConnection don't so this needs to be done in order
// to stay backwards compatible for the things that rely on the
// StatementWrapper being returned
if ($result instanceof \OC_DB_StatementWrapper) {
return $result;
}

return $query;
}

/**
* Builds an error message by prepending the $msg to an error message which
* has the parameters
* @see findEntity
* @param string $sql the sql query
* @param array $params the parameters of the sql query
* @param int $limit the maximum number of rows
* @param int $offset from which row we want to start
* @return string formatted error message string
* @since 10.0.0
*/
protected function buildDebugMessage($msg, $sql, array $params=[], $limit=null, $offset=null) {
return $msg .
': query "' . $sql . '"; ' .
'parameters ' . print_r($params, true) . '; ' .
'limit "' . $limit . '"; '.
'offset "' . $offset . '"';
}

}
125 changes: 6 additions & 119 deletions lib/public/AppFramework/Db/Mapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,9 @@
* may be subject to change in the future
* @since 7.0.0
*/
abstract class Mapper {
abstract class Mapper extends Access {

protected $tableName;
protected $entityClass;
protected $db;

/**
* @param IDBConnection $db Instance of the Db abstraction layer
Expand All @@ -50,8 +48,7 @@ abstract class Mapper {
* @since 7.0.0
*/
public function __construct(IDBConnection $db, $tableName, $entityClass=null){
$this->db = $db;
$this->tableName = '*PREFIX*' . $tableName;
parent::__construct($db, $tableName);

// if not given set the entity name to the class without the mapper part
// cache it here for later use since reflection is slow
Expand All @@ -62,30 +59,19 @@ public function __construct(IDBConnection $db, $tableName, $entityClass=null){
}
}


/**
* @return string the table name
* @since 7.0.0
*/
public function getTableName(){
return $this->tableName;
}


/**
* Deletes an entity from the table
* @param Entity $entity the entity that should be deleted
* @return Entity the deleted entity
* @since 7.0.0 - return value added in 8.1.0
*/
public function delete(Entity $entity){
$sql = 'DELETE FROM `' . $this->tableName . '` WHERE `id` = ?';
$sql = 'DELETE FROM `' . $this->getTableName() . '` WHERE `id` = ?';
$stmt = $this->execute($sql, [$entity->getId()]);
$stmt->closeCursor();
return $entity;
}


/**
* Creates a new entry in the db from an entity
* @param Entity $entity the entity that should be created
Expand Down Expand Up @@ -120,20 +106,18 @@ public function insert(Entity $entity){

}

$sql = 'INSERT INTO `' . $this->tableName . '`(' .
$sql = 'INSERT INTO `' . $this->getTableName() . '`(' .
$columns . ') VALUES(' . $values . ')';

$stmt = $this->execute($sql, $params);

$entity->setId((int) $this->db->lastInsertId($this->tableName));
$entity->setId((int) $this->getDbConnection()->lastInsertId($this->getTableName()));

$stmt->closeCursor();

return $entity;
}



/**
* Updates an entry in the db from an entity
* @throws \InvalidArgumentException if entity has no id
Expand Down Expand Up @@ -181,7 +165,7 @@ public function update(Entity $entity){
$i++;
}

$sql = 'UPDATE `' . $this->tableName . '` SET ' .
$sql = 'UPDATE `' . $this->getTableName() . '` SET ' .
$columns . ' WHERE `id` = ?';
$params[] = $id;

Expand All @@ -191,79 +175,6 @@ public function update(Entity $entity){
return $entity;
}

/**
* Checks if an array is associative
* @param array $array
* @return bool true if associative
* @since 8.1.0
*/
private function isAssocArray(array $array) {
return array_values($array) !== $array;
}

/**
* Returns the correct PDO constant based on the value type
* @param $value
* @return int PDO constant
* @since 8.1.0
*/
private function getPDOType($value) {
switch (gettype($value)) {
case 'integer':
return \PDO::PARAM_INT;
case 'boolean':
return \PDO::PARAM_BOOL;
default:
return \PDO::PARAM_STR;
}
}


/**
* Runs an sql query
* @param string $sql the prepare string
* @param array $params the params which should replace the ? in the sql query
* @param int $limit the maximum number of rows
* @param int $offset from which row we want to start
* @return \PDOStatement the database query result
* @since 7.0.0
*/
protected function execute($sql, array $params=[], $limit=null, $offset=null) {
if ($this->db instanceof IDb) {
$query = $this->db->prepareQuery($sql, $limit, $offset);
} else {
$query = $this->db->prepare($sql, $limit, $offset);
}

if ($this->isAssocArray($params)) {
foreach ($params as $key => $param) {
$pdoConstant = $this->getPDOType($param);
$query->bindValue($key, $param, $pdoConstant);
}
} else {
$index = 1; // bindParam is 1 indexed
foreach ($params as $param) {
$pdoConstant = $this->getPDOType($param);
$query->bindValue($index, $param, $pdoConstant);
$index++;
}
}

$result = $query->execute();

// this is only for backwards compatibility reasons and can be removed
// in owncloud 10. IDb returns a StatementWrapper from execute, PDO,
// Doctrine and IDbConnection don't so this needs to be done in order
// to stay backwards compatible for the things that rely on the
// StatementWrapper being returned
if ($result instanceof \OC_DB_StatementWrapper) {
return $result;
}

return $query;
}


/**
* Returns an db result and throws exceptions when there are more or less
* results
Expand Down Expand Up @@ -306,26 +217,6 @@ protected function findOneQuery($sql, array $params=[], $limit=null, $offset=nul
}
}

/**
* Builds an error message by prepending the $msg to an error message which
* has the parameters
* @see findEntity
* @param string $sql the sql query
* @param array $params the parameters of the sql query
* @param int $limit the maximum number of rows
* @param int $offset from which row we want to start
* @return string formatted error message string
* @since 9.1.0
*/
private function buildDebugMessage($msg, $sql, array $params=[], $limit=null, $offset=null) {
return $msg .
': query "' . $sql . '"; ' .
'parameters ' . print_r($params, true) . '; ' .
'limit "' . $limit . '"; '.
'offset "' . $offset . '"';
}


/**
* Creates an entity from a row. Automatically determines the entity class
* from the current mapper name (MyEntityMapper -> MyEntity)
Expand All @@ -338,7 +229,6 @@ protected function mapRowToEntity($row) {
return call_user_func($this->entityClass .'::fromRow', $row);
}


/**
* Runs a sql query and returns an array of entities
* @param string $sql the prepare string
Expand All @@ -362,7 +252,6 @@ protected function findEntities($sql, array $params=[], $limit=null, $offset=nul
return $entities;
}


/**
* Returns an db result and throws exceptions when there are more or less
* results
Expand All @@ -378,6 +267,4 @@ protected function findEntities($sql, array $params=[], $limit=null, $offset=nul
protected function findEntity($sql, array $params=[], $limit=null, $offset=null){
return $this->mapRowToEntity($this->findOneQuery($sql, $params, $limit, $offset));
}


}

0 comments on commit 240150d

Please sign in to comment.