Level-2 / Maphper

Maphper/MultiPk.php

Indentation +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 	private $parent;
 	private $primaryKey;
 	private $lookup;
-    private $mapper;
+	private $mapper;
 
 	public function __construct(Maphper $mapper, $lookup, array $primaryKey, MultiPk $parent = null) {
 		$this->parent = $parent;

Maphper/DataSource/DatabaseCrud.php

Indentation +50 added lines, -50 removed lines

@@ -2,30 +2,30 @@ 
 namespace Maphper\DataSource;
 
 class DatabaseCrud {
-    private $crudBuilder;
-    private $whereBuilder;
-    private $adapter;
-    private $databaseModify;
-    private $databaseSelect;
-    private $table;
-    private $primaryKey;
-
-    public function __construct(DatabaseAdapter $adapter, DatabaseModify $databaseModify, DatabaseSelect $databaseSelect, $table, $primaryKey) {
-        $this->adapter = $adapter;
-        $this->databaseModify = $databaseModify;
-        $this->databaseSelect = $databaseSelect;
-        $this->crudBuilder = new \Maphper\Lib\CrudBuilder();
-        $this->whereBuilder = new \Maphper\Lib\Sql\WhereBuilder();
-        $this->table = $table;
-        $this->primaryKey = $primaryKey;
-    }
-
-    public function deleteById($id) {
-        $this->adapter->query($this->crudBuilder->delete($this->table, $this->primaryKey[0] . ' = :id', [':id' => $id]));
-        $this->databaseSelect->deleteIDFromCache($id);
+	private $crudBuilder;
+	private $whereBuilder;
+	private $adapter;
+	private $databaseModify;
+	private $databaseSelect;
+	private $table;
+	private $primaryKey;
+
+	public function __construct(DatabaseAdapter $adapter, DatabaseModify $databaseModify, DatabaseSelect $databaseSelect, $table, $primaryKey) {
+		$this->adapter = $adapter;
+		$this->databaseModify = $databaseModify;
+		$this->databaseSelect = $databaseSelect;
+		$this->crudBuilder = new \Maphper\Lib\CrudBuilder();
+		$this->whereBuilder = new \Maphper\Lib\Sql\WhereBuilder();
+		$this->table = $table;
+		$this->primaryKey = $primaryKey;
 	}
 
-    public function deleteByField(array $fields, array $options = []) {
+	public function deleteById($id) {
+		$this->adapter->query($this->crudBuilder->delete($this->table, $this->primaryKey[0] . ' = :id', [':id' => $id]));
+		$this->databaseSelect->deleteIDFromCache($id);
+	}
+
+	public function deleteByField(array $fields, array $options = []) {
 		$query = $this->whereBuilder->createSql($fields);
 		$this->adapter->query($this->crudBuilder->delete($this->table, $query['sql'], $query['args'], $options['limit'], null, $options['order']));
 		$this->databaseModify->addIndex(array_keys($query['args']));
@@ -35,22 +35,22 @@ 
 		$this->databaseSelect->clearResultCache();
 	}
 
-    private function getIfNew($data) {
-        $new = false;
-        foreach ($this->primaryKey as $k) {
-            if (empty($data->$k)) {
-                $data->$k = null;
-                $new = true;
-            }
-        }
-        return $new;
-    }
+	private function getIfNew($data) {
+		$new = false;
+		foreach ($this->primaryKey as $k) {
+			if (empty($data->$k)) {
+				$data->$k = null;
+				$new = true;
+			}
+		}
+		return $new;
+	}
 
-    public function save($data, $tryagain = true) {
-        $new = $this->getIfNew($data);
+	public function save($data, $tryagain = true) {
+		$new = $this->getIfNew($data);
 
 		try {
-            $result = $this->insert($this->table, $this->primaryKey, $data);
+			$result = $this->insert($this->table, $this->primaryKey, $data);
 
 			//If there was an error but PDO is silent, trigger the catch block anyway
 			if ($result->errorCode() !== '00000') throw new \Exception('Could not insert into ' . $this->table);
@@ -68,15 +68,15 @@ 
 		$this->databaseSelect->updateCache($data, $data->{$this->primaryKey[0]});
 	}
 
-    private function updatePK($data, $new) {
-        if ($new && count($this->primaryKey) == 1) $data->{$this->primaryKey[0]} = $this->adapter->lastInsertId();
-    }
+	private function updatePK($data, $new) {
+		if ($new && count($this->primaryKey) == 1) $data->{$this->primaryKey[0]} = $this->adapter->lastInsertId();
+	}
 
-    private function checkIfUpdateWorked($data) {
-        $updateWhere = $this->whereBuilder->createSql($data);
-        $matched = $this->databaseSelect->findByField($updateWhere['args']);
-        if (count($matched) == 0) throw new \InvalidArgumentException('Record inserted into table ' . $this->table . ' fails table constraints');
-    }
+	private function checkIfUpdateWorked($data) {
+		$updateWhere = $this->whereBuilder->createSql($data);
+		$matched = $this->databaseSelect->findByField($updateWhere['args']);
+		if (count($matched) == 0) throw new \InvalidArgumentException('Record inserted into table ' . $this->table . ' fails table constraints');
+	}
 
 	private function insert($table, array $primaryKey, $data) {
 		$error = 0;
@@ -88,16 +88,16 @@ 
 		}
 
  		if ($error || $result->errorCode() !== '00000') {
-            $result = $this->tryUpdate($table, $primaryKey, $data);
-        }
+			$result = $this->tryUpdate($table, $primaryKey, $data);
+		}
 
 		return $result;
 	}
 
-    private function tryUpdate($table, array $primaryKey, $data) {
-        $result = $this->adapter->query($this->crudBuilder->update($table, $primaryKey, $data));
-        if ($result->rowCount() === 0) $this->checkIfUpdateWorked($data);
+	private function tryUpdate($table, array $primaryKey, $data) {
+		$result = $this->adapter->query($this->crudBuilder->update($table, $primaryKey, $data));
+		if ($result->rowCount() === 0) $this->checkIfUpdateWorked($data);
 
-        return $result;
-    }
+		return $result;
+	}
 }

Maphper/DataSource/GeneralEditDatabase.php

Indentation +32 added lines, -32 removed lines

@@ -2,55 +2,55 @@
 namespace Maphper\DataSource;
 
 class GeneralEditDatabase {
-    private $pdo;
-    private $dataTypes = [
-        'datetime' => 'DATETIME',
-        'int' => 'INT(11)',
-        'decimal' => 'DECIMAL',
-        'short_string' => 'VARCHAR',
-        'long_string' => 'LONGBLOG',
-        'short_string_max_len' => 255,
-        'other' => 'VARCHAR(255)',
+	private $pdo;
+	private $dataTypes = [
+		'datetime' => 'DATETIME',
+		'int' => 'INT(11)',
+		'decimal' => 'DECIMAL',
+		'short_string' => 'VARCHAR',
+		'long_string' => 'LONGBLOG',
+		'short_string_max_len' => 255,
+		'other' => 'VARCHAR(255)',
 
-        'pk_default' => 'INT(11) NOT NULL AUTO_INCREMENT'
-    ];
+		'pk_default' => 'INT(11) NOT NULL AUTO_INCREMENT'
+	];
 
-    public function __construct(\PDO $pdo, array $dataTypes) {
-        $this->pdo = $pdo;
-        $this->dataTypes = array_merge($this->dataTypes, $dataTypes);
-    }
+	public function __construct(\PDO $pdo, array $dataTypes) {
+		$this->pdo = $pdo;
+		$this->dataTypes = array_merge($this->dataTypes, $dataTypes);
+	}
 
-    public function quote($str) {
+	public function quote($str) {
 		return '`' . str_replace('.', '`.`', trim($str, '`')) . '`';
 	}
 
-    public function getType($val) {
+	public function getType($val) {
 		if ($val instanceof \DateTime) return $this->dataTypes['datetime'];
 		else if ($result = $this->doNumberTypes($val)) return $result;
 		else if ($result = $this->doStringTypes($val)) return $result;
 		else return $this->dataTypes['other'];
 	}
 
-    private function doNumberTypes($val) {
-        if (is_int($val)) return $this->dataTypes['int'];
+	private function doNumberTypes($val) {
+		if (is_int($val)) return $this->dataTypes['int'];
 		else if (is_double($val)) return $this->dataTypes['decimal'] . '(9,' . strlen($val) - strrpos($val, '.') - 1 . ')';
-        else return false;
-    }
+		else return false;
+	}
 
-    private function doStringTypes($val) {
-        if (!is_string($val)) return false;
-        if (strlen($val) <= $this->dataTypes['short_string_max_len'])
-            return $this->dataTypes['short_string'] . '(' . $this->dataTypes['short_string_max_len'] . ')';
+	private function doStringTypes($val) {
+		if (!is_string($val)) return false;
+		if (strlen($val) <= $this->dataTypes['short_string_max_len'])
+			return $this->dataTypes['short_string'] . '(' . $this->dataTypes['short_string_max_len'] . ')';
 		else return $this->dataTypes['long_string'];
-    }
+	}
 
-    public function isNotSavableType($value, $key, $primaryKey) {
-        return is_array($value) || (is_object($value) && !($value instanceof \DateTime)) ||
-                in_array($key, $primaryKey);
-    }
+	public function isNotSavableType($value, $key, $primaryKey) {
+		return is_array($value) || (is_object($value) && !($value instanceof \DateTime)) ||
+				in_array($key, $primaryKey);
+	}
 
-    //Alter the database so that it can store $data
-    public function createTable($table, array $primaryKey, $data) {
+	//Alter the database so that it can store $data
+	public function createTable($table, array $primaryKey, $data) {
 		$parts = [];
 		foreach ($primaryKey as $key) {
 			$pk = $data->$key;

Maphper/DataSource/StmtCache.php

Indentation +15 added lines, -15 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 namespace Maphper\DataSource;
 class StmtCache {
-    private $pdo;
-    private $queryCache = [];
+	private $pdo;
+	private $queryCache = [];
 
-    public function __construct(\PDO $pdo) {
-        $this->pdo = $pdo;
-    }
+	public function __construct(\PDO $pdo) {
+		$this->pdo = $pdo;
+	}
 
-    public function getCachedStmt($sql) {
+	public function getCachedStmt($sql) {
 		$queryId = $this->getQueryId($sql);
 		if (isset($this->queryCache[$queryId])) $stmt = $this->queryCache[$queryId];
 		else {
@@ -18,15 +18,15 @@ 
 		return $stmt;
 	}
 
-    private function getQueryId($sql) {
-        return md5($sql);
-    }
+	private function getQueryId($sql) {
+		return md5($sql);
+	}
 
-    public function deleteQueryFromCache($sql) {
-        unset($this->queryCache[$this->getQueryId($sql)]);
-    }
+	public function deleteQueryFromCache($sql) {
+		unset($this->queryCache[$this->getQueryId($sql)]);
+	}
 
-    public function clearCache() {
-        $this->queryCache = [];
-    }
+	public function clearCache() {
+		$this->queryCache = [];
+	}
 }

Maphper/DataSource/Database.php

Indentation +7 added lines, -7 removed lines

@@ -7,8 +7,8 @@ 
 
 	private $primaryKey;
 	private $fields = '*';
-    private $databaseSelect;
-    private $databaseCrud;
+	private $databaseSelect;
+	private $databaseCrud;
 
 	public function __construct($db, $table, $primaryKey = 'id', array $options = []) {
 		$options = new DatabaseOptions($db, $options);
@@ -20,10 +20,10 @@ 
 
 		$defaultSort = $options->read('defaultSort') !== false ? $options->read('defaultSort')  : implode(', ', $this->primaryKey);
 
-        $databaseModify = new DatabaseModify($adapter, $options->getEditMode(), $table);
+		$databaseModify = new DatabaseModify($adapter, $options->getEditMode(), $table);
 
-        $this->databaseSelect = new DatabaseSelect($adapter, $databaseModify, $table, $defaultSort);
-        $this->databaseCrud = new DatabaseCrud($adapter, $databaseModify, $this->databaseSelect, $table, $this->primaryKey);
+		$this->databaseSelect = new DatabaseSelect($adapter, $databaseModify, $table, $defaultSort);
+		$this->databaseCrud = new DatabaseCrud($adapter, $databaseModify, $this->databaseSelect, $table, $this->primaryKey);
 
 		$databaseModify->optimizeColumns();
 	}
@@ -45,7 +45,7 @@ 
 	}
 
 	public function findByField(array $fields, $options = []) {
-        return $this->databaseSelect->findByField($fields, $options);
+		return $this->databaseSelect->findByField($fields, $options);
 	}
 
 	public function deleteByField(array $fields, array $options = []) {
@@ -53,6 +53,6 @@ 
 	}
 
 	public function save($data) {
-        $this->databaseCrud->save($data, true);
+		$this->databaseCrud->save($data, true);
 	}
 }

Maphper/DataSource/DatabaseModify.php

Indentation +15 added lines, -15 removed lines

@@ -2,25 +2,25 @@
 namespace Maphper\DataSource;
 
 class DatabaseModify {
-    private $adapter;
-    private $alterDb;
-    private $table;
+	private $adapter;
+	private $alterDb;
+	private $table;
 
-    public function __construct(DatabaseAdapter $adapter, $alterDb, $table) {
-        $this->adapter = $adapter;
-        $this->alterDb = $alterDb;
-        $this->table = $table;
-    }
+	public function __construct(DatabaseAdapter $adapter, $alterDb, $table) {
+		$this->adapter = $adapter;
+		$this->alterDb = $alterDb;
+		$this->table = $table;
+	}
 
-    public function addIndex($args) {
+	public function addIndex($args) {
 		if (Database::EDIT_INDEX & $this->alterDb) $this->adapter->addIndex($this->table, $args);
 	}
 
-    public function optimizeColumns() {
-        if (Database::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) $this->adapter->optimiseColumns($this->table);
-    }
+	public function optimizeColumns() {
+		if (Database::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) $this->adapter->optimiseColumns($this->table);
+	}
 
-    public function getTryInsertAgain($tryagain) {
-        return $tryagain && Database::EDIT_STRUCTURE & $this->alterDb;
-    }
+	public function getTryInsertAgain($tryagain) {
+		return $tryagain && Database::EDIT_STRUCTURE & $this->alterDb;
+	}
 }

Maphper/DataSource/SqliteAdapter.php

Indentation +23 added lines, -23 removed lines

@@ -4,15 +4,15 @@ 
 class SqliteAdapter implements DatabaseAdapter {
 	private $pdo;
 	private $stmtCache;
-    private $generalEditor;
+	private $generalEditor;
 
 	public function __construct(\PDO $pdo) {
 		$this->pdo = $pdo;
-        $this->stmtCache = new StmtCache($pdo);
-        $this->generalEditor = new GeneralEditDatabase($this->pdo, [
-            'int' => 'INTEGER',
-            'pk_default' => 'INTEGER NOT NULL',
-        ]);
+		$this->stmtCache = new StmtCache($pdo);
+		$this->generalEditor = new GeneralEditDatabase($this->pdo, [
+			'int' => 'INTEGER',
+			'pk_default' => 'INTEGER NOT NULL',
+		]);
 	}
 
 	public function quote($str) {
@@ -20,19 +20,19 @@ 
 	}
 
 	public function query(\Maphper\Lib\Query $query) {
-        $stmt = $this->stmtCache->getCachedStmt($query->getSql());
+		$stmt = $this->stmtCache->getCachedStmt($query->getSql());
 		$args = $query->getArgs();
 
-        //Handle SQLite when PDO_ERRMODE is set to SILENT
-        if ($stmt === false) throw new \Exception('Invalid query');
+		//Handle SQLite when PDO_ERRMODE is set to SILENT
+		if ($stmt === false) throw new \Exception('Invalid query');
 
-        $stmt->execute($args);
-        if ($stmt->errorCode() !== '00000' && $stmt->errorInfo()[2] == 'database schema has changed') {
+		$stmt->execute($args);
+		if ($stmt->errorCode() !== '00000' && $stmt->errorInfo()[2] == 'database schema has changed') {
 			$this->stmtCache->deleteQueryFromCache($query->getSql());
 			return $this->query($query);
-        }
+		}
 
-        return $stmt;
+		return $stmt;
 	}
 
 	public function lastInsertId() {
@@ -59,11 +59,11 @@ 
 		// SQLSTATE[HY000]: General error: 17 database schema has changed
 		$this->stmtCache->clearCache();
 
-        // Create temp table to create a new structure
+		// Create temp table to create a new structure
 		$affix = '_'.substr(md5($table), 0, 6);
-        $tempTable = $table . $affix;
+		$tempTable = $table . $affix;
 		$this->generalEditor->createTable($tempTable, $primaryKey, $data);
-        $this->alterColumns($tempTable, $primaryKey, $data);
+		$this->alterColumns($tempTable, $primaryKey, $data);
 		$this->copyTableData($table, $tempTable);
 
 		$this->pdo->query('DROP TABLE IF EXISTS ' . $table );
@@ -71,8 +71,8 @@ 
 
 	}
 
-    private function copyTableData($tableFrom, $tableTo) {
-        try {
+	private function copyTableData($tableFrom, $tableTo) {
+		try {
 			if ($this->tableExists($tableFrom)) {
 				$columns = implode(', ', $this->getColumns($tableFrom));
 
@@ -83,19 +83,19 @@ 
 			// No data to copy
 			echo $e->getMessage();
 		}
-    }
+	}
 
-    private function alterColumns($table, array $primaryKey, $data) {
-        foreach ($data as $key => $value) {
+	private function alterColumns($table, array $primaryKey, $data) {
+		foreach ($data as $key => $value) {
 			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) continue;
 
 			$type = $this->generalEditor->getType($value);
 
 			$this->pdo->query('ALTER TABLE ' . $table . ' ADD ' . $this->quote($key) . ' ' . $type);
 		}
-    }
+	}
 
-    public function addIndex($table, array $fields) {
+	public function addIndex($table, array $fields) {
 		if (empty($fields)) return false;
 
 		//SQLite doesn't support ASC/DESC indexes, remove the keywords

Maphper/DataSource/DatabaseSelect.php

Indentation +49 added lines, -49 removed lines

@@ -2,31 +2,31 @@ 
 namespace Maphper\DataSource;
 
 class DatabaseSelect {
-    private $resultCache = [];
-    private $idCache = [];
-    private $selectBuilder;
-    private $whereBuilder;
-    private $adapter;
-    private $databaseModify;
-    private $defaultSort;
-    private $table;
-
-    public function __construct(DatabaseAdapter $adapter, DatabaseModify $databaseModify, $table, $defaultSort) {
-        $this->adapter = $adapter;
-        $this->databaseModify = $databaseModify;
-        $this->selectBuilder = new \Maphper\Lib\SelectBuilder();
-        $this->whereBuilder = new \Maphper\Lib\Sql\WhereBuilder();
-        $this->defaultSort = $defaultSort;
-        $this->table = $table;
-    }
-
-    public function findById($id, $pk) {
+	private $resultCache = [];
+	private $idCache = [];
+	private $selectBuilder;
+	private $whereBuilder;
+	private $adapter;
+	private $databaseModify;
+	private $defaultSort;
+	private $table;
+
+	public function __construct(DatabaseAdapter $adapter, DatabaseModify $databaseModify, $table, $defaultSort) {
+		$this->adapter = $adapter;
+		$this->databaseModify = $databaseModify;
+		$this->selectBuilder = new \Maphper\Lib\SelectBuilder();
+		$this->whereBuilder = new \Maphper\Lib\Sql\WhereBuilder();
+		$this->defaultSort = $defaultSort;
+		$this->table = $table;
+	}
+
+	public function findById($id, $pk) {
 		if (!isset($this->idCache[$id])) {
 			try {
 				$result = $this->selectQuery($this->selectBuilder->select($this->table, $pk . ' = :id', [':id' => $id], ['limit' => 1]));
 			}
 			catch (\Exception $e) {
-                // Don't issue an error if it cannot be found since we return null
+				// Don't issue an error if it cannot be found since we return null
 			}
 
 			if (isset($result[0])) 	$this->idCache[$id] = $result[0];
@@ -35,7 +35,7 @@ 
 		return $this->idCache[$id];
 	}
 
-    public function findByField(array $fields, $options = []) {
+	public function findByField(array $fields, $options = []) {
 		$cacheId = md5(serialize(func_get_args()));
 		if (!isset($this->resultCache[$cacheId])) {
 			$query = $this->whereBuilder->createSql($fields);
@@ -55,7 +55,7 @@ 
 		return $this->resultCache[$cacheId];
 	}
 
-    public function findAggregate($function, $field, $group = null, array $criteria = [], array $options = []) {
+	public function findAggregate($function, $field, $group = null, array $criteria = [], array $options = []) {
 		//Cannot count/sum/max multiple fields, pick the first one. This should only come into play when trying to count() a mapper with multiple primary keys
 		if (is_array($field)) $field = $field[0];
 		$query = $this->whereBuilder->createSql($criteria);
@@ -72,34 +72,34 @@ 
 		}
 	}
 
-    private function determineAggregateResult($result, $group, $field) {
-        if ($group != null) {
-            $ret = [];
-            foreach ($result as $res) $ret[$res->$field] = $res->val;
-            return $ret;
-        }
-        else if (isset($result[0])) return $result[0]->val;
-        else return 0;
-    }
-
-    private function selectQuery(\Maphper\Lib\Query $query) {
-        return $this->adapter->query($query)->fetchAll(\PDO::FETCH_OBJ);
-    }
-
-    public function clearResultCache() {
-        $this->resultCache = [];
-    }
-
-    public function clearIDCache() {
-        $this->idCache = [];
-    }
-
-    public function updateCache($data, $pkValue) {
+	private function determineAggregateResult($result, $group, $field) {
+		if ($group != null) {
+			$ret = [];
+			foreach ($result as $res) $ret[$res->$field] = $res->val;
+			return $ret;
+		}
+		else if (isset($result[0])) return $result[0]->val;
+		else return 0;
+	}
+
+	private function selectQuery(\Maphper\Lib\Query $query) {
+		return $this->adapter->query($query)->fetchAll(\PDO::FETCH_OBJ);
+	}
+
+	public function clearResultCache() {
+		$this->resultCache = [];
+	}
+
+	public function clearIDCache() {
+		$this->idCache = [];
+	}
+
+	public function updateCache($data, $pkValue) {
 		if (isset($this->cache[$pkValue])) $this->cache[$pkValue] = (object) array_merge((array)$this->cache[$pkValue], (array)$data);
 		else $this->cache[$pkValue] = $data;
-    }
+	}
 
-    public function deleteIDFromCache($id) {
-        unset($this->idCache[$id]);
-    }
+	public function deleteIDFromCache($id) {
+		unset($this->idCache[$id]);
+	}
 }

Maphper/DataSource/MysqlAdapter.php

Indentation +16 added lines, -16 removed lines

@@ -3,14 +3,14 @@ 
 class MysqlAdapter implements DatabaseAdapter {
 	private $pdo;
 	private $stmtCache;
-    private $generalEditor;
+	private $generalEditor;
 
 	public function __construct(\PDO $pdo) {
 		$this->pdo = $pdo;
 		//Set to strict mode to detect 'out of range' errors, action at a distance but it needs to be set for all INSERT queries
 		$this->pdo->query('SET sql_mode = STRICT_ALL_TABLES');
-        $this->stmtCache = new StmtCache($pdo);
-        $this->generalEditor = new GeneralEditDatabase($this->pdo, ['short_string_max_len' => 191]);
+		$this->stmtCache = new StmtCache($pdo);
+		$this->generalEditor = new GeneralEditDatabase($this->pdo, ['short_string_max_len' => 191]);
 	}
 
 	public function quote($str) {
@@ -20,32 +20,32 @@ 
 	public function query(\Maphper\Lib\Query $query) {
 		$stmt = $this->stmtCache->getCachedStmt($query->getSql());
 		$args = $query->getArgs();
-        $stmt->execute($args);
+		$stmt->execute($args);
 
 		return $stmt;
 	}
 
-    private function alterColumns($table, array $primaryKey, $data) {
-        foreach ($data as $key => $value) {
+	private function alterColumns($table, array $primaryKey, $data) {
+		foreach ($data as $key => $value) {
 			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) continue;
             
 			$type = $this->generalEditor->getType($value);
 			$this->tryAlteringColumn($table, $key, $type);
 		}
-    }
+	}
 
-    private function tryAlteringColumn($table, $key, $type) {
-        try {
-            if (!$this->pdo->query('ALTER TABLE ' . $table . ' ADD ' . $this->quote($key) . ' ' . $type)) throw new \Exception('Could not alter table');
-        }
-        catch (\Exception $e) {
-            $this->pdo->query('ALTER TABLE ' . $table . ' MODIFY ' . $this->quote($key) . ' ' . $type);
-        }
-    }
+	private function tryAlteringColumn($table, $key, $type) {
+		try {
+			if (!$this->pdo->query('ALTER TABLE ' . $table . ' ADD ' . $this->quote($key) . ' ' . $type)) throw new \Exception('Could not alter table');
+		}
+		catch (\Exception $e) {
+			$this->pdo->query('ALTER TABLE ' . $table . ' MODIFY ' . $this->quote($key) . ' ' . $type);
+		}
+	}
 
 	public function alterDatabase($table, array $primaryKey, $data) {
 		$this->generalEditor->createTable($table, $primaryKey, $data);
-        $this->alterColumns($table, $primaryKey, $data);
+		$this->alterColumns($table, $primaryKey, $data);
 	}
 
 	public function lastInsertId() {