Database - Make sql query mixed instead of string since most nosql databases use arrays

najdanovicivan · najdanovicivan · commit 8550a967e033 · 2021-01-07T14:02:00.000+01:00
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
@@ -586,11 +586,11 @@ public function addTableAlias(string $table)
 	/**
 	 * Executes the query against the database.
 	 *
-	 * @param string $sql
+	 * @param mixed $sql
 	 *
 	 * @return mixed
 	 */
-	abstract protected function execute(string $sql);
+	abstract protected function execute($sql);
 
 	//--------------------------------------------------------------------
 
@@ -602,14 +602,14 @@ abstract protected function execute(string $sql);
 	 * Should automatically handle different connections for read/write
 	 * queries if needed.
 	 *
-	 * @param string      $sql
+	 * @param mixed       $sql
 	 * @param mixed       ...$binds
 	 * @param boolean     $setEscapeFlags
 	 * @param string|null $queryClass
 	 *
 	 * @return BaseResult|Query|false
 	 */
-	public function query(string $sql, $binds = null, bool $setEscapeFlags = true, ?string $queryClass = null)
+	public function query($sql, $binds = null, bool $setEscapeFlags = true, ?string $queryClass = null)
 	{
 		$queryClass = $queryClass ?: $this->queryClass;
 
@@ -699,11 +699,11 @@ public function query(string $sql, $binds = null, bool $setEscapeFlags = true, ?
 	 * is performed, nor are transactions handled. Simply takes a raw
 	 * query string and returns the database-specific result id.
 	 *
-	 * @param string $sql
+	 * @param mixed $sql
 	 *
 	 * @return mixed
 	 */
-	public function simpleQuery(string $sql)
+	public function simpleQuery($sql)
 	{
 		if (empty($this->connID))
 		{
diff --git a/system/Database/BasePreparedQuery.php b/system/Database/BasePreparedQuery.php
@@ -76,13 +76,13 @@ public function __construct(BaseConnection $db)
 	 * NOTE: This version is based on SQL code. Child classes should
 	 * override this method.
 	 *
-	 * @param string $sql
+	 * @param mixed  $sql
 	 * @param array  $options    Passed to the connection's prepare statement.
 	 * @param string $queryClass
 	 *
 	 * @return mixed
 	 */
-	public function prepare(string $sql, array $options = [], string $queryClass = 'CodeIgniter\\Database\\Query')
+	public function prepare($sql, array $options = [], string $queryClass = 'CodeIgniter\\Database\\Query')
 	{
 		// We only supports positional placeholders (?)
 		// in order to work with the execute method below, so we
diff --git a/system/Database/ConnectionInterface.php b/system/Database/ConnectionInterface.php
@@ -123,12 +123,12 @@ public function getVersion(): string;
 	 * Should automatically handle different connections for read/write
 	 * queries if needed.
 	 *
-	 * @param string $sql
-	 * @param mixed  ...$binds
+	 * @param mixed $sql
+	 * @param mixed ...$binds
 	 *
 	 * @return mixed
 	 */
-	public function query(string $sql, $binds = null);
+	public function query($sql, $binds = null);
 
 	//--------------------------------------------------------------------
 
@@ -137,11 +137,11 @@ public function query(string $sql, $binds = null);
 	 * is performed, nor are transactions handled. Simply takes a raw
 	 * query string and returns the database-specific result id.
 	 *
-	 * @param string $sql
+	 * @param mixed $sql
 	 *
 	 * @return mixed
 	 */
-	public function simpleQuery(string $sql);
+	public function simpleQuery($sql);
 
 	//--------------------------------------------------------------------
 
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
@@ -295,11 +295,11 @@ public function getVersion(): string
 	/**
 	 * Executes the query against the database.
 	 *
-	 * @param string $sql
+	 * @param mixed $sql
 	 *
 	 * @return mixed
 	 */
-	public function execute(string $sql)
+	public function execute($sql)
 	{
 		while ($this->connID->more_results())
 		{
diff --git a/system/Database/MySQLi/PreparedQuery.php b/system/Database/MySQLi/PreparedQuery.php
@@ -26,13 +26,13 @@ class PreparedQuery extends BasePreparedQuery
 	 * NOTE: This version is based on SQL code. Child classes should
 	 * override this method.
 	 *
-	 * @param string $sql
-	 * @param array  $options Passed to the connection's prepare statement.
-	 *                        Unused in the MySQLi driver.
+	 * @param mixed $sql
+	 * @param array $options Passed to the connection's prepare statement.
+	 *                       Unused in the MySQLi driver.
 	 *
 	 * @return mixed
 	 */
-	public function _prepare(string $sql, array $options = [])
+	public function _prepare($sql, array $options = [])
 	{
 		// Mysqli driver doesn't like statements
 		// with terminating semicolons.
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
@@ -159,11 +159,11 @@ public function getVersion(): string
 	/**
 	 * Executes the query against the database.
 	 *
-	 * @param string $sql
+	 * @param mixed $sql
 	 *
 	 * @return mixed
 	 */
-	public function execute(string $sql)
+	public function execute($sql)
 	{
 		try
 		{
diff --git a/system/Database/Postgre/PreparedQuery.php b/system/Database/Postgre/PreparedQuery.php
@@ -43,14 +43,14 @@ class PreparedQuery extends BasePreparedQuery
 	 * NOTE: This version is based on SQL code. Child classes should
 	 * override this method.
 	 *
-	 * @param string $sql
-	 * @param array  $options Passed to the connection's prepare statement.
-	 *                        Unused in the MySQLi driver.
+	 * @param mixed $sql
+	 * @param array $options Passed to the connection's prepare statement.
+	 *                       Unused in the MySQLi driver.
 	 *
 	 * @return mixed
 	 * @throws Exception
 	 */
-	public function _prepare(string $sql, array $options = [])
+	public function _prepare($sql, array $options = [])
 	{
 		$this->name = (string) random_int(1, 10000000000000000);
 
diff --git a/system/Database/PreparedQueryInterface.php b/system/Database/PreparedQueryInterface.php
@@ -32,12 +32,12 @@ public function execute(...$data);
 	 * Prepares the query against the database, and saves the connection
 	 * info necessary to execute the query later.
 	 *
-	 * @param string $sql
-	 * @param array  $options Passed to the connection's prepare statement.
+	 * @param mixed $sql
+	 * @param array $options Passed to the connection's prepare statement.
 	 *
 	 * @return mixed
 	 */
-	public function prepare(string $sql, array $options = []);
+	public function prepare($sql, array $options = []);
 
 	//--------------------------------------------------------------------
 
diff --git a/system/Database/Query.php b/system/Database/Query.php
@@ -101,13 +101,13 @@ public function __construct(ConnectionInterface &$db)
 	/**
 	 * Sets the raw query string to use for this statement.
 	 *
-	 * @param string  $sql
+	 * @param mixed   $sql
 	 * @param mixed   $binds
 	 * @param boolean $setEscape
 	 *
 	 * @return $this
 	 */
-	public function setQuery(string $sql, $binds = null, bool $setEscape = true)
+	public function setQuery($sql, $binds = null, bool $setEscape = true)
 	{
 		$this->originalQueryString = $sql;
 
@@ -166,9 +166,9 @@ public function setBinds(array $binds, bool $setEscape = true)
 	 * Returns the final, processed query string after binding, etal
 	 * has been performed.
 	 *
-	 * @return string
+	 * @return mixed
 	 */
-	public function getQuery(): string
+	public function getQuery()
 	{
 		if (empty($this->finalQueryString))
 		{
diff --git a/system/Database/QueryInterface.php b/system/Database/QueryInterface.php
@@ -22,13 +22,13 @@ interface QueryInterface
 	/**
 	 * Sets the raw query string to use for this statement.
 	 *
-	 * @param string  $sql
+	 * @param mixed   $sql
 	 * @param mixed   $binds
 	 * @param boolean $setEscape
 	 *
 	 * @return mixed
 	 */
-	public function setQuery(string $sql, $binds = null, bool $setEscape = true);
+	public function setQuery($sql, $binds = null, bool $setEscape = true);
 
 	//--------------------------------------------------------------------
 
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
@@ -479,11 +479,11 @@ public function setDatabase(string $databaseName = null)
 	/**
 	 * Executes the query against the database.
 	 *
-	 * @param string $sql
+	 * @param mixed $sql
 	 *
 	 * @return mixed
 	 */
-	public function execute(string $sql)
+	public function execute($sql)
 	{
 		$stmt = ($this->scrollable === false || $this->isWriteType($sql)) ?
 			sqlsrv_query($this->connID, $sql) :
diff --git a/system/Database/SQLSRV/PreparedQuery.php b/system/Database/SQLSRV/PreparedQuery.php
@@ -41,13 +41,13 @@ class PreparedQuery extends BasePreparedQuery
 	 * NOTE: This version is based on SQL code. Child classes should
 	 * override this method.
 	 *
-	 * @param string $sql
-	 * @param array  $options Options takes an associative array;
+	 * @param mixed $sql
+	 * @param array $options Options takes an associative array;
 	 *
 	 * @return mixed
 	 * @throws Exception
 	 */
-	public function _prepare(string $sql, array $options = [])
+	public function _prepare($sql, array $options = [])
 	{
 		/* Prepare parameters for the query */
 		$queryString = $this->getQueryString();
diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
@@ -134,11 +134,11 @@ public function getVersion(): string
 	/**
 	 * Execute the query
 	 *
-	 * @param string $sql
+	 * @param mixed $sql
 	 *
 	 * @return mixed    \SQLite3Result object or bool
 	 */
-	public function execute(string $sql)
+	public function execute($sql)
 	{
 		try
 		{
diff --git a/system/Database/SQLite3/PreparedQuery.php b/system/Database/SQLite3/PreparedQuery.php
@@ -33,13 +33,13 @@ class PreparedQuery extends BasePreparedQuery
 	 * NOTE: This version is based on SQL code. Child classes should
 	 * override this method.
 	 *
-	 * @param string $sql
-	 * @param array  $options Passed to the connection's prepare statement.
-	 *                        Unused in the MySQLi driver.
+	 * @param mixed $sql
+	 * @param array $options Passed to the connection's prepare statement.
+	 *                       Unused in the MySQLi driver.
 	 *
 	 * @return mixed
 	 */
-	public function _prepare(string $sql, array $options = [])
+	public function _prepare($sql, array $options = [])
 	{
 		if (! ($this->statement = $this->db->connID->prepare($sql)))
 		{
diff --git a/system/Test/Mock/MockConnection.php b/system/Test/Mock/MockConnection.php
@@ -43,14 +43,14 @@ public function shouldReturn(string $method, $return)
 	 * Should automatically handle different connections for read/write
 	 * queries if needed.
 	 *
-	 * @param string      $sql
+	 * @param mixed       $sql
 	 * @param mixed       ...$binds
 	 * @param boolean     $setEscapeFlags
 	 * @param string|null $queryClass
 	 *
 	 * @return BaseResult|Query|false
 	 */
-	public function query(string $sql, $binds = null, bool $setEscapeFlags = true, ?string $queryClass = null)
+	public function query($sql, $binds = null, bool $setEscapeFlags = true, ?string $queryClass = null)
 	{
 		$queryClass = str_replace('Connection', 'Query', get_class($this));
 
@@ -153,11 +153,11 @@ public function getVersion(): string
 	/**
 	 * Executes the query against the database.
 	 *
-	 * @param string $sql
+	 * @param mixed $sql
 	 *
 	 * @return mixed
 	 */
-	protected function execute(string $sql)
+	protected function execute($sql)
 	{
 		return $this->returnValues['execute'];
 	}

Original file line number	Diff line number	Diff line change
`@@ -586,11 +586,11 @@ public function addTableAlias(string $table)`
`586`	`586`	`/**`
`587`	`587`	`* Executes the query against the database.`
`588`	`588`	`*`
`589`		`- * @param string $sql`
	`589`	`+ * @param mixed $sql`
`590`	`590`	`*`
`591`	`591`	`* @return mixed`
`592`	`592`	`*/`
`593`		`- abstract protected function execute(string $sql);`
	`593`	`+ abstract protected function execute($sql);`
`594`	`594`
`595`	`595`	`//--------------------------------------------------------------------`
`596`	`596`
`@@ -602,14 +602,14 @@ abstract protected function execute(string $sql);`
`602`	`602`	`* Should automatically handle different connections for read/write`
`603`	`603`	`* queries if needed.`
`604`	`604`	`*`
`605`		`- * @param string $sql`
	`605`	`+ * @param mixed $sql`
`606`	`606`	`* @param mixed ...$binds`
`607`	`607`	`* @param boolean $setEscapeFlags`
`608`	`608`	`* @param string\|null $queryClass`
`609`	`609`	`*`
`610`	`610`	`* @return BaseResult\|Query\|false`
`611`	`611`	`*/`
`612`		`- public function query(string $sql, $binds = null, bool $setEscapeFlags = true, ?string $queryClass = null)`
	`612`	`+ public function query($sql, $binds = null, bool $setEscapeFlags = true, ?string $queryClass = null)`
`613`	`613`	`{`
`614`	`614`	`$queryClass = $queryClass ?: $this->queryClass;`
`615`	`615`
`@@ -699,11 +699,11 @@ public function query(string $sql, $binds = null, bool $setEscapeFlags = true, ?`
`699`	`699`	`* is performed, nor are transactions handled. Simply takes a raw`
`700`	`700`	`* query string and returns the database-specific result id.`
`701`	`701`	`*`
`702`		`- * @param string $sql`
	`702`	`+ * @param mixed $sql`
`703`	`703`	`*`
`704`	`704`	`* @return mixed`
`705`	`705`	`*/`
`706`		`- public function simpleQuery(string $sql)`
	`706`	`+ public function simpleQuery($sql)`
`707`	`707`	`{`
`708`	`708`	`if (empty($this->connID))`
`709`	`709`	`{`
Original file line number	Diff line number	Diff line change
`@@ -76,13 +76,13 @@ public function __construct(BaseConnection $db)`
`76`	`76`	`* NOTE: This version is based on SQL code. Child classes should`
`77`	`77`	`* override this method.`
`78`	`78`	`*`
`79`		`- * @param string $sql`
	`79`	`+ * @param mixed $sql`
`80`	`80`	`* @param array $options Passed to the connection's prepare statement.`
`81`	`81`	`* @param string $queryClass`
`82`	`82`	`*`
`83`	`83`	`* @return mixed`
`84`	`84`	`*/`
`85`		`- public function prepare(string $sql, array $options = [], string $queryClass = 'CodeIgniter\\Database\\Query')`
	`85`	`+ public function prepare($sql, array $options = [], string $queryClass = 'CodeIgniter\\Database\\Query')`
`86`	`86`	`{`
`87`	`87`	`// We only supports positional placeholders (?)`
`88`	`88`	`// in order to work with the execute method below, so we`
Original file line number	Diff line number	Diff line change
`@@ -295,11 +295,11 @@ public function getVersion(): string`
`295`	`295`	`/**`
`296`	`296`	`* Executes the query against the database.`
`297`	`297`	`*`
`298`		`- * @param string $sql`
	`298`	`+ * @param mixed $sql`
`299`	`299`	`*`
`300`	`300`	`* @return mixed`
`301`	`301`	`*/`
`302`		`- public function execute(string $sql)`
	`302`	`+ public function execute($sql)`
`303`	`303`	`{`
`304`	`304`	`while ($this->connID->more_results())`
`305`	`305`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,13 @@ class PreparedQuery extends BasePreparedQuery`
`26`	`26`	`* NOTE: This version is based on SQL code. Child classes should`
`27`	`27`	`* override this method.`
`28`	`28`	`*`
`29`		`- * @param string $sql`
`30`		`- * @param array $options Passed to the connection's prepare statement.`
`31`		`- * Unused in the MySQLi driver.`
	`29`	`+ * @param mixed $sql`
	`30`	`+ * @param array $options Passed to the connection's prepare statement.`
	`31`	`+ * Unused in the MySQLi driver.`
`32`	`32`	`*`
`33`	`33`	`* @return mixed`
`34`	`34`	`*/`
`35`		`- public function _prepare(string $sql, array $options = [])`
	`35`	`+ public function _prepare($sql, array $options = [])`
`36`	`36`	`{`
`37`	`37`	`// Mysqli driver doesn't like statements`
`38`	`38`	`// with terminating semicolons.`
Original file line number	Diff line number	Diff line change
`@@ -159,11 +159,11 @@ public function getVersion(): string`
`159`	`159`	`/**`
`160`	`160`	`* Executes the query against the database.`
`161`	`161`	`*`
`162`		`- * @param string $sql`
	`162`	`+ * @param mixed $sql`
`163`	`163`	`*`
`164`	`164`	`* @return mixed`
`165`	`165`	`*/`
`166`		`- public function execute(string $sql)`
	`166`	`+ public function execute($sql)`
`167`	`167`	`{`
`168`	`168`	`try`
`169`	`169`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,14 +43,14 @@ class PreparedQuery extends BasePreparedQuery`
`43`	`43`	`* NOTE: This version is based on SQL code. Child classes should`
`44`	`44`	`* override this method.`
`45`	`45`	`*`
`46`		`- * @param string $sql`
`47`		`- * @param array $options Passed to the connection's prepare statement.`
`48`		`- * Unused in the MySQLi driver.`
	`46`	`+ * @param mixed $sql`
	`47`	`+ * @param array $options Passed to the connection's prepare statement.`
	`48`	`+ * Unused in the MySQLi driver.`
`49`	`49`	`*`
`50`	`50`	`* @return mixed`
`51`	`51`	`* @throws Exception`
`52`	`52`	`*/`
`53`		`- public function _prepare(string $sql, array $options = [])`
	`53`	`+ public function _prepare($sql, array $options = [])`
`54`	`54`	`{`
`55`	`55`	`$this->name = (string) random_int(1, 10000000000000000);`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,12 @@ public function execute(...$data);`
`32`	`32`	`* Prepares the query against the database, and saves the connection`
`33`	`33`	`* info necessary to execute the query later.`
`34`	`34`	`*`
`35`		`- * @param string $sql`
`36`		`- * @param array $options Passed to the connection's prepare statement.`
	`35`	`+ * @param mixed $sql`
	`36`	`+ * @param array $options Passed to the connection's prepare statement.`
`37`	`37`	`*`
`38`	`38`	`* @return mixed`
`39`	`39`	`*/`
`40`		`- public function prepare(string $sql, array $options = []);`
	`40`	`+ public function prepare($sql, array $options = []);`
`41`	`41`
`42`	`42`	`//--------------------------------------------------------------------`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -101,13 +101,13 @@ public function __construct(ConnectionInterface &$db)`
`101`	`101`	`/**`
`102`	`102`	`* Sets the raw query string to use for this statement.`
`103`	`103`	`*`
`104`		`- * @param string $sql`
	`104`	`+ * @param mixed $sql`
`105`	`105`	`* @param mixed $binds`
`106`	`106`	`* @param boolean $setEscape`
`107`	`107`	`*`
`108`	`108`	`* @return $this`
`109`	`109`	`*/`
`110`		`- public function setQuery(string $sql, $binds = null, bool $setEscape = true)`
	`110`	`+ public function setQuery($sql, $binds = null, bool $setEscape = true)`
`111`	`111`	`{`
`112`	`112`	`$this->originalQueryString = $sql;`
`113`	`113`
`@@ -166,9 +166,9 @@ public function setBinds(array $binds, bool $setEscape = true)`
`166`	`166`	`* Returns the final, processed query string after binding, etal`
`167`	`167`	`* has been performed.`
`168`	`168`	`*`
`169`		`- * @return string`
	`169`	`+ * @return mixed`
`170`	`170`	`*/`
`171`		`- public function getQuery(): string`
	`171`	`+ public function getQuery()`
`172`	`172`	`{`
`173`	`173`	`if (empty($this->finalQueryString))`
`174`	`174`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,13 @@ interface QueryInterface`
`22`	`22`	`/**`
`23`	`23`	`* Sets the raw query string to use for this statement.`
`24`	`24`	`*`
`25`		`- * @param string $sql`
	`25`	`+ * @param mixed $sql`
`26`	`26`	`* @param mixed $binds`
`27`	`27`	`* @param boolean $setEscape`
`28`	`28`	`*`
`29`	`29`	`* @return mixed`
`30`	`30`	`*/`
`31`		`- public function setQuery(string $sql, $binds = null, bool $setEscape = true);`
	`31`	`+ public function setQuery($sql, $binds = null, bool $setEscape = true);`
`32`	`32`
`33`	`33`	`//--------------------------------------------------------------------`
`34`	`34`