Add Sql prefix to all classes

src/SqlConnection.php

@@ -0,0 +1,31 @@
+<?php declare(strict_types=1);
+
+namespace Amp\Sql;
+
+/**
+ * @template TConfig of SqlConfig
+ * @template TResult of SqlResult
+ * @template TStatement of SqlStatement<TResult>
+ * @template TTransaction of SqlTransaction
+ *
+ * @extends SqlLink<TResult, TStatement, TTransaction>
+ */
+interface SqlConnection extends SqlLink
+{
+    /**
+     * @return TConfig The configuration used to create this connection.
+     */
+    public function getConfig(): SqlConfig;
+
+    /**
+     * @return SqlTransactionIsolation Current transaction isolation used when beginning transactions on this connection.
+     */
+    public function getTransactionIsolation(): SqlTransactionIsolation;
+
+    /**
+     * Sets the transaction isolation level for transactions began on this link.
+     *
+     * @see SqlLink::beginTransaction()
+     */
+    public function setTransactionIsolation(SqlTransactionIsolation $isolation): void;
+}

src/ConnectionException.php → src/SqlConnectionException.php

@@ -2,6 +2,6 @@
 
 namespace Amp\Sql;
 
-class ConnectionException extends SqlException
+class SqlConnectionException extends SqlException
 {
 }

src/Pool.php → src/SqlConnectionPool.php

@@ -4,21 +4,21 @@
 
 /**
  * @template TConfig of SqlConfig
- * @template TResult of Result
- * @template TStatement of Statement<TResult>
- * @template TTransaction of Transaction
+ * @template TResult of SqlResult
+ * @template TStatement of SqlStatement<TResult>
+ * @template TTransaction of SqlTransaction
  *
- * @extends Connection<TConfig, TResult, TStatement, TTransaction>
+ * @extends SqlConnection<TConfig, TResult, TStatement, TTransaction>
  */
