Level-2 / Maphper

maphper/datasource/mysqladapter.php

Indentation +10 added lines, -10 removed lines

@@ -8,7 +8,7 @@ 
 		$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->stmtCache = new StmtCache($pdo);
 	}
 
 	public function quote($str) {
@@ -18,7 +18,7 @@ 
 	public function query(\Maphper\Lib\Query $query) {
 		$stmt = $this->stmtCache->getCachedStmt($query->getSql());
 		$args = $query->getArgs();
-        $stmt->execute($args);
+		$stmt->execute($args);
 
 		return $stmt;
 	}
@@ -44,8 +44,8 @@ 
 		$this->pdo->query('CREATE TABLE IF NOT EXISTS ' . $table . ' (' . $pkField . ')');
 	}
 
-    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->isNotSavableType($value, $key, $primaryKey)) continue;
 
 			$type = $this->getType($value);
@@ -57,16 +57,16 @@ 
 				$this->pdo->query('ALTER TABLE ' . $table . ' MODIFY ' . $this->quote($key) . ' ' . $type);
 			}
 		}
-    }
+	}
 
-    private function isNotSavableType($value, $key, $primaryKey) {
-        return is_array($value) || (is_object($value) && !($value instanceof \DateTime)) ||
-                in_array($key, $primaryKey);
-    }
+	private function isNotSavableType($value, $key, $primaryKey) {
+		return is_array($value) || (is_object($value) && !($value instanceof \DateTime)) ||
+				in_array($key, $primaryKey);
+	}
 
 	public function alterDatabase($table, array $primaryKey, $data) {
 		$this->createTable($table, $primaryKey, $data);
-        $this->alterColumns($table, $primaryKey, $data);
+		$this->alterColumns($table, $primaryKey, $data);
 	}
 
 	public function lastInsertId() {

Braces +24 added lines, -11 removed lines

@@ -24,10 +24,15 @@ 
 	}
 
 	private function getType($val) {
-		if ($val instanceof \DateTime) return 'DATETIME';
-		else if (is_int($val)) return  'INT(11)';
-		else if (is_double($val)) return 'DECIMAL(9,' . strlen($val) - strrpos($val, '.') - 1 . ')';
-		else if (is_string($val)) return strlen($val) < 192 ? 'VARCHAR(191)' : 'LONGBLOB';
+		if ($val instanceof \DateTime) {
+			return 'DATETIME';
+		} else if (is_int($val)) {
+			return  'INT(11)';
+		} else if (is_double($val)) {
+			return 'DECIMAL(9,' . strlen($val) - strrpos($val, '.') - 1 . ')';
+		} else if (is_string($val)) {
+			return strlen($val) < 192 ? 'VARCHAR(191)' : 'LONGBLOB';
+		}
 		return 'VARCHAR(191)';
 	}
 
@@ -36,8 +41,11 @@ 
 		$parts = [];
 		foreach ($primaryKey as $key) {
 			$pk = $data->$key;
-			if ($pk == null) $parts[] = $key . ' INT(11) NOT NULL AUTO_INCREMENT';
-			else $parts[] = $key . ' ' . $this->getType($pk) . ' NOT NULL';
+			if ($pk == null) {
+				$parts[] = $key . ' INT(11) NOT NULL AUTO_INCREMENT';
+			} else {
+				$parts[] = $key . ' ' . $this->getType($pk) . ' NOT NULL';
+			}
 		}
 
 		$pkField = implode(', ', $parts) . ', PRIMARY KEY(' . implode(', ', $primaryKey) . ')';
@@ -46,14 +54,17 @@ 
 
     private function alterColumns($table, array $primaryKey, $data) {
         foreach ($data as $key => $value) {
-			if ($this->isNotSavableType($value, $key, $primaryKey)) continue;
+			if ($this->isNotSavableType($value, $key, $primaryKey)) {
+				continue;
+			}
 
 			$type = $this->getType($value);
 
 			try {
-				if (!$this->pdo->query('ALTER TABLE ' . $table . ' ADD ' . $this->quote($key) . ' ' . $type)) throw new \Exception('Could not alter table');
-			}
-			catch (\Exception $e) {
+				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);
 			}
 		}
