kristuff / patabase

lib/Server.php

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
     public function dropDatabase($databaseName, $ifExists = false)
     {
         $sql = trim(sprintf('DROP DATABASE %s %s', 
-            $ifExists === true ? 'IF EXISTS': '',
+            $ifExists === true ? 'IF EXISTS' : '',
             $this->driver->escape($databaseName)));
         return $this->driver->prepareAndExecuteSql($sql);
     }

lib/Table.php

Spacing +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
     {
         $query = new Query\Update($this->database->getDriver(), $this->name);
         foreach ($parameters as $key => $val) {
-            $query->setValue($key,  $val);
+            $query->setValue($key, $val);
         }
         return $query;
     }
@@ -120,7 +120,7 @@ 
     {
         $query = new Query\Insert($this->database->getDriver(), $this->name);
         foreach ($parameters as $key => $val) {
-            $query->setValue($key,  $val);
+            $query->setValue($key, $val);
         }
         return $query;
     }
@@ -169,7 +169,7 @@ 
     public function rename($newName)
     {
        $result = $this->database->renameTable($this->name, $newName);
-       if ($result){
+       if ($result) {
             $this->name = $newName;
         }
         return $result;

lib/Query/InsertBase.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
      */
     protected function getArgName($column)
     {
-         return '_' . str_replace('.', '_', $column);
+         return '_'.str_replace('.', '_', $column);
     }
 
     /**
@@ -78,7 +78,7 @@ 
     {
         // Define column parameters
         $columns = func_get_args();
-        if (!empty($columns)){
+        if (!empty($columns)) {
 
             // clear current parameters
             unset($this->parameters);

lib/Query/CreateTable.php

Spacing +23 added lines, -23 removed lines

@@ -148,50 +148,50 @@ 
     private function sqlColumns()
     {
         $result = array();
-        foreach ($this->columns as $col){
+        foreach ($this->columns as $col) {
 
             // Parse arguments. First item is NAME and second is TYPE
             $sqlName   = $this->escape($col[0]);
-            $sqlType   = $col[1];  //TODO check type
+            $sqlType   = $col[1]; //TODO check type
             
             // following arguments
-            $args       = array_slice($col, 2);
+            $args = array_slice($col, 2);
             $currentIndex       = 0;
             $defaultValueIndex  = -1;
 
-            $sqlConstraintUnique    = '';       // UNIQUE ?, not by default
-            $sqlConstraintNullable  = 'NULL';   // allow null value by default
-            $isPk                   = false;    // PRIMARY KEY?
-            $sqlDefault             = '';       // DEFAULT VALUE?
+            $sqlConstraintUnique    = ''; // UNIQUE ?, not by default
+            $sqlConstraintNullable  = 'NULL'; // allow null value by default
+            $isPk                   = false; // PRIMARY KEY?
+            $sqlDefault             = ''; // DEFAULT VALUE?
 
-            foreach ($args as $arg){
+            foreach ($args as $arg) {
 
                 // last index was DEFAULT, so the current argument 
                 // is the value for default contsaint
-                if ($currentIndex === $defaultValueIndex){
+                if ($currentIndex === $defaultValueIndex) {
                     
                     // string
-                    if (is_string($arg)){
+                    if (is_string($arg)) {
                             
                         // escape everything except constants
-                        if (in_array(strtoupper($arg), $this->supportedDefaults)){
-                            $sqlDefault = 'DEFAULT ' . $arg;
+                        if (in_array(strtoupper($arg), $this->supportedDefaults)) {
+                            $sqlDefault = 'DEFAULT '.$arg;
                         } else {
-                            $sqlDefault = 'DEFAULT ' . $this->driver->escapeValue($arg);
+                            $sqlDefault = 'DEFAULT '.$this->driver->escapeValue($arg);
                         }
                         
                     // int/float are not escaped
-                    } elseif (is_int($arg) || is_float($arg)){
-                        $sqlDefault = 'DEFAULT ' . $arg;
+                    } elseif (is_int($arg) || is_float($arg)) {
+                        $sqlDefault = 'DEFAULT '.$arg;
 
                     // bool Type
-                    } elseif (is_bool($arg)){
-                        $sqlDefault = 'DEFAULT ' . ($arg ? 'TRUE' : 'FALSE');                            
+                    } elseif (is_bool($arg)) {
+                        $sqlDefault = 'DEFAULT '.($arg ? 'TRUE' : 'FALSE');                            
                     }
 
 
                 } else {
-                    switch (strtoupper($arg)){
+                    switch (strtoupper($arg)) {
                         
                         // NULL  /NOT NULL 
                         case 'NULL':
@@ -225,14 +225,14 @@ 
                         // DEFAULT
                         case 'DEFAULT':
                             // define next index as the DefaultValue index
-                            $defaultValueIndex = $currentIndex +1;
+                            $defaultValueIndex = $currentIndex+1;
                             break;
                     
                     }
                 }
 
                 // update  current index
-                $currentIndex ++;
+                $currentIndex++;
             }
 
             // set optional params
@@ -247,8 +247,8 @@ 
         }
 
         // FK CONSTRANT
-        foreach ($this->foreignKeys as $foreignKey){
-            $result[] =  trim(sprintf('CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)', 
+        foreach ($this->foreignKeys as $foreignKey) {
+            $result[] = trim(sprintf('CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)', 
                             $foreignKey['name'], 
                             $this->driver->escapeIdentifier($foreignKey['src_column']), 
                             $this->driver->escapeIdentifier($foreignKey['ref_table']),
@@ -268,7 +268,7 @@ 
     public function sql()
     {
         $sqlTableName = $this->driver->escape($this->tableName);
-        $sqlIfNotExists =  $this->isNotExists === true ? 'IF NOT EXISTS' : '';
+        $sqlIfNotExists = $this->isNotExists === true ? 'IF NOT EXISTS' : '';
 
         return trim(sprintf(
             'CREATE TABLE %s %s (%s) %s',

lib/Query/Insert.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
         foreach ($this->parameters as $key => $val) {
             $arg = $this->getArgName($key);
             $columnsNames[]    = $this->escape($key); 
-            $columnsValues[]   = ':' . $arg;
+            $columnsValues[]   = ':'.$arg;
         }        
         return trim(sprintf(
             'INSERT INTO %s (%s) VALUES (%s)',

lib/Query/Delete.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
      */
     public function where()
     {
-        if (!isset($this->where)){
+        if (!isset($this->where)) {
             $this->where = new Query\Where($this, $this->driver);
         }
         return $this->where; 

lib/Query/QueryBase.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
      */
     public function errorCode()
     {
-        return !empty($this->error) ? $this->error['code']: null;
+        return !empty($this->error) ? $this->error['code'] : null;
     }
 
     /**

lib/Query/Having.php

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
      */
     public function fn($function, $column, $operator, $value)
     {
-        $sql = $function .'('. ($column ? $this->query->escape($column): '') . ') ' . $operator . ' ';
+        $sql = $function.'('.($column ? $this->query->escape($column) : '').') '.$operator.' ';
         $this->addCondition($function, $sql, $column, $value);
         return $this->returnFunction();
     }
@@ -69,7 +69,7 @@ 
      */
     public function count($operator, $value)
     {
-        $sql = 'COUNT(*) '. $operator. ' ';
+        $sql = 'COUNT(*) '.$operator.' ';
         $this->addCondition('COUNT', $sql, 'COUNT', $value);
         return $this->returnFunction();
     }

lib/Query/Select.php

Spacing +22 added lines, -22 removed lines

@@ -57,8 +57,8 @@ 
     protected function getArgumentName($column)
     {
         $topQuery = $this->topQuery ?: $this;  
-        $arg = ':_' . str_replace('.', '_', $column); 
-        return $topQuery->sqlParameterExists($arg) ? $arg . uniqid() : $arg;
+        $arg = ':_'.str_replace('.', '_', $column); 
+        return $topQuery->sqlParameterExists($arg) ? $arg.uniqid() : $arg;
     }
     
     /**
@@ -70,22 +70,22 @@ 
     private function sqlColumns()
     {
         // no columns givens select all (SELECT *)
-        if (!count($this->columns) > 0 ) {
+        if (!count($this->columns) > 0) {
             return '*';   
         }
 
         // use DISTINCT ?
-        $sqlDistinct    = $this->distinct ? 'DISTINCT ': '';
+        $sqlDistinct = $this->distinct ? 'DISTINCT ' : '';
 
         // parse columns
         $colsList = array();
-        foreach ($this->columns as $val){
-            switch ($val['type']){
+        foreach ($this->columns as $val) {
+            switch ($val['type']) {
                    
                 // 'classic' column
                 case 'column':
                     $name       = $this->escape($val['name']);
-                    $alias      = isset($val['alias']) ? 'AS '. $this->escape($val['alias']) : '';
+                    $alias      = isset($val['alias']) ? 'AS '.$this->escape($val['alias']) : '';
                     $colsList[] = trim(sprintf('%s %s', $name, $alias));
                     break;  
                    
@@ -97,17 +97,17 @@ 
                 // SUM() column
                 case 'sum':
                     $name       = $this->escape($val['name']);
-                    $alias      = isset($val['alias']) ? 'AS '. $this->escape($val['alias']) : '';
-                    $colsList[] = sprintf('SUM(%s)', $name) . $alias;
+                    $alias      = isset($val['alias']) ? 'AS '.$this->escape($val['alias']) : '';
+                    $colsList[] = sprintf('SUM(%s)', $name).$alias;
                     break;  
 
                 // sub query
                 case 'sub_query':
-                    $colsList[] = '('. $val['query']->sql() .') AS '. $this->escape($val['alias']);
+                    $colsList[] = '('.$val['query']->sql().') AS '.$this->escape($val['alias']);
                     break;
            }
         }
-        return $sqlDistinct . implode(', ', $colsList);
+        return $sqlDistinct.implode(', ', $colsList);
     }
     
     /**
@@ -119,26 +119,26 @@ 
     public function sql()
     {
         $topQuery = $this->topQuery ?: $this;  
-        $sqlJoins = empty($this->joins) ? '' : implode(' ', $this->joins) ; 
-        $sqlFromTable =  'FROM '. $this->escape($this->fromTable);
+        $sqlJoins = empty($this->joins) ? '' : implode(' ', $this->joins); 
+        $sqlFromTable = 'FROM '.$this->escape($this->fromTable);
         $sqlWhere = isset($this->where) ? $this->where->sql() : '';
         $sqlGroupBy = empty($this->groupBy) ? '' : 'GROUP BY '.implode(', ', $this->escapeList($this->groupBy));
         $sqlHaving = isset($this->having) ? $this->having->sql() : '';
 
         // order by
         $sqlOrderBy = '';
-        if (! empty($this->orderBy)){
+        if (!empty($this->orderBy)) {
             $sortArgs = [];
-            foreach ($this->orderBy as $item){
-                $sql = $item['column'] ? $this->escape($item['column']) . ' ' : '';
-                $sortArgs[] = $sql . $item['order'];
+            foreach ($this->orderBy as $item) {
+                $sql = $item['column'] ? $this->escape($item['column']).' ' : '';
+                $sortArgs[] = $sql.$item['order'];
             }
-            $sqlOrderBy = 'ORDER BY ' . implode(', ', $sortArgs);
+            $sqlOrderBy = 'ORDER BY '.implode(', ', $sortArgs);
         }
 
         // limit
         $sqlLimit = '';
-        if ($this->limit > 0){
+        if ($this->limit > 0) {
             $argName = $this->getArgumentName('LIMIT');   
             $topQuery->setSqlParameter($argName, $this->limit); 
             $sqlLimit = 'LIMIT '.$argName;
@@ -146,10 +146,10 @@ 
 
         // offset
         $sqlOffset = '';
-        if ($this->offset > 0){
+        if ($this->offset > 0) {
             $argName = $this->getArgumentName('OFFSET');   
             $topQuery->setSqlParameter($argName, $this->offset); 
-            $sqlOffset = 'OFFSET ' . $argName;
+            $sqlOffset = 'OFFSET '.$argName;
         }
 
         return trim(implode(' ', ['SELECT', 
@@ -209,7 +209,7 @@ 
     public function getColumn()
     {
         $this->limit(1);
-        return $this->execute() ? $this->pdoStatement->fetchColumn() : NULL ;
+        return $this->execute() ? $this->pdoStatement->fetchColumn() : NULL;
     }
 
 }
\ No newline at end of file