-interface Pool extends Connection
+interface SqlConnectionPool extends SqlConnection
 {
     /**
      * Gets a single connection from the pool to run a set of queries against a single connection.
      * Generally a transaction should be used instead of this method.
      *
-     * @return Connection<TConfig, TResult, TStatement, TTransaction>
+     * @return SqlConnection<TConfig, TResult, TStatement, TTransaction>
      */
-    public function extractConnection(): Connection;
+    public function extractConnection(): SqlConnection;
 
     /**
      * @return int Total number of active connections in the pool.

src/SqlConnector.php

@@ -6,7 +6,7 @@
 
 /**
  * @template TConfig of SqlConfig
- * @template TConnection of Connection
+ * @template TConnection of SqlConnection
  */
 interface SqlConnector
 {
@@ -18,7 +18,7 @@ interface SqlConnector
      *
      * @return TConnection
      *
-     * @throws ConnectionException
+     * @throws SqlConnectionException
      */
-    public function connect(SqlConfig $config, ?Cancellation $cancellation = null): Connection;
+    public function connect(SqlConfig $config, ?Cancellation $cancellation = null): SqlConnection;
 }

src/SqlExecutor.php

@@ -0,0 +1,44 @@
+<?php declare(strict_types=1);
+
+namespace Amp\Sql;
+
+/**
+ * @template TResult of SqlResult
+ * @template TStatement of SqlStatement
+ */
+interface SqlExecutor extends SqlTransientResource
+{
+    /**
+     * @param string $sql SQL query to execute.
+     *
+     * @return TResult
+     *
+     * @throws SqlException If the operation fails due to unexpected condition.
+     * @throws SqlConnectionException If the connection to the database is lost.
+     * @throws SqlQueryError If the operation fails due to an error in the query (such as a syntax error).
+     */
+    public function query(string $sql): SqlResult;
+
+    /**
+     * @param string $sql SQL query to prepare.
+     *
+     * @return TStatement
+     *
+     * @throws SqlException If the operation fails due to unexpected condition.
+     * @throws SqlConnectionException If the connection to the database is lost.
+     * @throws SqlQueryError If the operation fails due to an error in the query (such as a syntax error).
+     */
+    public function prepare(string $sql): SqlStatement;
+
+    /**
+     * @param string $sql SQL query to prepare and execute.
+     * @param array<int, mixed>|array<string, mixed> $params Query parameters.
+     *
+     * @return TResult
+     *
+     * @throws SqlException If the operation fails due to unexpected condition.
+     * @throws SqlConnectionException If the connection to the database is lost.
+     * @throws SqlQueryError If the operation fails due to an error in the query (such as a syntax error).
+     */
+    public function execute(string $sql, array $params = []): SqlResult;
+}

src/SqlLink.php

@@ -0,0 +1,20 @@
+<?php declare(strict_types=1);
+
+namespace Amp\Sql;
+
+/**
+ * @template TResult of SqlResult
+ * @template TStatement of SqlStatement<TResult>
+ * @template TTransaction of SqlTransaction
+ *
+ * @extends SqlExecutor<TResult, TStatement>
+ */
+interface SqlLink extends SqlExecutor
+{
+    /**
+     * Starts a transaction, returning an object where all queries are executed on a single connection.
+     *
+     * @return TTransaction
+     */
+    public function beginTransaction(): SqlTransaction;
+}

src/QueryError.php → src/SqlQueryError.php

@@ -2,7 +2,7 @@
 
 namespace Amp\Sql;
 
-class QueryError extends \Error
+class SqlQueryError extends \Error
 {
     public function __construct(
         string $message,

src/Result.php → src/SqlResult.php

@@ -6,7 +6,7 @@
  * @template TFieldValue
  * @extends \Traversable<int, array<string, TFieldValue>>
  */
-interface Result extends \Traversable
+interface SqlResult extends \Traversable
 {
     /**
      * Returns the next row in the result set or null if no rows remain. This method may be used as an alternative
@@ -20,7 +20,7 @@ public function fetchRow(): ?array;
      * Resolves with a new instance of Result if another result is available after this result. Resolves with null if
      * no further results are available.
      *
-     * @return Result<TFieldValue>|null
+     * @return SqlResult<TFieldValue>|null
      */
     public function getNextResult(): ?self;
 

src/Statement.php → src/SqlStatement.php

@@ -3,14 +3,14 @@
 namespace Amp\Sql;
 
 /**
- * @template TResult of Result
+ * @template TResult of SqlResult
  */
-interface Statement extends TransientResource
+interface SqlStatement extends SqlTransientResource
 {
     /**
      * @return TResult
      */
-    public function execute(array $params = []): Result;
+    public function execute(array $params = []): SqlResult;
 
     /**
      * @return string The SQL string used to prepare the statement.

src/Transaction.php → src/SqlTransaction.php

@@ -3,15 +3,15 @@
 namespace Amp\Sql;
 
 /**
- * @template TResult of Result
- * @template TStatement of Statement<TResult>
- * @template TTransaction of Transaction
+ * @template TResult of SqlResult
+ * @template TStatement of SqlStatement<TResult>
+ * @template TTransaction of SqlTransaction
  *
- * @extends Link<TResult, TStatement, TTransaction>
+ * @extends SqlLink<TResult, TStatement, TTransaction>
  */
-interface Transaction extends Link
+interface SqlTransaction extends SqlLink
 {
-    public function getIsolation(): TransactionIsolation;
+    public function getIsolation(): SqlTransactionIsolation;
 
     /**
      * @return bool True if the transaction is active, false if it has been committed or rolled back.
@@ -26,14 +26,14 @@ public function getSavepointIdentifier(): ?string;
     /**
      * Commits the transaction and makes it inactive.
      *
-     * @throws TransactionError If the transaction has been committed or rolled back.
+     * @throws SqlTransactionError If the transaction has been committed or rolled back.
      */
     public function commit(): void;
 
     /**
      * Rolls back the transaction and makes it inactive.
      *
-     * @throws TransactionError If the transaction has been committed or rolled back.
+     * @throws SqlTransactionError If the transaction has been committed or rolled back.
      */
     public function rollback(): void;
 

src/TransactionError.php → src/SqlTransactionError.php

@@ -2,6 +2,6 @@
 
 namespace Amp\Sql;
 
-class TransactionError extends \Error
+class SqlTransactionError extends \Error
 {
 }

src/TransactionIsolation.php → src/SqlTransactionIsolation.php

@@ -2,7 +2,7 @@
 
 namespace Amp\Sql;
 
-interface TransactionIsolation
+interface SqlTransactionIsolation
 {
     /**
      * @return string Human-readable label for the transaction isolation level.

src/TransactionIsolationLevel.php → src/SqlTransactionIsolationLevel.php

@@ -2,7 +2,7 @@
 
 namespace Amp\Sql;
 
-enum TransactionIsolationLevel implements TransactionIsolation
+enum SqlTransactionIsolationLevel implements SqlTransactionIsolation
 {
     case Uncommitted;
     case Committed;

src/TransientResource.php → src/SqlTransientResource.php

@@ -4,7 +4,7 @@
 
 use Amp\Closable;
 
-interface TransientResource extends Closable
+interface SqlTransientResource extends Closable
 {
     /**
      * Get the timestamp of the last usage of this resource.