Level-2 / Maphper

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

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,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;
 	}
 
@@ -60,14 +60,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->generalEditor->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 +14 added lines, -8 removed lines

@@ -24,7 +24,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') {
@@ -78,8 +80,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();
 		}
@@ -87,7 +88,9 @@ 
 
     private function alterColumns($table, array $primaryKey, $data) {
         foreach ($data as $key => $value) {
-			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) continue;
+			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) {
+				continue;
+			}
 
 			$type = $this->generalEditor->getType($value);
 
@@ -96,10 +99,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);
@@ -108,8 +115,7 @@ 
 
 		try {
 			$this->pdo->query('CREATE INDEX IF NOT EXISTS  ' . $keyName . ' ON ' . $table . ' (' . implode(', ', $fields) . ')');
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 
 		}
 	}