kristuff / patabase

lib/Server.php

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
  *
  * Represents a connection to SQL database server
  */
- class Server extends Datasource
+    class Server extends Datasource
 {
 
     /**

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

Indentation +2 added lines, -2 removed lines

@@ -168,8 +168,8 @@
      */
     public function rename($newName)
     {
-       $result = $this->database->renameTable($this->name, $newName);
-       if ($result){
+        $result = $this->database->renameTable($this->name, $newName);
+        if ($result){
             $this->name = $newName;
         }
         return $result;

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

Indentation +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
      */
     protected function getArgName($column)
     {
-         return '_' . str_replace('.', '_', $column);
+            return '_' . str_replace('.', '_', $column);
     }
 
     /**

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

Indentation +10 added lines, -10 removed lines

@@ -109,8 +109,8 @@ 
      */
     public function column()
     {
-       $this->columns[] = func_get_args();
-       return $this;
+        $this->columns[] = func_get_args();
+        return $this;
     }
      
     /**
@@ -128,15 +128,15 @@ 
      */
     public function fk($fkName, $srcColumn, $refTable, $refColumn, $onUpdate = 'CASCADE', $onDelete = 'RESTRICT')
     {
-       $this->foreignKeys[] = array(
+        $this->foreignKeys[] = array(
             'name'          => $fkName,
             'src_column'    => $srcColumn,
             'ref_table'     => $refTable,
             'ref_column'    => $refColumn,
             'on_update'     => $onUpdate,
             'on_delete'     => $onDelete
-       );
-       return $this;
+        );
+        return $this;
     }
 
     /**
@@ -239,11 +239,11 @@ 
             // PK ?, UNIQUE ?, NULL? (PK cannot be null), DEFAULT?
             // AI is handle with sqltype
             $result[] = trim(implode(' ', [$sqlName, 
-                                           $sqlType, 
-                                           $isPk ? 'NOT NULL' : $sqlConstraintNullable,
-                                           $isPk ? 'PRIMARY KEY' : '',
-                                           $sqlConstraintUnique,
-                                           $sqlDefault]));
+                                            $sqlType, 
+                                            $isPk ? 'NOT NULL' : $sqlConstraintNullable,
+                                            $isPk ? 'PRIMARY KEY' : '',
+                                            $sqlConstraintUnique,
+                                            $sqlDefault]));
         }
 
         // FK CONSTRANT

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/QueryBuilder.php

Indentation +5 added lines, -5 removed lines

@@ -109,7 +109,7 @@ 
      */
     public function escape($str)
     {
-       return $this->driver->escape($str);
+        return $this->driver->escape($str);
     }
 
     /**
@@ -186,7 +186,7 @@ 
      */
     public function prepare()
     {
-         try {
+            try {
             // prepare is in a try catch block because sqlite for example could raise 
             // an exception when prepareing the statement (with invalid table name for example)
             // when mysql and postres wont. 
@@ -251,9 +251,9 @@ 
         try {
             // prepare bind execute
             if (!isset($this->pdoStatement)){
-               if (!$this->prepare()){
-                   return false;
-               }
+                if (!$this->prepare()){
+                    return false;
+                }
             }
             $this->bindValues();
             return $this->pdoStatement ? $this->pdoStatement->execute() : false;

Spacing +14 added lines, -14 removed lines

@@ -137,7 +137,7 @@ 
      *
      * @return string
      */
-    public function __construct( $driver)
+    public function __construct($driver)
     {
         $this->driver = $driver;
     }
@@ -201,7 +201,7 @@ 
             }
 
             // register error 
-            $this->error['code'] = (int)$e->getCode();
+            $this->error['code'] = (int) $e->getCode();
             $this->error['message'] = $e->getMessage();
             return false;
         }
@@ -225,13 +225,13 @@ 
                 $paramType = \PDO::PARAM_STR; // default
 
                 if (!isset($val)) {
-                    $paramType =  \PDO::PARAM_NULL;
+                    $paramType = \PDO::PARAM_NULL;
                 
                 } elseif (is_int($val)) {
-                    $paramType =  \PDO::PARAM_INT;
+                    $paramType = \PDO::PARAM_INT;
                 
                 } elseif (is_bool($val)) {
-                    $paramType =  \PDO::PARAM_BOOL;
+                    $paramType = \PDO::PARAM_BOOL;
                 } 
                 
                 // bind value
@@ -250,8 +250,8 @@ 
     {
         try {
             // prepare bind execute
-            if (!isset($this->pdoStatement)){
-               if (!$this->prepare()){
+            if (!isset($this->pdoStatement)) {
+               if (!$this->prepare()) {
                    return false;
                }
             }
@@ -266,7 +266,7 @@ 
             }
 
             // register error 
-            $this->error['code'] = (int)$e->getCode();
+            $this->error['code'] = (int) $e->getCode();
             $this->error['message'] = $e->getMessage();
             return false;
         }
@@ -296,22 +296,22 @@ 
      */
     protected static function fetchOutput(QueryBuilder $query, $executed, $ouputFormat)
     {
-        switch ($ouputFormat){
+        switch ($ouputFormat) {
             case 'asso':    
-                return $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_ASSOC) :  array();
+                return $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_ASSOC) : array();
 
             case 'obj':     
-                return $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_OBJ) :    NULL;
+                return $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_OBJ) : NULL;
 
             case 'cols':     
-                return $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_COLUMN) :  array();
+                return $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_COLUMN) : array();
 
             case 'json':    
-                $results = $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_ASSOC) :  array();
+                $results = $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_ASSOC) : array();
                 return json_encode($results, JSON_NUMERIC_CHECK);   
 
             case 'jsonpp':    
-                $results = $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_ASSOC) :  array();
+                $results = $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_ASSOC) : array();
                 return json_encode($results, JSON_PRETTY_PRINT | JSON_NUMERIC_CHECK);   
                 
             default:

lib/Query/Delete.php

Indentation +5 added lines, -5 removed lines

@@ -90,12 +90,12 @@
      */
     public function sql()
     {
-       // Build sql where and escape table name
-       $sqlWhere = (isset($this->where)) ? $this->where->sql() : '';
-       $sqlTableName = $this->escape($this->tableName);
+        // Build sql where and escape table name
+        $sqlWhere = (isset($this->where)) ? $this->where->sql() : '';
+        $sqlTableName = $this->escape($this->tableName);
        
-       // DELETE query
-       return trim(sprintf('DELETE FROM %s %s', 
+        // DELETE query
+        return trim(sprintf('DELETE FROM %s %s', 
                             $sqlTableName, 
                             $sqlWhere));
     }

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();
     }