kristuff / patabase

lib/Query/SelectBase.php

Indentation +4 added lines, -4 removed lines

@@ -104,7 +104,7 @@ 
      * @access protected
      * @var    QueryBuilder
      */
-     protected $topQuery = null;
+        protected $topQuery = null;
 
     /**
      * Constructor
@@ -125,7 +125,7 @@ 
         }
     }
 
-   /**
+    /**
      * Parse the columns arguments for the select query
      *
      * @access protected
@@ -203,7 +203,7 @@ 
      */
     public function count($alias)
     {
-         $this->columns[] = array(
+            $this->columns[] = array(
             'type'  => 'count',
             'alias' => $alias
         );
@@ -220,7 +220,7 @@ 
      */
     public function sum($column, $alias)
     {
-         $this->columns[] = array(
+            $this->columns[] = array(
             'type'  => 'sum',
             'name'  => $column,
             'alias' => $alias

Spacing +6 added lines, -6 removed lines

@@ -120,7 +120,7 @@ 
         $this->topQuery = $query;
 
         // columns arguments
-        if (! empty($args)) {
+        if (!empty($args)) {
             $this->parseColumnsArguments($args);
         }
     }
@@ -139,7 +139,7 @@ 
         $cols = (count($args) === 1 && is_array($args[0])) ? $args[0] : $args;
 
         // parse column
-        foreach ($cols as $key => $value){
+        foreach ($cols as $key => $value) {
             
             // Each arg could be a non indexed array of name, or 
             // an indexed array name => alias
@@ -373,7 +373,7 @@ 
      */
     public function where()
     {
-        if (!isset($this->where)){
+        if (!isset($this->where)) {
             $this->where = new Query\Where($this, $this->driver, $this->topQuery);
         }
         return $this->where; 
@@ -400,7 +400,7 @@ 
      */
     public function having()
     {
-        if (!isset($this->having)){
+        if (!isset($this->having)) {
             $this->having = new Query\Having($this, $this->driver, $this->topQuery);
         }
         return $this->having; 
@@ -487,7 +487,7 @@ 
      */
     public function limit($value)
     {
-        if (! is_null($value)) {
+        if (!is_null($value)) {
             $this->limit = (int) $value;
         }
         return $this;
@@ -503,7 +503,7 @@ 
      */
     public function offset($value)
     {
-        if (! is_null($value)) {
+        if (!is_null($value)) {
             $this->offset = (int) $value;
         }
         return $this;

lib/Query/Where.php

Spacing +2 added lines, -2 removed lines

@@ -168,7 +168,7 @@ 
      */
     public function in($column, array $values)
     {
-        if (! empty($values)) {
+        if (!empty($values)) {
             $this->addCondition('IN', $this->query->escape($column).' IN ', $column, $values);
         }
         return $this->returnFunction();
@@ -185,7 +185,7 @@ 
      */
     public function notIn($column, array $values)
     {
-        if (! empty($values)) {
+        if (!empty($values)) {
             $this->addCondition('NOT_IN', $this->query->escape($column).' NOT IN ', $column, $values);
         }
         return $this->returnFunction();

lib/Query/QueryFilter.php

Indentation +3 added lines, -3 removed lines

@@ -204,7 +204,7 @@ 
      */
     protected function returnFunction()
     {
-         return $this->isGroupOpen === true ? $this : $this->query;
+            return $this->isGroupOpen === true ? $this : $this->query;
     }
 
     /**
@@ -262,7 +262,7 @@ 
                         $sql .= ')';
                         break;
 
-                   case 'NULL':
+                    case 'NULL':
                    case 'NOT_NULL':
                         $sql .=  $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';
                         $sql .=  $item['sql'];
@@ -279,7 +279,7 @@ 
                         if (is_string($item['value']) && 
                             strlen($item['value']) >  strlen(Patabase\Constants::COLUMN_LITERALL) &&
                             substr($item['value'], 0, strlen(Patabase\Constants::COLUMN_LITERALL)) === 
-                                                             Patabase\Constants::COLUMN_LITERALL) {
+                                                                Patabase\Constants::COLUMN_LITERALL) {
 
                             $arg = substr($item['value'], strlen(Patabase\Constants::COLUMN_LITERALL));
                             $sql .=  $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';

Spacing +18 added lines, -18 removed lines

@@ -116,8 +116,8 @@ 
      */
     private function getArgumentName($column)
     {
-        $arg = ':__' . str_replace('.', '_', $column); 
-        return $this->topQuery->sqlParameterExists($arg) ? $arg . uniqid() : $arg;
+        $arg = ':__'.str_replace('.', '_', $column); 
+        return $this->topQuery->sqlParameterExists($arg) ? $arg.uniqid() : $arg;
     }
 
     /**
@@ -219,7 +219,7 @@ 
     {
         // define argument for each values
         $valueArgs = array();
-        foreach($item['value'] as $value){
+        foreach ($item['value'] as $value) {
             $arg = $this->getArgumentName($item['column']); 
             $valueArgs[] = $arg;
 
@@ -228,7 +228,7 @@ 
         }
         
         //build and return sql
-        return $item['sql']. '(' . implode(', ', $valueArgs) .')';
+        return $item['sql'].'('.implode(', ', $valueArgs).')';
     }
 
     /**
@@ -241,20 +241,20 @@ 
     {
         $sql = '';
         if (!empty($this->conditions)) {
-            $sql = ' '. $this->sqlBase  .' ';  // start the SQL WHERE or HAVING clause
-            $currentOperator = 'AND';          // current condition operator
+            $sql = ' '.$this->sqlBase.' '; // start the SQL WHERE or HAVING clause
+            $currentOperator = 'AND'; // current condition operator
             
             foreach ($this->conditions as $key => $item) {
 
                 // need operator AND or OR, except for the first or if 
                 // previous item is a begin group item
-                $isSqlNeedOperator = $key > 0  && $this->conditions[$key -1]['type'] != 'group_start';
+                $isSqlNeedOperator = $key > 0 && $this->conditions[$key-1]['type'] != 'group_start';
 
                 switch ($item['type']) {
                     
                     case'group_start':
                         $currentOperator = $item['operator']; // register operator
-                        $sql .= '(' ;
+                        $sql .= '(';
                         break;
                     
                     case'group_end':
@@ -264,32 +264,32 @@ 
 
                    case 'NULL':
                    case 'NOT_NULL':
-                        $sql .=  $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';
-                        $sql .=  $item['sql'];
+                        $sql .= $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';
+                        $sql .= $item['sql'];
                         break;
 
                     case 'IN':
                     case 'NOT_IN':
-                        $sql .=  $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';
-                        $sql .=  $this->getSqlInOrNotIn($item);
+                        $sql .= $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';
+                        $sql .= $this->getSqlInOrNotIn($item);
                         break;
 
                     default:
                         // support for column literral 
                         if (is_string($item['value']) && 
-                            strlen($item['value']) >  strlen(Patabase\Constants::COLUMN_LITERALL) &&
+                            strlen($item['value']) > strlen(Patabase\Constants::COLUMN_LITERALL) &&
                             substr($item['value'], 0, strlen(Patabase\Constants::COLUMN_LITERALL)) === 
                                                              Patabase\Constants::COLUMN_LITERALL) {
 
                             $arg = substr($item['value'], strlen(Patabase\Constants::COLUMN_LITERALL));
-                            $sql .=  $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';
-                            $sql .=  $item['sql'] . $this->query->escape($arg);
+                            $sql .= $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';
+                            $sql .= $item['sql'].$this->query->escape($arg);
 
-                        }   else {
+                        } else {
                                 // *normal* value 
                                 $arg = $this->getArgumentName($item['column']);
-                                $sql .=  $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';
-                                $sql .=  $item['sql'] . $arg;
+                                $sql .= $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';
+                                $sql .= $item['sql'].$arg;
                                
                                 // set parameters
                                 $this->topQuery->setSqlParameter($arg, $item['value']); 

Braces +1 added lines, -1 removed lines

@@ -285,7 +285,7 @@
                             $sql .=  $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';
                             $sql .=  $item['sql'] . $this->query->escape($arg);
 
-                        }   else {
+                        } else {
                                 // *normal* value 
                                 $arg = $this->getArgumentName($item['column']);
                                 $sql .=  $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';

lib/Query/Update.php

Indentation +3 added lines, -3 removed lines

@@ -143,9 +143,9 @@
         $sqlWhere = (isset($this->where)) ? $this->where->sql() : '';
         $sqlTableName = $this->escape($this->tableName);
         return trim(sprintf('UPDATE %s SET %s %s',
-           $sqlTableName,
-           $this->sqlColumns(),
-           $sqlWhere
+            $sqlTableName,
+            $this->sqlColumns(),
+            $sqlWhere
         ));
     }
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -63,15 +63,15 @@ 
     {
         $columns = array();
         foreach ($this->parameters as $key => $val) {
-            $arg       = ':_' . str_replace('.', '_', $key); 
-            $columns[] = $this->escape($key) . ' =' .$arg; 
+            $arg       = ':_'.str_replace('.', '_', $key); 
+            $columns[] = $this->escape($key).' ='.$arg; 
             $this->pdoParameters[$arg] = $val; 
         }
         foreach ($this->incrementColumns as $key => $val) {
-            $columns[] = $this->escape($key) . ' =' . $this->escape($key) . '+' .$val ; 
+            $columns[] = $this->escape($key).' ='.$this->escape($key).'+'.$val; 
         }
         foreach ($this->decrementColumns as $key => $val) {
-            $columns[] = $this->escape($key) . ' =' . $this->escape($key) . '-' .$val ; 
+            $columns[] = $this->escape($key).' ='.$this->escape($key).'-'.$val; 
         }
         return implode(', ', $columns);
     }
@@ -84,7 +84,7 @@ 
      */
     public function where()
     {
-        if (!isset($this->where)){
+        if (!isset($this->where)) {
             $this->where = new Query\Where($this, $this->driver);
         }
         return $this->where; 

lib/Datasource.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
      * @access protected
      * @var array               $settings   The driver settings
      */
-    protected $settings= null;
+    protected $settings = null;
 
     /**
      * Open a PDO connection
@@ -149,7 +149,7 @@ 
      */
     public function closeConnection()
     {
-        if ($this->driver){
+        if ($this->driver) {
             $this->driver->closeConnection();
             $this->driver = null;
         }

lib/Database.php

Indentation +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
      * @access public
      * @param  string       $tableName      The name of the table
      * @return bool         True if the table has been dropped, otherwise false
-      */
+     */
     public function dropTable($tableName)
     {
         $sql = trim(sprintf('DROP TABLE %s', $tableName));

Spacing +1 added lines, -1 removed lines

@@ -257,7 +257,7 @@
      */
     public function beginTransaction()
     {
-        if (! $this->inTransaction()) {
+        if (!$this->inTransaction()) {
             $this->getConnection()->beginTransaction();
         }
     }

lib/Driver/Postgres/PostgresDriver.php

Indentation +11 added lines, -11 removed lines

@@ -121,9 +121,9 @@ 
      */
     public function lastInsertedId()
     {
-       // Postgres does not set pdo->lastInsertedId
-       // use sequence
-       try {
+        // Postgres does not set pdo->lastInsertedId
+        // use sequence
+        try {
             $rq = $this->pdo->prepare('SELECT LASTVAL()');
             $rq->execute();
             return $rq->fetchColumn();
@@ -168,11 +168,11 @@ 
     public function addForeignKey($fkName, $srcTable, $srcColumn, $refTable, $refColumn)
     {
         $sql = sprintf('ALTER TABLE %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)',
-                       $this->escape($srcTable),
-                       $fkName,
-                       $this->escape($srcColumn),
-                       $this->escape($refTable),
-                       $this->escape($refColumn)
+                        $this->escape($srcTable),
+                        $fkName,
+                        $this->escape($srcColumn),
+                        $this->escape($refTable),
+                        $this->escape($refColumn)
         );
         return $this->prepareAndExecuteSql($sql);
     }
@@ -189,9 +189,9 @@ 
     public function dropForeignKey($fkName, $tableName, $ifExists = false)
     {
         $sql = sprintf('ALTER TABLE %s DROP CONSTRAINT %s %s',
-                       $this->escape($tableName),
-                       $ifExists ? 'IF EXISTS' : '',
-                       $fkName
+                        $this->escape($tableName),
+                        $ifExists ? 'IF EXISTS' : '',
+                        $fkName
         );
         return $this->prepareAndExecuteSql($sql);
     }

Spacing +7 added lines, -7 removed lines

@@ -100,9 +100,9 @@ 
      */
     public function createConnection(array $settings)
     {
-        $port    = !empty($settings['port'])     ?  ';port='.$settings['port']        : '';
-        $dbname  = !empty($settings['database']) ?  ';dbname='.$settings['database']  : '';
-        $dsn     = 'pgsql:host='.$settings['hostname'] .$port .$dbname ;
+        $port    = !empty($settings['port']) ? ';port='.$settings['port'] : '';
+        $dbname  = !empty($settings['database']) ? ';dbname='.$settings['database'] : '';
+        $dsn     = 'pgsql:host='.$settings['hostname'].$port.$dbname;
 
         $this->pdo = new \PDO(
             $dsn,
@@ -208,7 +208,7 @@ 
     {
         $sql = 'SELECT COUNT(*) FROM pg_database WHERE datname = :dbName'; 
         $query = $this->pdo->prepare($sql);
-        $query->bindValue(':dbName',  $databaseName, \PDO::PARAM_STR);
+        $query->bindValue(':dbName', $databaseName, \PDO::PARAM_STR);
         $query->execute();
         return (bool) $query->fetchColumn();
     }
@@ -227,7 +227,7 @@ 
     {
         $sql = trim(sprintf('CREATE DATABASE %s %s TEMPLATE %s', 
             $this->escape($databaseName),
-            isset($owner) ? 'OWNER '. $this->escape($owner) : '', 
+            isset($owner) ? 'OWNER '.$this->escape($owner) : '', 
             $template
         ));
         return $this->prepareAndExecuteSql($sql);
@@ -246,7 +246,7 @@ 
     {
         $sql = trim(sprintf('CREATE USER %s PASSWORD %s', 
                     $this->escape($userName), 
-                    "'" . $userPassword ."'"
+                    "'".$userPassword."'"
         ));
         return $this->prepareAndExecuteSql($sql);
     }
@@ -263,7 +263,7 @@ 
     public function dropUser($userName, $ifExists = false)
     {
         $sql = trim(sprintf('DROP USER %s %s', 
-                    $ifExists === true ? 'IF EXISTS': '',
+                    $ifExists === true ? 'IF EXISTS' : '',
                     $this->escape($userName)
         ));
         return $this->prepareAndExecuteSql($sql);

Braces +1 added lines, -2 removed lines

@@ -127,8 +127,7 @@
             $rq = $this->pdo->prepare('SELECT LASTVAL()');
             $rq->execute();
             return $rq->fetchColumn();
-        }
-        catch (\PDOException $e) {
+        } catch (\PDOException $e) {
             return 0;
         }
     }

lib/Driver/DatabaseDriver.php

Spacing +6 added lines, -6 removed lines

@@ -164,15 +164,15 @@ 
     {
         // check for required attributes
         foreach ($this->dsnAttributes as $attribute) {
-            if (! array_key_exists($attribute, $settings)) {
+            if (!array_key_exists($attribute, $settings)) {
                 throw new Exception\MissingArgException('This configuration parameter is missing: "'.$attribute.'"');
             }
         }
 
         // defaut output format
-        if (array_key_exists('default_output_format', $settings)){
+        if (array_key_exists('default_output_format', $settings)) {
             $format = $settings['default_output_format'];
-            if (!in_array($format, $this->outputFormats)){
+            if (!in_array($format, $this->outputFormats)) {
                 throw new Exception\InvalidArgException('The default output format specified is invalid.');
             } 
             $this->defaultOutputFormat = $format;
@@ -180,7 +180,7 @@ 
 
         $this->createConnection($settings);
         $this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
-        $this->hostname = array_key_exists('hostname',$settings) && $settings['hostname'] ? $settings['hostname'] : '';
+        $this->hostname = array_key_exists('hostname', $settings) && $settings['hostname'] ? $settings['hostname'] : '';
         $this->driverName = $settings['driver'];
     }
 
@@ -214,7 +214,7 @@ 
      */
     public function errorCode()
     {
-        return !empty($this->error) ? $this->error['code']: '';
+        return !empty($this->error) ? $this->error['code'] : '';
     }
 
     /**
@@ -258,7 +258,7 @@ 
             return $pdoStatement->execute($parameters);
         } catch (\PDOException $e) {
             // register error
-            $this->error['code'] = (int)$e->getCode();
+            $this->error['code'] = (int) $e->getCode();
             $this->error['message'] = $e->getMessage();
             return false;
         }

Indentation +5 added lines, -5 removed lines

@@ -33,7 +33,7 @@ 
  */
 abstract class DatabaseDriver
 {
-   /**
+    /**
      * PDO connection
      *
      * @access protected
@@ -74,9 +74,9 @@ 
      * @var string
      */
     public function sqlCreateTableOptions()
-     {
+        {
         return '';    
-     } 
+        } 
 
     /**
      * Gets/returns the default output format 
@@ -135,8 +135,8 @@ 
      */
     public function escape($str)
     {
-       $list = explode('.', $str);
-       return implode('.', $this->escapeList($list));
+        $list = explode('.', $str);
+        return implode('.', $this->escapeList($list));
     }
 
     /**

lib/Driver/ServerDriver.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     public function __construct(array $settings, $isServerConnection = false)
     {
         // remove database attribute for server connection
-        if ($isServerConnection){
+        if ($isServerConnection) {
             $dbKey = array_search('database', $this->dsnAttributes);
             if ($dbKey !== false) {
                 unset($this->dsnAttributes[$dbKey]);