@@ -81,7 +92,9 @@ 
 		$keyName = $this->quote(implode('_', $fields));
 
 		$results = $this->pdo->query('SHOW INDEX FROM ' . $this->quote($table) . ' WHERE Key_Name = "' . $keyName . '"');
-		if ($results && count($results->fetchAll()) == 0)  $this->pdo->query('CREATE INDEX ' . $keyName . ' ON ' . $this->quote($table) . ' (' . implode(', ', $fields) . ')');
+		if ($results && count($results->fetchAll()) == 0) {
+			$this->pdo->query('CREATE INDEX ' . $keyName . ' ON ' . $this->quote($table) . ' (' . implode(', ', $fields) . ')');
+		}
 	}
 
 	public function optimiseColumns($table) {

maphper/datasource/sqliteadapter.php

Indentation +21 added lines, -21 removed lines

@@ -7,7 +7,7 @@ 
 
 	public function __construct(\PDO $pdo) {
 		$this->pdo = $pdo;
-        $this->stmtCache = new StmtCache($pdo);
+		$this->stmtCache = new StmtCache($pdo);
 	}
 
 	public function quote($str) {
@@ -15,19 +15,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() {
@@ -63,11 +63,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->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 );
@@ -75,8 +75,8 @@ 
 
 	}
 
-    private function copyTableData($tableFrom, $tableTo) {
-        try {
+	private function copyTableData($tableFrom, $tableTo) {
+		try {
 			if ($this->tableExists($tableFrom)) {
 				$columns = implode(', ', $this->getColumns($tableFrom));
 
@@ -87,7 +87,7 @@ 
 			// No data to copy
 			echo $e->getMessage();
 		}
-    }
+	}
 
 	private function createTable($table, array $primaryKey, $data) {
 		$parts = [];
@@ -102,20 +102,20 @@ 
 		$this->pdo->query('CREATE TABLE ' . $table . ' (' . $pkField . ')');
 	}
 
-    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->isNotSavableType($value, $key, $primaryKey)) continue;
 
 			$type = $this->getType($value);
 		
 			$this->pdo->query('ALTER TABLE ' . $table . ' ADD ' . $this->quote($key) . ' ' . $type);
 		}
-    }
+	}
 
-    private function isNotSavableType($value, $key, $primaryKey) {
-        return is_array($value) || (is_object($value) && !($value instanceof \DateTime)) ||
-                in_array($key, $primaryKey);
-    }
+	private function isNotSavableType($value, $key, $primaryKey) {
+		return is_array($value) || (is_object($value) && !($value instanceof \DateTime)) ||
+				in_array($key, $primaryKey);
+	}
 
 	public function addIndex($table, array $fields) {
 		if (empty($fields)) return false;

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
 	}
 
 	private function tableExists($name) {
-		$result = $this->pdo->query('SELECT name FROM sqlite_master WHERE type="table" and name="'. $name.'"');
+		$result = $this->pdo->query('SELECT name FROM sqlite_master WHERE type="table" and name="' . $name . '"');
 		return count($result->fetchAll()) == 1;
 	}
 
@@ -64,14 +64,14 @@ 
 		$this->stmtCache->clearCache();
 
         // Create temp table to create a new structure
-		$affix = '_'.substr(md5($table), 0, 6);
+		$affix = '_' . substr(md5($table), 0, 6);
         $tempTable = $table . $affix;
 		$this->createTable($tempTable, $primaryKey, $data);
         $this->alterColumns($tempTable, $primaryKey, $data);
 		$this->copyTableData($table, $tempTable);
 
-		$this->pdo->query('DROP TABLE IF EXISTS ' . $table );
-		$this->pdo->query('ALTER TABLE ' . $tempTable . ' RENAME TO '. $table );
+		$this->pdo->query('DROP TABLE IF EXISTS ' . $table);
+		$this->pdo->query('ALTER TABLE ' . $tempTable . ' RENAME TO ' . $table);
 
 	}
 

