Nulls are valid in fields allowing nulls

Author: phpfui

src/PHPFUI/ORM/Record.php

@@ -441,7 +441,15 @@ protected function correctTypes() : static
 				}
 			else if (\array_key_exists($field, $this->current))
 				{
-				switch ($row[1])
+				// don't touch nulls if allowed by the field or the primary key
+				if ($this->current[$field] === null)
+					{
+					if ($row[self::ALLOWS_NULL_INDEX] || in_array($field, static::$primaryKeys))
+						{
+						continue;
+						}
+					}
+				switch ($row[self::PHP_TYPE_INDEX])
 					{
 					case 'int':
 						$this->current[$field] = (int)$this->current[$field];
@@ -485,17 +493,7 @@ public function read(array|int|string $fields) : bool
 	 */
 	public function reload() : bool
 		{
-		$keys = [];
-
-		foreach (static::$primaryKeys as $key)
-			{
-			if (\array_key_exists($key, $this->current))
-				{
-				$keys[$key] = $this->current[$key];
-				}
-			}
-
-		return $this->read($keys);
+		return $this->read($this->getPrimaryKeyValues());
 		}
 
 	/**

src/PHPFUI/ORM/Table.php

@@ -782,13 +782,7 @@ public function insert(array $records, string $ignore = '') : bool
 		$tableName = $this->getTableName();
 		$sql = "insert {$ignore} into `{$tableName}` (";
 
-		// remove primary keys
-		$fieldDefinitions = $this->getFields();
-		foreach ($this->getPrimaryKeys() as $key)
-			{
-			unset($fieldDefinitions[$key]);
-			}
-		$fields = \array_keys($fieldDefinitions);
+		$fields = \array_keys($this->getFields());
 		$comma = '';
 
 		foreach ($fields as $fieldName)