Better default handling

Author: phpfui

Tests/Unit/InsertTest.php

@@ -24,15 +24,14 @@ public function testDateNullInsert() : void
 
 	public function testDateRequiredInsert() : void
 		{
-		$this->expectException(\Exception::class);
-		$transaction = new \PHPFUI\ORM\Transaction();
 		$test = new \Tests\App\Record\DateRecord();
 		$id = $test->insert();
+		$this->assertNotEmpty(\PHPFUI\ORM::getLastError());
+		$this->assertEquals(0, $id);
 		$insertedTest = new \Tests\App\Record\DateRecord($id);
 		$this->assertNull($insertedTest->dateDefaultNull);
 		$this->assertEquals('2000-01-02', $insertedTest->dateDefaultNullable);
 		$this->assertEquals('2000-01-02', $insertedTest->dateDefaultNotNull);
-		$this->assertTrue($transaction->rollBack());
 		}
 
 	public function testMultipleInserts() : void
@@ -197,11 +196,10 @@ public function testRelatedInsert() : void
 
 	public function testRequiredStringNotSetInsert() : void
 		{
-		$this->expectException(\Exception::class);
-		$transaction = new \PHPFUI\ORM\Transaction();
 		$test = new \Tests\App\Record\StringRecord();
 		$id = $test->insert();
-		$this->assertTrue($transaction->rollBack());
+		$this->assertNotEmpty(\PHPFUI\ORM::getLastError());
+		$this->assertEquals(0, $id);
 		}
 
 	public function testStringNullInsert() : void

src/PHPFUI/ORM/Record.php

@@ -558,10 +558,7 @@ public function setEmpty() : static
 
 		foreach (static::$fields as $field => $description)
 			{
-			if (\array_key_exists(self::DEFAULT_INDEX, $description))
-				{
-				$this->current[$field] = $description[self::DEFAULT_INDEX];
-				}
+			$this->current[$field] = $description[self::DEFAULT_INDEX] ?? null;
 			}
 
 		return $this;

src/PHPFUI/ORM/RelatedRecord.php

@@ -19,9 +19,9 @@ public function setValue(mixed $value, array $parameters) : void
 			{
 			throw new \PHPFUI\ORM\Exception(__METHOD__ . ': Error - ' . \get_debug_type($value) . ' is not an instance of ' . $class);
 			}
-		$primaryKevValues = $value->getPrimaryKeyValues();
+		$primaryKeyValues = $value->getPrimaryKeyValues();
 
-		if (1 != \count($primaryKevValues))
+		if (1 != \count($primaryKeyValues))
 			{
 			throw new \PHPFUI\ORM\Exception(__METHOD__ . ': Error - ' . \get_debug_type($value) . ' does not have a single primary key');
 			}

src/PHPFUI/ORM/Tool/Generate/CRUD.php

@@ -161,17 +161,13 @@ protected function getLine(\PHPFUI\ORM\Schema\Field $field) : string
 			case 'bool':
 			case 'datetime':
 			case 'string':
-				if ('NULL' === $field->defaultValue)
+				if ('NULL' === $field->defaultValue || 'CURRENT_TIMESTAMP' == $field->defaultValue || 'CURRENT_DATE' == $field->defaultValue)
 					{
 					$defaultValue = 'NULL';
 					}
-				elseif ('CURRENT_TIMESTAMP' == $field->defaultValue || 'CURRENT_DATE' == $field->defaultValue)
+				elseif (\str_contains($field->defaultValue ?? '', "'") || \str_contains($field->defaultValue ?? '', '"'))
 					{
-					$defaultValue = null;
-					}
-				elseif (\str_contains($field->defaultValue ?? '', "'"))
-					{
-					$defaultValue = "\"{$field->defaultValue}\"";
+					$defaultValue = $field->defaultValue;
 					}
 				elseif (null !== $field->defaultValue)
 					{