ondrej-bouda / ivory

src/Ivory/Connection/Connection.php

Indentation +261 added lines, -261 removed lines

@@ -8,103 +8,103 @@ 
 // TODO: consider introducing factory methods for abbreviating relation creating; e.g., new QueryRelation($conn, $query)
 class Connection implements IConnection
 {
-	use NotSerializable; // TODO: implement connection serialization instead of giving up
-
-	private $name;
-	private $connCtl;
-	private $typeCtl;
-	private $stmtExec;
-	private $copyCtl;
-	private $txCtl;
-	private $ipcCtl;
-
-	private $config;
-
-
-	/**
-	 * @param string $name name for the connection
-	 * @param ConnectionParameters|array|string $params either a connection parameters object, or an associative array
-	 *                                                    of parameters for {@link ConnectionParameters::__construct()},
-	 *                                                    or a URL for {@link ConnectionParameters::fromUrl()},
-	 *                                                    or a PostgreSQL connection string (see {@link pg_connect()})
-	 */
-	public function __construct($name, $params)
-	{
-		$this->name = $name;
-		$this->connCtl = new ConnectionControl($params); // TODO: extract all usages of ConnectionControl::requireConnection() - consider introducing an interface specifying the method, named like PGSQLDriver or ConnectionManager or ConnectionPool
-		$this->typeCtl = new TypeControl($this, $this->connCtl);
-		$this->stmtExec = new StatementExecution($this->connCtl, $this->typeCtl);
-		$this->copyCtl = new CopyControl();
-		$this->txCtl = new TransactionControl($this->connCtl, $this->stmtExec);
-		$this->ipcCtl = new IPCControl($this->connCtl);
-		$this->config = new ConnConfig($this->connCtl, $this->stmtExec, $this->txCtl);
-	}
-
-	final public function getName()
-	{
-		return $this->name;
-	}
-
-	final public function getConfig()
-	{
-		return $this->config;
-	}
-
-
-	//region Connection Control
-
-	public function getParameters()
-	{
-		return $this->connCtl->getParameters();
-	}
-
-	public function isConnected()
-	{
-		return $this->connCtl->isConnected();
-	}
-
-	public function isConnectedWait()
-	{
-		return $this->connCtl->isConnectedWait();
-	}
-
-	public function connect()
-	{
-		return $this->connCtl->connect();
-	}
-
-	public function connectWait()
-	{
-		return $this->connCtl->connectWait();
-	}
-
-	public function disconnect()
-	{
-		return $this->connCtl->disconnect();
-	}
-
-	//endregion
-
-	//region Type Control
-
-	public function getTypeRegister()
-	{
-		return $this->typeCtl->getTypeRegister();
-	}
-
-	public function getTypeDictionary()
-	{
-		return $this->typeCtl->getTypeDictionary();
-	}
-
-	public function flushTypeDictionary()
-	{
-		$this->typeCtl->flushTypeDictionary();
-	}
-
-	//endregion
-
-	//region Statement Execution
+    use NotSerializable; // TODO: implement connection serialization instead of giving up
+
+    private $name;
+    private $connCtl;
+    private $typeCtl;
+    private $stmtExec;
+    private $copyCtl;
+    private $txCtl;
+    private $ipcCtl;
+
+    private $config;
+
+
+    /**
+     * @param string $name name for the connection
+     * @param ConnectionParameters|array|string $params either a connection parameters object, or an associative array
+     *                                                    of parameters for {@link ConnectionParameters::__construct()},
+     *                                                    or a URL for {@link ConnectionParameters::fromUrl()},
+     *                                                    or a PostgreSQL connection string (see {@link pg_connect()})
+     */
+    public function __construct($name, $params)
+    {
+        $this->name = $name;
+        $this->connCtl = new ConnectionControl($params); // TODO: extract all usages of ConnectionControl::requireConnection() - consider introducing an interface specifying the method, named like PGSQLDriver or ConnectionManager or ConnectionPool
+        $this->typeCtl = new TypeControl($this, $this->connCtl);
+        $this->stmtExec = new StatementExecution($this->connCtl, $this->typeCtl);
+        $this->copyCtl = new CopyControl();
+        $this->txCtl = new TransactionControl($this->connCtl, $this->stmtExec);
+        $this->ipcCtl = new IPCControl($this->connCtl);
+        $this->config = new ConnConfig($this->connCtl, $this->stmtExec, $this->txCtl);
+    }
+
+    final public function getName()
+    {
+        return $this->name;
+    }
+
+    final public function getConfig()
+    {
+        return $this->config;
+    }
+
+
+    //region Connection Control
+
+    public function getParameters()
+    {
+        return $this->connCtl->getParameters();
+    }
+
+    public function isConnected()
+    {
+        return $this->connCtl->isConnected();
+    }
+
+    public function isConnectedWait()
+    {
+        return $this->connCtl->isConnectedWait();
+    }
+
+    public function connect()
+    {
+        return $this->connCtl->connect();
+    }
+
+    public function connectWait()
+    {
+        return $this->connCtl->connectWait();
+    }
+
+    public function disconnect()
+    {
+        return $this->connCtl->disconnect();
+    }
+
+    //endregion
+
+    //region Type Control
+
+    public function getTypeRegister()
+    {
+        return $this->typeCtl->getTypeRegister();
+    }
+
+    public function getTypeDictionary()
+    {
+        return $this->typeCtl->getTypeDictionary();
+    }
+
+    public function flushTypeDictionary()
+    {
+        $this->typeCtl->flushTypeDictionary();
+    }
+
+    //endregion
+
+    //region Statement Execution
 
     public function query($sqlFragmentPatternOrRecipe, ...$fragmentsAndPositionalParamsAndNamedParamsMap)
     {
@@ -116,172 +116,172 @@ 
         return $this->stmtExec->command($sqlFragmentPatternOrRecipe, ...$fragmentsAndPositionalParamsAndNamedParamsMap);
     }
 
-	public function rawQuery(string $sqlStatement)
-	{
-		return $this->stmtExec->rawQuery($sqlStatement);
-	}
+    public function rawQuery(string $sqlStatement)
+    {
+        return $this->stmtExec->rawQuery($sqlStatement);
+    }
 
-	public function rawMultiQuery($sqlStatements)
-	{
-		return $this->stmtExec->rawMultiQuery($sqlStatements);
-	}
+    public function rawMultiQuery($sqlStatements)
+    {
+        return $this->stmtExec->rawMultiQuery($sqlStatements);
+    }
 
-	public function runScript($sqlScript)
-	{
-		return $this->stmtExec->runScript($sqlScript);
-	}
+    public function runScript($sqlScript)
+    {
+        return $this->stmtExec->runScript($sqlScript);
+    }
 
     public function getStatementExceptionFactory()
-   	{
-   		return $this->stmtExec->getStatementExceptionFactory();
-   	}
-
-	//endregion
-
-	//region Copy Control
-
-	public function copyFromFile($file, $table, $columns = null, $options = [])
-	{
-		return $this->copyCtl->copyFromFile($file, $table, $columns, $options);
-	}
-
-	public function copyFromProgram($program, $table, $columns = null, $options = [])
-	{
-		return $this->copyCtl->copyFromProgram($program, $table, $columns, $options);
-	}
-
-	public function copyFromInput($table, $columns = null, $options = [])
-	{
-		return $this->copyCtl->copyFromInput($table, $columns, $options);
-	}
-
-	public function copyToFile($file, $tableOrQuery, $columns = null, $options = [])
-	{
-		return $this->copyCtl->copyToFile($file, $tableOrQuery, $columns, $options);
-	}
-
-	public function copyToProgram($program, $tableOrQuery, $columns = null, $options = [])
-	{
-		return $this->copyCtl->copyToProgram($program, $tableOrQuery, $columns, $options);
-	}
-
-	public function copyToArray($table, $options = [])
-	{
-		return $this->copyCtl->copyToArray($table, $options);
-	}
-
-	//endregion
-
-	//region Transaction Control
-
-	public function inTransaction()
-	{
-		return $this->txCtl->inTransaction();
-	}
-
-	public function startTransaction($transactionOptions = 0)
-	{
-		return $this->txCtl->startTransaction($transactionOptions);
-	}
-
-	public function setupTransaction($transactionOptions)
-	{
-		$this->txCtl->setupTransaction($transactionOptions);
-	}
-
-	public function setupSubsequentTransactions($transactionOptions)
-	{
-		$this->txCtl->setupSubsequentTransactions($transactionOptions);
-	}
-
-	public function commit()
-	{
-		return $this->txCtl->commit();
-	}
-
-	public function rollback()
-	{
-		return $this->txCtl->rollback();
-	}
-
-	public function savepoint($name)
-	{
-		$this->txCtl->savepoint($name);
-	}
-
-	public function rollbackToSavepoint($name)
-	{
-		$this->txCtl->rollbackToSavepoint($name);
-	}
-
-	public function releaseSavepoint($name)
-	{
-		$this->txCtl->releaseSavepoint($name);
-	}
-
-	public function setTransactionSnapshot($snapshotId)
-	{
-		return $this->txCtl->setTransactionSnapshot($snapshotId);
-	}
-
-	public function exportTransactionSnapshot()
-	{
-		return $this->txCtl->exportTransactionSnapshot();
-	}
-
-	public function prepareTransaction($name)
-	{
-		return $this->txCtl->prepareTransaction($name);
-	}
-
-	public function commitPreparedTransaction($name)
-	{
-		$this->txCtl->commitPreparedTransaction($name);
-	}
-
-	public function rollbackPreparedTransaction($name)
-	{
-		$this->txCtl->rollbackPreparedTransaction($name);
-	}
-
-	public function listPreparedTransactions()
-	{
-		return $this->txCtl->listPreparedTransactions();
-	}
-
-	//endregion
-
-	//region IPC Control
-
-	public function getBackendPID()
-	{
-		return $this->ipcCtl->getBackendPID();
-	}
-
-	public function notify($channel, $payload = null)
-	{
-		$this->ipcCtl->notify($channel, $payload);
-	}
-
-	public function listen($channel)
-	{
-		$this->ipcCtl->listen($channel);
-	}
-
-	public function unlisten($channel)
-	{
-		$this->ipcCtl->unlisten($channel);
-	}
-
-	public function unlistenAll()
-	{
-		$this->ipcCtl->unlistenAll();
-	}
-
-	public function pollNotification()
-	{
-		return $this->ipcCtl->pollNotification();
-	}
-
-	//endregion
+        {
+            return $this->stmtExec->getStatementExceptionFactory();
+        }
+
+    //endregion
+
+    //region Copy Control
+
+    public function copyFromFile($file, $table, $columns = null, $options = [])
+    {
+        return $this->copyCtl->copyFromFile($file, $table, $columns, $options);
+    }
+
+    public function copyFromProgram($program, $table, $columns = null, $options = [])
+    {
+        return $this->copyCtl->copyFromProgram($program, $table, $columns, $options);
+    }
+
+    public function copyFromInput($table, $columns = null, $options = [])
+    {
+        return $this->copyCtl->copyFromInput($table, $columns, $options);
+    }
+
+    public function copyToFile($file, $tableOrQuery, $columns = null, $options = [])
+    {
+        return $this->copyCtl->copyToFile($file, $tableOrQuery, $columns, $options);
+    }
+
+    public function copyToProgram($program, $tableOrQuery, $columns = null, $options = [])
+    {
+        return $this->copyCtl->copyToProgram($program, $tableOrQuery, $columns, $options);
+    }
+
+    public function copyToArray($table, $options = [])
+    {
+        return $this->copyCtl->copyToArray($table, $options);
+    }
+
+    //endregion
+
+    //region Transaction Control
+
+    public function inTransaction()
+    {
+        return $this->txCtl->inTransaction();
+    }
+
+    public function startTransaction($transactionOptions = 0)
+    {
+        return $this->txCtl->startTransaction($transactionOptions);
+    }
+
+    public function setupTransaction($transactionOptions)
+    {
+        $this->txCtl->setupTransaction($transactionOptions);
+    }
+
+    public function setupSubsequentTransactions($transactionOptions)
+    {
+        $this->txCtl->setupSubsequentTransactions($transactionOptions);
+    }
+
+    public function commit()
+    {
+        return $this->txCtl->commit();
+    }
+
+    public function rollback()
+    {
+        return $this->txCtl->rollback();
+    }
+
+    public function savepoint($name)
+    {
+        $this->txCtl->savepoint($name);
+    }
+
+    public function rollbackToSavepoint($name)
+    {
+        $this->txCtl->rollbackToSavepoint($name);
+    }
+
+    public function releaseSavepoint($name)
+    {
+        $this->txCtl->releaseSavepoint($name);
+    }
+
+    public function setTransactionSnapshot($snapshotId)
+    {
+        return $this->txCtl->setTransactionSnapshot($snapshotId);
+    }
+
+    public function exportTransactionSnapshot()
+    {
+        return $this->txCtl->exportTransactionSnapshot();
+    }
+
+    public function prepareTransaction($name)
+    {
+        return $this->txCtl->prepareTransaction($name);
+    }
+
+    public function commitPreparedTransaction($name)
+    {
+        $this->txCtl->commitPreparedTransaction($name);
+    }
+
+    public function rollbackPreparedTransaction($name)
+    {
+        $this->txCtl->rollbackPreparedTransaction($name);
+    }
+
+    public function listPreparedTransactions()
+    {
+        return $this->txCtl->listPreparedTransactions();
+    }
+
+    //endregion
+
+    //region IPC Control
+
+    public function getBackendPID()
+    {
+        return $this->ipcCtl->getBackendPID();
+    }
+
+    public function notify($channel, $payload = null)
+    {
+        $this->ipcCtl->notify($channel, $payload);
+    }
+
+    public function listen($channel)
+    {
+        $this->ipcCtl->listen($channel);
+    }
+
+    public function unlisten($channel)
+    {
+        $this->ipcCtl->unlisten($channel);
+    }
+
+    public function unlistenAll()
+    {
+        $this->ipcCtl->unlistenAll();
+    }
+
+    public function pollNotification()
+    {
+        return $this->ipcCtl->pollNotification();
+    }
+
+    //endregion
 }

