WIP added db insert ignore support

system/Common.php

@@ -815,7 +815,7 @@ function force_https(int $duration = 31536000, RequestInterface $request = null,
 		$response->setHeader('Strict-Transport-Security', 'max-age=' . $duration);
 		$response->redirect($uri);
 		$response->sendHeaders();
-		
+
 		exit();
 	}
 }

system/Database/BaseBuilder.php

@@ -166,6 +166,15 @@ class BaseBuilder
 	 */
 	protected $QBWhereGroupCount = 0;
 
+	/**
+	 * Ignore data that cause certain
+	 * exceptions, for example in case of
+	 * duplicate keys.
+	 *
+	 * @var boolean
+	 */
+	protected $QBIgnore = false;
+
 	/**
 	 * A reference to the database connection.
 	 *
@@ -218,6 +227,14 @@ class BaseBuilder
 	 */
 	protected $canLimitWhereUpdates = true;
 
+	/**
+	 * Specifies which sql statements
+	 * support the ignore option.
+	 *
+	 * @var array
+	 */
+	protected $supportedIgnoreStatements = [];
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -266,6 +283,25 @@ public function getBinds(): array
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Ignore
+	 *
+	 * Set ignore Flag for next insert,
+	 * update or delete query.
+	 *
+	 * @param boolean $ignore
+	 *
+	 * @return BaseBuilder
+	 */
+	public function ignore(bool $ignore = true)
+	{
+		$this->QBIgnore = $ignore;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Select
 	 *
@@ -1705,7 +1741,7 @@ public function insertBatch(array $set = null, bool $escape = null, int $batchSi
 	 */
 	protected function _insertBatch(string $table, array $keys, array $values): string
 	{
-		return 'INSERT INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES ' . implode(', ', $values);
+		return 'INSERT ' . $this->compileIgnore('insert') . 'INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES ' . implode(', ', $values);
 	}
 
 	//--------------------------------------------------------------------
@@ -1774,6 +1810,8 @@ public function setInsertBatch($key, string $value = '', bool $escape = null)
 	 *
 	 * @param boolean $reset TRUE: reset QB values; FALSE: leave QB values alone
 	 *
+	 * @throws DatabaseException
+	 *
 	 * @return string
 	 */
 	public function getCompiledInsert(bool $reset = true): string
@@ -1808,6 +1846,8 @@ public function getCompiledInsert(bool $reset = true): string
 	 * @param boolean $escape Whether to escape values and identifiers
 	 * @param boolean $test   Used when running tests
 	 *
+	 * @throws DatabaseException
+	 *
 	 * @return BaseResult|Query|false
 	 */
 	public function insert(array $set = null, bool $escape = null, bool $test = false)
@@ -1885,7 +1925,7 @@ protected function validateInsert(): bool
 	 */
 	protected function _insert(string $table, array $keys, array $unescapedKeys): string
 	{
-		return 'INSERT INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES (' . implode(', ', $unescapedKeys) . ')';
+		return 'INSERT ' . $this->compileIgnore('insert') . 'INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES (' . implode(', ', $unescapedKeys) . ')';
 	}
 
 	//--------------------------------------------------------------------
@@ -2001,6 +2041,8 @@ public function getCompiledUpdate(bool $reset = true): string
 	 * @param integer $limit
 	 * @param boolean $test  Are we testing the code?
 	 *
+	 * @throws DatabaseException
+	 *
 	 * @return boolean    TRUE on success, FALSE on failure
 	 */
 	public function update(array $set = null, $where = null, int $limit = null, bool $test = false): bool
@@ -2064,14 +2106,14 @@ public function update(array $set = null, $where = null, int $limit = null, bool
 	 */
 	protected function _update(string $table, array $values): string
 	{
-		$valstr = [];
+		$valStr = [];
 
 		foreach ($values as $key => $val)
 		{
-			$valstr[] = $key . ' = ' . $val;
+			$valStr[] = $key . ' = ' . $val;
 		}
 
-		return 'UPDATE ' . $table . ' SET ' . implode(', ', $valstr)
+		return 'UPDATE ' . $this->compileIgnore('update') . $table . ' SET ' . implode(', ', $valStr)
 				. $this->compileWhereHaving('QBWhere')
 				. $this->compileOrderBy()
 				. ($this->QBLimit ? $this->_limit(' ') : '');
@@ -2201,6 +2243,7 @@ protected function _updateBatch(string $table, array $values, string $index): st
 	{
 		$ids   = [];
 		$final = [];
+
 		foreach ($values as $key => $val)
 		{
 			$ids[] = $val[$index];
@@ -2224,7 +2267,7 @@ protected function _updateBatch(string $table, array $values, string $index): st
 
 		$this->where($index . ' IN(' . implode(',', $ids) . ')', null, false);
 
-		return 'UPDATE ' . $table . ' SET ' . substr($cases, 0, -2) . $this->compileWhereHaving('QBWhere');
+		return 'UPDATE ' . $this->compileIgnore('update') . $table . ' SET ' . substr($cases, 0, -2) . $this->compileWhereHaving('QBWhere');
 	}
 
 	//--------------------------------------------------------------------
@@ -2481,7 +2524,7 @@ public function decrement(string $column, int $value = 1)
 	 */
 	protected function _delete(string $table): string
 	{
-		return 'DELETE FROM ' . $table . $this->compileWhereHaving('QBWhere')
+		return 'DELETE ' . $this->compileIgnore('delete') . 'FROM ' . $table . $this->compileWhereHaving('QBWhere')
 				. ($this->QBLimit ? ' LIMIT ' . $this->QBLimit : '');
 	}
 
@@ -2597,6 +2640,32 @@ protected function compileSelect($select_override = false): string
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Compile Ignore Statement
+	 *
+	 * Checks if the ignore option is supported by
+	 * the Database Driver for the specific statement.
+	 *
+	 * @param string $statement
+	 *
+	 * @return string
+	 */
+	protected function compileIgnore(string $statement)
+	{
+		$sql = '';
+
+		if ($this->QBIgnore &&
+			isset($this->supportedIgnoreStatements[$statement])
+		)
+		{
+			$sql = trim($this->supportedIgnoreStatements[$statement]) . ' ';
+		}
+
+		return $sql;
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Compile WHERE, HAVING statements
 	 *
@@ -2918,6 +2987,7 @@ protected function resetWrite()
 			'QBOrderBy' => [],
 			'QBKeys'    => [],
 			'QBLimit'   => false,
+			'QBIgnore'  => false,
 		]);
 	}
 

system/Database/MySQLi/Builder.php

@@ -53,4 +53,16 @@ class Builder extends BaseBuilder
 	 */
 	protected $escapeChar = '`';
 
+	/**
+	 * Specifies which sql statements
+	 * support the ignore option.
+	 *
+	 * @var array
+	 */
+	protected $supportedIgnoreStatements = [
+		'update' => 'IGNORE',
+		'insert' => 'IGNORE',
+		'delete' => 'IGNORE',
+	];
+
 }

system/Database/Postgre/Builder.php

@@ -39,6 +39,7 @@
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Database\Exceptions\DatabaseException;
+use http\Encoding\Stream\Inflate;
 
 /**
  * Builder for Postgre
@@ -55,6 +56,40 @@ class Builder extends BaseBuilder
 		'RANDOM()',
 	];
 
+	/**
+	 * Specifies which sql statements
+	 * support the ignore option.
+	 *
+	 * @var array
+	 */
+	protected $supportedIgnoreStatements = [
+		'insert' => 'ON CONFLICT DO NOTHING',
+	];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Compile Ignore Statement
+	 *
+	 * Checks if the ignore option is supported by
+	 * the Database Driver for the specific statement.
+	 *
+	 * @param string $statement
+	 *
+	 * @return string
+	 */
+	protected function compileIgnore(string $statement)
+	{
+		$sql = parent::compileIgnore($statement);
+
+		if (! empty($sql))
+		{
+			$sql = ' ' . trim($sql);
+		}
+
+		return $sql;
+	}
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -97,6 +132,8 @@ public function orderBy(string $orderBy, string $direction = '', bool $escape =
 	 * @param string  $column
 	 * @param integer $value
 	 *
+	 * @throws DatabaseException
+	 *
 	 * @return mixed
 	 */
 	public function increment(string $column, int $value = 1)
@@ -116,6 +153,8 @@ public function increment(string $column, int $value = 1)
 	 * @param string  $column
 	 * @param integer $value
 	 *
+	 * @throws DatabaseException
+	 *
 	 * @return mixed
 	 */
 	public function decrement(string $column, int $value = 1)
@@ -129,6 +168,42 @@ public function decrement(string $column, int $value = 1)
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Insert batch statement
+	 *
+	 * Generates a platform-specific insert string from the supplied data.
+	 *
+	 * @param string $table  Table name
+	 * @param array  $keys   INSERT keys
+	 * @param array  $values INSERT values
+	 *
+	 * @return string
+	 */
+	protected function _insertBatch(string $table, array $keys, array $values) : string
+	{
+		return 'INSERT INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES ' . implode(', ', $values) . $this->compileIgnore('insert');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Insert statement
+	 *
+	 * Generates a platform-specific insert string from the supplied data
+	 *
+	 * @param string $table         The table name
+	 * @param array  $keys          The insert keys
+	 * @param array  $unescapedKeys The insert values
+	 *
+	 * @return string
+	 */
+	protected function _insert(string $table, array $keys, array $unescapedKeys) : string
+	{
+		return 'INSERT INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES (' . implode(', ', $unescapedKeys) . ')' . $this->compileIgnore('insert');
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Replace
 	 *

system/Database/SQLite3/Builder.php

@@ -69,6 +69,13 @@ class Builder extends BaseBuilder
 	 */
 	protected $canLimitWhereUpdates = false;
 
+	/**
+	 * @var array
+	 */
+	protected $supportedIgnoreStatements = [
+		'insert' => 'OR IGNORE',
+	];
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -105,6 +112,4 @@ protected function _truncate(string $table): string
 		return 'DELETE FROM ' . $table;
 	}
 
-	//--------------------------------------------------------------------
-
 }

system/Debug/Toolbar/Views/toolbarloader.js.php

@@ -62,9 +62,9 @@ function loadDoc(time) {
 
 // Track all AJAX requests
 if (window.ActiveXObject) {
-    var oldXHR = new ActiveXObject('Microsoft.XMLHTTP');
+	var oldXHR = new ActiveXObject('Microsoft.XMLHTTP');
 } else {
-    var oldXHR = window.XMLHttpRequest;
+	var oldXHR = window.XMLHttpRequest;
 }
 
 function newXHR() {

system/Language/en/Entity.php

@@ -15,5 +15,5 @@
 
 return
 [
-	'tryingToAccessNonExistentProperty' => 'Trying to access non existent property {0} of {1}'
+   'tryingToAccessNonExistentProperty' => 'Trying to access non existent property {0} of {1}',
 ];

system/Router/Exceptions/RedirectException.php

@@ -5,10 +5,11 @@
 /**
  * Redirect exception
  */
+
 class RedirectException extends \Exception
 {
 	public static function forUnableToRedirect(string $route, string $code)
 	{
 		return new static(lang('Redirect.forUnableToRedirect', [$route, $code]));
 	}
-}
+}

tests/_support/Database/MockConnection.php

@@ -141,7 +141,7 @@ public function getVersion(): string
 	/**
 	 * Executes the query against the database.
 	 *
-	 * @param string    $sql
+	 * @param string $sql
 	 *
 	 * @return mixed
 	 */
@@ -155,7 +155,7 @@ protected function execute(string $sql)
 	/**
 	 * Returns the total number of rows affected by this query.
 	 *
-	 * @return int
+	 * @return integer
 	 */
 	public function affectedRows(): int
 	{