Braces +32 added lines, -16 removed lines

@@ -19,7 +19,9 @@ 
 		$args = $query->getArgs();
 
         //Handle SQLite when PDO_ERRMODE is set to SILENT
-        if ($stmt === false) throw new \Exception('Invalid query');
+        if ($stmt === false) {
+        	throw new \Exception('Invalid query');
+        }
 
         $stmt->execute($args);
         if ($stmt->errorCode() !== '00000' && $stmt->errorInfo()[2] == 'database schema has changed') {
@@ -35,12 +37,19 @@ 
 	}
 	
 	private function getType($val) {
-		if ($val instanceof \DateTime) return 'DATETIME';
-		else if (is_int($val)) return  'INTEGER';
-		else if (is_double($val)) return 'DECIMAL(9,' . strlen($val) - strrpos($val, '.') - 1 . ')';
-		else if (is_string($val) && strlen($val) < 256) return 'VARCHAR(255)';
-		else if (is_string($val) && strlen($val) > 256) return 'LONGBLOG';
-		else return 'VARCHAR(255)';		
+		if ($val instanceof \DateTime) {
+			return 'DATETIME';
+		} else if (is_int($val)) {
+			return  'INTEGER';
+		} else if (is_double($val)) {
+			return 'DECIMAL(9,' . strlen($val) - strrpos($val, '.') - 1 . ')';
+		} else if (is_string($val) && strlen($val) < 256) {
+			return 'VARCHAR(255)';
+		} else if (is_string($val) && strlen($val) > 256) {
+			return 'LONGBLOG';
+		} else {
+			return 'VARCHAR(255)';
+		}
 	}
 
 	private function tableExists($name) {
@@ -82,8 +91,7 @@ 
 
 				$this->pdo->query('INSERT INTO ' . $this->quote($tableTo) . '(' . $columns . ') SELECT ' . $columns . ' FROM ' . $this->quote($tableFrom));
 			}
-		}
-		catch (\PDOException $e) {
+		} catch (\PDOException $e) {
 			// No data to copy
 			echo $e->getMessage();
 		}
@@ -93,8 +101,11 @@ 
 		$parts = [];
 		foreach ($primaryKey as $key) {
 			$pk = $data->$key;
-			if ($pk == null) $parts[] = $key . ' INTEGER'; 
-			else $parts[] = $key . ' ' . $this->getType($pk) . ' NOT NULL';					
+			if ($pk == null) {
+				$parts[] = $key . ' INTEGER';
+			} else {
+				$parts[] = $key . ' ' . $this->getType($pk) . ' NOT NULL';
+			}
 		}
 		
 		$pkField = implode(', ', $parts) . ', PRIMARY KEY(' . implode(', ', $primaryKey) . ')';
@@ -104,7 +115,9 @@ 
 
     private function alterColumns($table, array $primaryKey, $data) {
         foreach ($data as $key => $value) {
-			if ($this->isNotSavableType($value, $key, $primaryKey)) continue;
+			if ($this->isNotSavableType($value, $key, $primaryKey)) {
+				continue;
+			}
 
 			$type = $this->getType($value);
 		
@@ -118,10 +131,14 @@ 
     }
 
 	public function addIndex($table, array $fields) {
-		if (empty($fields)) return false;
+		if (empty($fields)) {
+			return false;
+		}
 		
 		//SQLite doesn't support ASC/DESC indexes, remove the keywords
-		foreach ($fields as &$field) $field = str_ireplace([' desc', ' asc'], '', $field);
+		foreach ($fields as &$field) {
+			$field = str_ireplace([' desc', ' asc'], '', $field);
+		}
 		sort($fields);
 		$fields = array_map('strtolower', $fields);
 		$fields = array_map('trim', $fields);
@@ -130,8 +147,7 @@ 
 		
 		try {
 			$this->pdo->query('CREATE INDEX IF NOT EXISTS  ' . $keyName . ' ON ' . $table . ' (' . implode(', ', $fields) . ')');
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			
 		}
 	}