Fixed oci and sqlsrv merge queries when emulation is disabled - fixes #17284
This commit is contained in:
parent
86552ea2dc
commit
ebf3a2ffc8
@ -325,14 +325,8 @@ class PdoSessionHandler implements \SessionHandlerInterface
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
// We use a single MERGE SQL query when supported by the database.
|
// We use a single MERGE SQL query when supported by the database.
|
||||||
$mergeSql = $this->getMergeSql();
|
$mergeStmt = $this->getMergeStatement($sessionId, $data, $maxlifetime);
|
||||||
|
if (null !== $mergeStmt) {
|
||||||
if (null !== $mergeSql) {
|
|
||||||
$mergeStmt = $this->pdo->prepare($mergeSql);
|
|
||||||
$mergeStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
|
|
||||||
$mergeStmt->bindParam(':data', $data, \PDO::PARAM_LOB);
|
|
||||||
$mergeStmt->bindParam(':lifetime', $maxlifetime, \PDO::PARAM_INT);
|
|
||||||
$mergeStmt->bindValue(':time', time(), \PDO::PARAM_INT);
|
|
||||||
$mergeStmt->execute();
|
$mergeStmt->execute();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@ -653,32 +647,65 @@ class PdoSessionHandler implements \SessionHandlerInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a merge/upsert (i.e. insert or update) SQL query when supported by the database for writing session data.
|
* Returns a merge/upsert (i.e. insert or update) statement when supported by the database for writing session data.
|
||||||
*
|
*
|
||||||
* @return string|null The SQL string or null when not supported
|
* @param string $sessionId Session ID
|
||||||
|
* @param string $data Encoded session data
|
||||||
|
* @param int $maxlifetime session.gc_maxlifetime
|
||||||
|
*
|
||||||
|
* @return \PDOStatement|null The merge statement or null when not supported
|
||||||
*/
|
*/
|
||||||
private function getMergeSql()
|
private function getMergeStatement($sessionId, $data, $maxlifetime)
|
||||||
{
|
{
|
||||||
|
$mergeSql = null;
|
||||||
switch (true) {
|
switch (true) {
|
||||||
case 'mysql' === $this->driver:
|
case 'mysql' === $this->driver:
|
||||||
return "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time) ".
|
$mergeSql = "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time) ".
|
||||||
"ON DUPLICATE KEY UPDATE $this->dataCol = VALUES($this->dataCol), $this->lifetimeCol = VALUES($this->lifetimeCol), $this->timeCol = VALUES($this->timeCol)";
|
"ON DUPLICATE KEY UPDATE $this->dataCol = VALUES($this->dataCol), $this->lifetimeCol = VALUES($this->lifetimeCol), $this->timeCol = VALUES($this->timeCol)";
|
||||||
|
break;
|
||||||
case 'oci' === $this->driver:
|
case 'oci' === $this->driver:
|
||||||
// DUAL is Oracle specific dummy table
|
// DUAL is Oracle specific dummy table
|
||||||
return "MERGE INTO $this->table USING DUAL ON ($this->idCol = :id) ".
|
$mergeSql = "MERGE INTO $this->table USING DUAL ON ($this->idCol = ?) ".
|
||||||
"WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time) ".
|
"WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (?, ?, ?, ?) ".
|
||||||
"WHEN MATCHED THEN UPDATE SET $this->dataCol = :data, $this->lifetimeCol = :lifetime, $this->timeCol = :time";
|
"WHEN MATCHED THEN UPDATE SET $this->dataCol = ?, $this->lifetimeCol = ?, $this->timeCol = ?";
|
||||||
|
break;
|
||||||
case 'sqlsrv' === $this->driver && version_compare($this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION), '10', '>='):
|
case 'sqlsrv' === $this->driver && version_compare($this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION), '10', '>='):
|
||||||
// MERGE is only available since SQL Server 2008 and must be terminated by semicolon
|
// MERGE is only available since SQL Server 2008 and must be terminated by semicolon
|
||||||
// It also requires HOLDLOCK according to http://weblogs.sqlteam.com/dang/archive/2009/01/31/UPSERT-Race-Condition-With-MERGE.aspx
|
// It also requires HOLDLOCK according to http://weblogs.sqlteam.com/dang/archive/2009/01/31/UPSERT-Race-Condition-With-MERGE.aspx
|
||||||
return "MERGE INTO $this->table WITH (HOLDLOCK) USING (SELECT 1 AS dummy) AS src ON ($this->idCol = :id) ".
|
$mergeSql = "MERGE INTO $this->table WITH (HOLDLOCK) USING (SELECT 1 AS dummy) AS src ON ($this->idCol = ?) ".
|
||||||
"WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time) ".
|
"WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (?, ?, ?, ?) ".
|
||||||
"WHEN MATCHED THEN UPDATE SET $this->dataCol = :data, $this->lifetimeCol = :lifetime, $this->timeCol = :time;";
|
"WHEN MATCHED THEN UPDATE SET $this->dataCol = ?, $this->lifetimeCol = ?, $this->timeCol = ?;";
|
||||||
|
break;
|
||||||
case 'sqlite' === $this->driver:
|
case 'sqlite' === $this->driver:
|
||||||
return "INSERT OR REPLACE INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time)";
|
$mergeSql = "INSERT OR REPLACE INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time)";
|
||||||
|
break;
|
||||||
case 'pgsql' === $this->driver && version_compare($this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION), '9.5', '>='):
|
case 'pgsql' === $this->driver && version_compare($this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION), '9.5', '>='):
|
||||||
return "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time) ".
|
$mergeSql = "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time) ".
|
||||||
"ON CONFLICT ($this->idCol) DO UPDATE SET ($this->dataCol, $this->lifetimeCol, $this->timeCol) = (EXCLUDED.$this->dataCol, EXCLUDED.$this->lifetimeCol, EXCLUDED.$this->timeCol)";
|
"ON CONFLICT ($this->idCol) DO UPDATE SET ($this->dataCol, $this->lifetimeCol, $this->timeCol) = (EXCLUDED.$this->dataCol, EXCLUDED.$this->lifetimeCol, EXCLUDED.$this->timeCol)";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (null !== $mergeSql) {
|
||||||
|
$mergeStmt = $this->pdo->prepare($mergeSql);
|
||||||
|
|
||||||
|
if ('sqlsrv' === $this->driver || 'oci' === $this->driver) {
|
||||||
|
$mergeStmt->bindParam(1, $sessionId, \PDO::PARAM_STR);
|
||||||
|
$mergeStmt->bindParam(2, $sessionId, \PDO::PARAM_STR);
|
||||||
|
$mergeStmt->bindParam(3, $data, \PDO::PARAM_LOB);
|
||||||
|
$mergeStmt->bindParam(4, $maxlifetime, \PDO::PARAM_INT);
|
||||||
|
$mergeStmt->bindValue(5, time(), \PDO::PARAM_INT);
|
||||||
|
$mergeStmt->bindParam(6, $data, \PDO::PARAM_LOB);
|
||||||
|
$mergeStmt->bindParam(7, $maxlifetime, \PDO::PARAM_INT);
|
||||||
|
$mergeStmt->bindValue(8, time(), \PDO::PARAM_INT);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$mergeStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
|
||||||
|
$mergeStmt->bindParam(':data', $data, \PDO::PARAM_LOB);
|
||||||
|
$mergeStmt->bindParam(':lifetime', $maxlifetime, \PDO::PARAM_INT);
|
||||||
|
$mergeStmt->bindValue(':time', time(), \PDO::PARAM_INT);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $mergeStmt;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user