src/Ivory/Connection/StatementExecution.php

Braces +3 added lines, -6 removed lines

@@ -38,8 +38,7 @@ 
                 $namedParamsMap = $fragmentsAndPositionalParamsAndNamedParamsMap[0];
                 $recipe->setParams($namedParamsMap);
             }
-        }
-        else {
+        } else {
             $recipe = SqlRelationRecipe::fromFragments($sqlFragmentPatternOrRecipe, ...$fragmentsAndPositionalParamsAndNamedParamsMap);
         }
 
@@ -58,8 +57,7 @@ 
                 $namedParamsMap = $fragmentsAndPositionalParamsAndNamedParamsMap[0];
                 $recipe->setParams($namedParamsMap);
             }
-        }
-        else {
+        } else {
             $recipe = SqlCommandRecipe::fromFragments($sqlFragmentPatternOrRecipe, ...$fragmentsAndPositionalParamsAndNamedParamsMap);
         }
 
@@ -180,8 +178,7 @@ 
         if ($resNotice !== $connNotice) {
             $this->connCtl->setLastNotice($resNotice);
             return $resNotice;
-        }
-        else {
+        } else {
             return null;
         }
     }

src/Ivory/Query/SqlRecipe.php

Braces +7 added lines, -14 removed lines

@@ -142,14 +142,12 @@ 
                 if (is_string($curFragment)) {
                     $parser = \Ivory\Ivory::getSqlPatternParser();
                     $curFragment = $parser->parse($curFragment);
-                }
-                elseif ((is_array($curFragment) || $curFragment instanceof \Traversable) && // PHP 7.1: is_iterable()
+                } elseif ((is_array($curFragment) || $curFragment instanceof \Traversable) && // PHP 7.1: is_iterable()
                     $argsProcessed > 0 && !array_key_exists($argsProcessed, $fragmentsAndPositionalParams))
                 {
                     $namedParamValues = $curFragment;
                     break;
-                }
-                else {
+                } else {
                     $ord = StringUtils::englishOrd($curFragmentNum);
                     throw new \InvalidArgumentException("Invalid type of $ord fragment. Isn't it a misplaced parameter value?");
                 }
