fix: check against correct identity flags when using IDENTITY_INSERT …

…for sql server
f3-factory · Feb 19, 2022 · 8db6bfe · 8db6bfe
1 parent cdd878d
commit 8db6bfe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/base.php b/base.php
@@ -45,7 +45,7 @@ final class Base extends Prefab implements ArrayAccess {
 	//@{ Framework details
 	const
 		PACKAGE='Fat-Free Framework',
-		VERSION='3.8.0-Release';
+		VERSION='3.8.1-Dev';
 	//@}
 
 	//@{ HTTP status codes (RFC 2616)

diff --git a/db/sql/mapper.php b/db/sql/mapper.php
@@ -427,6 +427,7 @@ function insert() {
 		$values='';
 		$filter='';
 		$pkeys=[];
+		$aikeys=[];
 		$nkeys=[];
 		$ckeys=[];
 		$inc=NULL;
@@ -449,6 +450,9 @@ function insert() {
 				unset($field);
 			}
 		foreach ($this->fields as $key=>&$field) {
+			if ($field['auto_inc']) {
+                $aikeys[] = $key;
+            }
 			if ($field['pkey']) {
 				$field['previous']=$field['value'];
 				if (!$inc && empty($field['value']) &&
@@ -469,7 +473,7 @@ function insert() {
 			}
 			unset($field);
 		}
-		if ($fields) {
+        if ($fields) {
 			$add=$aik='';
 			if ($this->engine=='pgsql' && !empty($pkeys)) {
 				$names=array_keys($pkeys);
@@ -478,7 +482,7 @@ function insert() {
 			}
 			$lID=$this->db->exec(
 				(preg_match('/mssql|dblib|sqlsrv/',$this->engine) &&
-				array_intersect(array_keys($pkeys),$ckeys)?
+				array_intersect(array_keys($aikeys),$ckeys)?
 					'SET IDENTITY_INSERT '.$this->table.' ON;':'').
 				'INSERT INTO '.$this->table.' ('.$fields.') '.
 				'VALUES ('.$values.')'.$add,$args