Level-2 / Maphper

maphper/datasource/sqliteadapter.php

Braces +60 added lines, -29 removed lines

@@ -15,33 +15,48 @@ 
 		
 	public function query(\Maphper\Lib\Query $query) {
 		$queryId = md5($query->getSql());
-		if (isset($this->queryCache[$queryId])) $stmt = $this->queryCache[$queryId];
-		else {
+		if (isset($this->queryCache[$queryId])) {
+			$stmt = $this->queryCache[$queryId];
+		} else {
 			$stmt = $this->pdo->prepare($query->getSql(), [\PDO::ATTR_CURSOR => \PDO::CURSOR_FWDONLY]);
-			if ($stmt) $this->queryCache[$queryId] = $stmt;
+			if ($stmt) {
+				$this->queryCache[$queryId] = $stmt;
+			}
 		}
 		
 		$args = $query->getArgs();
-		foreach ($args as &$arg) if ($arg instanceof \DateTime) {
+		foreach ($args as &$arg) {
+			if ($arg instanceof \DateTime) {
 			if ($arg->format('H:i:s')  == '00:00:00') $arg = $arg->format('Y-m-d');
-			else $arg = $arg->format('Y-m-d H:i:s');
+		}
+			else {
+				$arg = $arg->format('Y-m-d H:i:s');
+			}
 		}
 				
 		if ($stmt !== false) {
 			try {
-				if (count($args) > 0) $res = $stmt->execute($args);
-				else $res = $stmt->execute();
-				if ($stmt->errorCode() !== '00000') throw new \Exception('Invalid query');
-				if (substr($query->getSql(), 0, 6) === 'SELECT') return $stmt->fetchAll(\PDO::FETCH_OBJ);
-				else return $stmt;
-			}
-			catch (\Exception $e) {
+				if (count($args) > 0) {
+					$res = $stmt->execute($args);
+				} else {
+					$res = $stmt->execute();
+				}
+				if ($stmt->errorCode() !== '00000') {
+					throw new \Exception('Invalid query');
+				}
+				if (substr($query->getSql(), 0, 6) === 'SELECT') {
+					return $stmt->fetchAll(\PDO::FETCH_OBJ);
+				} else {
+					return $stmt;
+				}
+			} catch (\Exception $e) {
 				//SQLite causes an error if when the DB schema changes, rebuild $stmt and try again.
 				if ($stmt->errorInfo()[2] == 'database schema has changed') {
 					unset($this->queryCache[$queryId]);
 					return $this->query($query);	
+				} else {
+					return $stmt;
 				}
-				else return $stmt;				
 			}
 		}
 		//Handle SQLite when PDO_ERRMODE is set to SILENT
@@ -55,12 +70,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) {
@@ -94,8 +116,7 @@ 
 				$this->pdo->query('INSERT INTO ' . $this->quote($table . $affix) . '(' . $columns . ') SELECT ' . $columns . ' FROM ' . $this->quote($table));
 				$this->pdo->query('DROP TABLE IF EXISTS ' . $table );
 			}
-		}
-		catch (\PDOException $e) {
+		} catch (\PDOException $e) {
 			// No data to copy
 			echo $e->getMessage();
 		}
@@ -109,8 +130,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) . ')';
@@ -119,8 +143,12 @@ 
 		$this->pdo->query('CREATE TABLE ' . $table . ' (' . $pkField . ')');
 					
 		foreach ($data as $key => $value) {
-			if (is_array($value) || (is_object($value) && !($value instanceof \DateTime))) continue;
-			if (in_array($key, $primaryKey)) continue;
+			if (is_array($value) || (is_object($value) && !($value instanceof \DateTime))) {
+				continue;
+			}
+			if (in_array($key, $primaryKey)) {
+				continue;
+			}
 
 			$type = $this->getType($value);
 		
@@ -130,10 +158,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);
@@ -142,8 +174,7 @@ 
 		
 		try {
 			$this->pdo->query('CREATE INDEX IF NOT EXISTS  ' . $keyName . ' ON ' . $table . ' (' . implode(', ', $fields) . ')');
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			
 		}
 	}