[ci skip] Fix bcit-ci#4170

narfbg · narfbg · commit 9d02ceafe0aa · 2015-10-13T14:38:30.000+03:00
diff --git a/system/database/drivers/sqlsrv/sqlsrv_driver.php b/system/database/drivers/sqlsrv/sqlsrv_driver.php
@@ -275,9 +275,7 @@ public function affected_rows()
 	 */
 	public function insert_id()
 	{
-		$query = $this->query('SELECT @@IDENTITY AS insert_id');
-		$query = $query->row();
-		return $query->insert_id;
+		return $this->query('SELECT SCOPE_IDENTITY() AS insert_id')->row()->insert_id;
 	}
 
 	// --------------------------------------------------------------------
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
@@ -14,6 +14,8 @@ Release Date: Not Released
 Bug fixes for 3.0.3
 -------------------
 
+-  Fixed a bug (#4170) - :doc:`Database <database/index>` method ``insert_id()`` could return an identity from the wrong scope with the 'sqlsrv' driver.
+
 Version 3.0.2
 =============
 

Original file line number	Diff line number	Diff line change
`@@ -275,9 +275,7 @@ public function affected_rows()`
`275`	`275`	`*/`
`276`	`276`	`public function insert_id()`
`277`	`277`	`{`
`278`		`- $query = $this->query('SELECT @@IDENTITY AS insert_id');`
`279`		`- $query = $query->row();`
`280`		`- return $query->insert_id;`
	`278`	`+ return $this->query('SELECT SCOPE_IDENTITY() AS insert_id')->row()->insert_id;`
`281`	`279`	`}`
`282`	`280`
`283`	`281`	`// --------------------------------------------------------------------`