[2.x] Mysqli redesign

Tests/Mysqli/MysqliStatementTest.php

@@ -83,7 +83,7 @@ public function testStatementPreparesManyArrayValues()
 	{
 		$query = 'SELECT * FROM dbtest WHERE id IN (:preparedArray1,:preparedArray2,:preparedArray3,:preparedArray4,:preparedArray5,:preparedArray6,:preparedArray7,:preparedArray8,:preparedArray9,:preparedArray10)';
 
-		new MysqliStatement(static::$connection->getConnection(), $query);
+		new MysqliStatement(static::$connection->getConnection()->stmt_init(), $query);
 	}
 
 	/**
@@ -95,7 +95,7 @@ public function testStatementWithKeysMatching()
     {
         $query = 'SELECT * FROM dbtest WHERE `id` = :id AND `title` = :id_title';
 
-		new MysqliStatement(static::$connection->getConnection(), $query);
+		new MysqliStatement(static::$connection->getConnection()->stmt_init(), $query);
     }
 
     /**
@@ -108,6 +108,6 @@ public function testStatementWithMultipleUseOfVars()
     {
         $query = 'SELECT * FROM `dbtest` WHERE `description` LIKE :search_term AND `title` LIKE :search_term';
 
-		new MysqliStatement(static::$connection->getConnection(), $query);
+		new MysqliStatement(static::$connection->getConnection()->stmt_init(), $query);
     }
 }

src/DatabaseDriver.php

@@ -838,8 +838,8 @@ protected function getAlterDbCharacterSet($dbName)
 	/**
 	 * Return the query string to create new Database.
 	 *
-	 * @param   stdClass  $options  Object used to pass user and database name to database driver. This object must have "db_name" and "db_user" set.
-	 * @param   boolean   $utf      True if the database supports the UTF-8 character set.
+	 * @param   \stdClass  $options  Object used to pass user and database name to database driver. This object must have "db_name" and "db_user" set.
+	 * @param   boolean    $utf      True if the database supports the UTF-8 character set.
 	 *
 	 * @return  string  The query that creates database
 	 *

src/DatabaseInterface.php

@@ -130,13 +130,12 @@ public function getCollation();
 	public function getConnection();
 
 	/**
-	 * Method to get the database connection collation, as reported by the driver.
+	 * Method to get the database connection collation in use by sampling a text field of a table in the database.
 	 *
-	 * If the connector doesn't support reporting this value please return an empty string.
-	 *
-	 * @return  string
+	 * @return  string|boolean  The collation in use by the database connection (string) or boolean false if not supported.
 	 *
 	 * @since   2.0.0
+	 * @throws  \RuntimeException
 	 */
 	public function getConnectionCollation();
 
@@ -256,16 +255,16 @@ public function getServerType();
 	public function getTableColumns($table, $typeOnly = true);
 
 	/**
-	 * Retrieves field information about the given tables.
+	 * Get the details list of keys for a table.
 	 *
-	 * @param   mixed  $tables  A table name or a list of table names.
+	 * @param   string  $table  The name of the table.
 	 *
-	 * @return  array
+	 * @return  array  An array of the column specification for the table.
 	 *
 	 * @since   2.0.0
 	 * @throws  \RuntimeException
 	 */
-	public function getTableKeys($tables);
+	public function getTableKeys($table);
 
 	/**
 	 * Method to get an array of all tables in the database.
@@ -450,7 +449,7 @@ public function lockTable($tableName);
 	 * @param   array|string  $text    A string or an array of strings to quote.
 	 * @param   boolean       $escape  True (default) to escape the string, false to leave it unchanged.
 	 *
-	 * @return  string
+	 * @return  string|array
 	 *
 	 * @since   2.0.0
 	 */

src/DatabaseQuery.php

@@ -250,7 +250,7 @@ abstract class DatabaseQuery implements QueryInterface
 	/**
 	 * The query object.
 	 *
-	 * @var    Query\DatabaseQuery
+	 * @var    DatabaseQuery
 	 * @since  2.0.0
 	 */
 	protected $querySet;

src/Mysql/MysqlDriver.php

@@ -388,8 +388,8 @@ public function isConnectionEncryptionSupported(): bool
 	/**
 	 * Return the query string to create new Database.
 	 *
-	 * @param   stdClass  $options  Object used to pass user and database name to database driver. This object must have "db_name" and "db_user" set.
-	 * @param   boolean   $utf      True if the database supports the UTF-8 character set.
+	 * @param   \stdClass  $options  Object used to pass user and database name to database driver. This object must have "db_name" and "db_user" set.
+	 * @param   boolean    $utf      True if the database supports the UTF-8 character set.
 	 *
 	 * @return  string  The query that creates database
 	 *