@@ -195,8 +193,7 @@ 
             $posParams = array_slice($fragmentsAndPositionalParams, $argsProcessed, $plcHdrCnt);
             if (count($posParams) == $plcHdrCnt) {
                 $overallPosParams = array_merge($overallPosParams, $posParams);
-            }
-            else {
+            } else {
                 $ord = StringUtils::englishOrd($curFragmentNum);
                 throw new \InvalidArgumentException("Not enough positional parameters for the $ord fragment");
             }
@@ -239,8 +236,7 @@ 
     {
         if (isset($this->unsatisfiedParams[$nameOrPosition])) {
             unset($this->unsatisfiedParams[$nameOrPosition]);
-        }
-        elseif (!array_key_exists($nameOrPosition, $this->params)) {
+        } elseif (!array_key_exists($nameOrPosition, $this->params)) {
             throw new \InvalidArgumentException("The SQL pattern does not have parameter '$nameOrPosition'");
         }
 
@@ -287,8 +283,7 @@ 
             $names = array_keys($this->unsatisfiedParams);
             if (count($names) == 1) {
                 $msg = sprintf('Value for parameter "%s" has not been set.', $names[0]);
-            }
-            else {
+            } else {
                 $msg = sprintf(
                     'Values for parameters %s and "%s" have not been set.',
                     array_map(function ($s) { return "\"$s\""; }, array_slice($names, 0, -1))
@@ -318,14 +313,12 @@ 
                     if (!$placeholder->isSchemaNameQuoted()) {
                         $schemaName = mb_strtolower($schemaName); // OPT: SqlPatternPlaceholder might also store the lower-case name, which might be cached
                     }
-                }
-                elseif ($placeholder->isTypeNameQuoted()) {
+                } elseif ($placeholder->isTypeNameQuoted()) {
                     $schemaName = false;
                 }
 
                 $converter = $typeDictionary->requireTypeByName($typeName, $schemaName);
-            }
-            else {
+            } else {
                 $converter = $typeDictionary->requireTypeByValue($value);
             }
             $serializedValue = $converter->serializeValue($value);

src/Ivory/Result/CommandResult.php

Indentation +7 added lines, -7 removed lines

@@ -3,13 +3,13 @@
 
 class CommandResult extends Result implements ICommandResult
 {
-	public function __construct($resultHandler, $lastNotice = null)
-	{
-		parent::__construct($resultHandler, $lastNotice);
-	}
+    public function __construct($resultHandler, $lastNotice = null)
+    {
+        parent::__construct($resultHandler, $lastNotice);
+    }
 
-	public function getAffectedRows()
-	{
+    public function getAffectedRows()
+    {
         return pg_affected_rows($this->handler);
-	}
+    }
 }