From 7ec96e3e4979d9cc5f0908daee0cd65a4f116e89 Mon Sep 17 00:00:00 2001
From: Ibrahim BinAlshikh <ibinshikh@hotmail.com>
Date: Wed, 11 Feb 2026 00:09:27 +0300
Subject: [PATCH 1/3] feat: Added `getSupportedDataTypes`

---
 WebFiori/Database/DataType.php                |   52 +
 WebFiori/Database/MsSql/MSSQLColumn.php       |   22 +-
 WebFiori/Database/MySql/MySQLColumn.php       |   21 +-
 .../Tests/Database/MsSql/MSSQLColumnTest.php  | 1168 ++++++------
 .../Tests/Database/MsSql/MSSQLTableTest.php   | 1138 ++++++------
 .../Tests/Database/MySql/MySQLColumnTest.php  | 1598 ++++++++---------
 .../Tests/Database/MySql/MySQLTableTest.php   | 1106 ++++++------
 7 files changed, 2561 insertions(+), 2544 deletions(-)

diff --git a/WebFiori/Database/DataType.php b/WebFiori/Database/DataType.php
index 18adf88d..4e991c8f 100644
--- a/WebFiori/Database/DataType.php
+++ b/WebFiori/Database/DataType.php
@@ -21,6 +21,48 @@
  * @author Ibrahim
  */
 class DataType {
+    /**
+     * Mapping of database engines to their supported data types.
+     */
+    private static array $EngineTypes = [
+        'mysql' => [
+            self::BIT,
+            self::BLOB,
+            self::BLOB_LONG,
+            self::BLOB_MEDIUM,
+            self::BLOB_TINY,
+            self::BOOL,
+            self::CHAR,
+            self::DATETIME,
+            self::DECIMAL,
+            self::DOUBLE,
+            self::FLOAT,
+            self::INT,
+            self::TEXT,
+            self::TEXT_MEDIUM,
+            self::TIMESTAMP,
+            self::VARCHAR,
+        ],
+        'mssql' => [
+            self::BIGINT,
+            self::BINARY,
+            self::BIT,
+            self::BOOL,
+            self::CHAR,
+            self::DATE,
+            self::DATETIME,
+            self::DATETIME2,
+            self::DECIMAL,
+            self::FLOAT,
+            self::INT,
+            self::MONEY,
+            self::NCHAR,
+            self::NVARCHAR,
+            self::TIME,
+            self::VARBINARY,
+            self::VARCHAR,
+        ],
+    ];
     /**
      * Big integer data type. Applicable to:
      * <ul>
@@ -219,4 +261,14 @@ public static function toPHPType(string $dbType): string {
             default => 'string'
         };
     }
+
+    /**
+     * Returns an array of supported data types for a specific database engine.
+     * 
+     * @param string $engine The database engine name (e.g., 'mysql', 'mssql')
+     * @return array Array of supported data type constants, or empty array if engine is not supported
+     */
+    public static function getSupportedDataTypes(string $engine): array {
+        return self::$EngineTypes[strtolower($engine)] ?? [];
+    }
 }
diff --git a/WebFiori/Database/MsSql/MSSQLColumn.php b/WebFiori/Database/MsSql/MSSQLColumn.php
index 427333bc..4fadd1b8 100644
--- a/WebFiori/Database/MsSql/MSSQLColumn.php
+++ b/WebFiori/Database/MsSql/MSSQLColumn.php
@@ -13,6 +13,7 @@
 
 use WebFiori\Database\Column;
 use WebFiori\Database\DatabaseException;
+use WebFiori\Database\DataType;
 use WebFiori\Database\Factory\ColumnFactory;
 use WebFiori\Database\Util\DateTimeValidator;
 /**
@@ -61,26 +62,7 @@ public function __construct(string $name = 'col', string $datatype = 'nvarchar',
         $this->isAutoUpdate = false;
         $this->isIdintity = false;
         $this->setWithExtendedProps(false);
-        $this->setSupportedTypes([
-            'int',
-            'bigint',
-            'varchar',
-            'nvarchar',
-            'char',
-            'nchar',
-            'binary',
-            'varbinary',
-            'date',
-            'datetime2',
-            'datetime',
-            'time',
-            'money',
-            'bit',
-            'decimal',
-            'float',
-            'boolean',
-            'bool'
-        ]);
+        $this->setSupportedTypes(DataType::getSupportedDataTypes('mssql'));
         $this->setDatatype($datatype);
 
         if (!$this->setSize($size)) {
diff --git a/WebFiori/Database/MySql/MySQLColumn.php b/WebFiori/Database/MySql/MySQLColumn.php
index 24c40d89..3452d2df 100644
--- a/WebFiori/Database/MySql/MySQLColumn.php
+++ b/WebFiori/Database/MySql/MySQLColumn.php
@@ -13,6 +13,7 @@
 
 use WebFiori\Database\Column;
 use WebFiori\Database\DatabaseException;
+use WebFiori\Database\DataType;
 use WebFiori\Database\Factory\ColumnFactory;
 use WebFiori\Database\Table;
 use WebFiori\Database\Util\DateTimeValidator;
@@ -64,25 +65,7 @@ class MySQLColumn extends Column {
      */
     public function __construct(string $name = 'col', string $datatype = 'varchar',int $size = 1) {
         parent::__construct($name);
-        $this->setSupportedTypes([
-            'int',
-            'char',
-            'varchar',
-            'timestamp',
-            'tinyblob',
-            'blob',
-            'mediumblob',
-            'longblob',
-            'datetime',
-            'text',
-            'mediumtext',
-            'decimal',
-            'double',
-            'float',
-            'boolean', 
-            'bool',
-            'bit'
-        ]);
+        $this->setSupportedTypes(DataType::getSupportedDataTypes('mysql'));
         $this->setDatatype($datatype);
 
         if (!$this->setSize($size)) {
diff --git a/tests/WebFiori/Tests/Database/MsSql/MSSQLColumnTest.php b/tests/WebFiori/Tests/Database/MsSql/MSSQLColumnTest.php
index 9a470deb..f7a06411 100644
--- a/tests/WebFiori/Tests/Database/MsSql/MSSQLColumnTest.php
+++ b/tests/WebFiori/Tests/Database/MsSql/MSSQLColumnTest.php
@@ -1,584 +1,584 @@
-<?php
-namespace WebFiori\Tests\Database\MsSql;
-
-use PHPUnit\Framework\TestCase;
-use WebFiori\Database\Factory\ColumnFactory;
-use WebFiori\Database\MsSql\MSSQLColumn;
-use WebFiori\Database\MySql\MySQLColumn;
-/**
- * Description of MSSQLColumnTest
- *
- * @author Ibrahim
- */
-class MSSQLColumnTest extends TestCase {
-    /**
-     * @test
-     */
-    public function testConstructor00() {
-        $col = new MSSQLColumn();
-        $this->assertEquals('nvarchar',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-        $this->assertEquals('[col]',$col->getName());
-    }
-    /**
-     * @test
-     */
-    public function testConstructor01() {
-        $col = new MSSQLColumn('user_id ', 'varchar', 15);
-        $this->assertEquals('varchar',$col->getDatatype());
-        $this->assertEquals(15,$col->getSize());
-        $this->assertEquals('[user_id]',$col->getName());
-    }
-    /**
-     * @test
-     */
-    public function testConstructor02() {
-        $this->expectException('WebFiori\Database\DatabaseException');
-        $col = new MSSQLColumn('valid_name', 'invalid type', 15);
-        $this->assertEquals('varchar',$col->getDatatype());
-        $this->assertEquals(15,$col->getSize());
-        $this->assertEquals('valid_name',$col->getName());
-    }
-    /**
-     * @test
-     */
-    public function testConstructor03() {
-        $col = new MSSQLColumn('valid_name', 'InT', 15);
-        $this->assertEquals('int',$col->getDatatype());
-        $this->assertEquals(15,$col->getSize());
-        $this->assertEquals('[valid_name]',$col->getName());
-    }
-    /**
-     * @test
-     */
-    public function testConstructor04() {
-        $col = new MSSQLColumn('valid_name', 'Varchar ', 15);
-        $this->assertEquals('varchar',$col->getDatatype());
-        $this->assertEquals(15,$col->getSize());
-        $this->assertEquals('[valid_name]',$col->getName());
-    }
-    /**
-     * @test
-     */
-    public function testConstructor06() {
-        $col = new MSSQLColumn('valid_name', 'Varchar ', 0);
-        $this->assertEquals('varchar',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-        $this->assertEquals('[valid_name]',$col->getName());
-    }
-    /**
-     * @test
-     */
-    public function testConstructor07() {
-        $col = new MSSQLColumn('amount', 'decimal ');
-        $this->assertEquals('decimal',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-
-        return $col;
-    }
-    /**
-     * @test
-     */
-    public function testConstructor08() {
-        $col = new MSSQLColumn('amount', 'decimal ',0);
-        $this->assertEquals('decimal',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-        $this->assertEquals(0,$col->getScale());
-
-        return $col;
-    }
-    /**
-     * @test
-     */
-    public function testConstructor09() {
-        $col = new MSSQLColumn('amount', 'decimal ',1);
-        $this->assertEquals('decimal',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-        $this->assertEquals(0,$col->getScale());
-
-        return $col;
-    }
-    /**
-     * @test
-     */
-    public function testConstructor10() {
-        $col = new MSSQLColumn('amount', 'decimal ',2);
-        $this->assertEquals('decimal',$col->getDatatype());
-        $this->assertEquals(2,$col->getSize());
-        $this->assertEquals(0,$col->getScale());
-
-        return $col;
-    }
-    /**
-     * @test
-     */
-    public function testConstructor11() {
-        $col = new MSSQLColumn('amount', 'decimal ',3);
-        $this->assertEquals('decimal',$col->getDatatype());
-        $this->assertEquals(3,$col->getSize());
-        $this->assertEquals(0,$col->getScale());
-
-        return $col;
-    }
-    /**
-     * @test
-     */
-    public function testConstructor12() {
-        $col = new MSSQLColumn('amount', 'decimal ',4);
-        $this->assertEquals('decimal',$col->getDatatype());
-        $this->assertEquals(4,$col->getSize());
-        $this->assertEquals(0,$col->getScale());
-
-        return $col;
-    }
-    /**
-     * @test
-     */
-    public function testConstructor13() {
-        $col = new MSSQLColumn('amount', 'decimal ',-9);
-        $this->assertEquals('decimal',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-        $this->assertEquals(0,$col->getScale());
-
-        return $col;
-    }
-    /**
-     * @test
-     */
-    public function testConstructor14() {
-        $col = new MSSQLColumn('free_text', 'varchar ', 44);
-        $this->assertEquals("'This isn''t good.'", $col->cleanValue("This isn't good."));
-
-        return $col;
-    }
-    /**
-     * @test
-     */
-    public function testCreateCol00() {
-        $colObj = MSSQLColumn::createColObj([]);
-        $this->assertNull($colObj);
-    }
-    /**
-     * @test
-     */
-    public function testCreateCol01() {
-        $colObj = MSSQLColumn::createColObj([
-            'name' => 'my_col',
-            'validator' => function ($orgVal, $cleaned) {
-                return 'Hello '.$cleaned;
-            }
-        ]);
-        $this->assertNotNull($colObj);
-        $this->assertEquals('[my_col]', $colObj->getName());
-        $this->assertEquals('mixed', $colObj->getDatatype());
-        $this->assertEquals(1, $colObj->getSize());
-        $this->assertEquals("N'Hello Ibrahim'", $colObj->cleanValue('Ibrahim'));
-    }
-    /**
-     * @test
-     */
-    public function testCustomCleaner00() {
-        $col = new MSSQLColumn('hello', 'varchar');
-        $col->setCustomFilter(function($originalVal, $basicFilterResult){
-            
-        });
-        $this->assertNull($col->cleanValue('Hello World'));
-        $col->setCustomFilter(function($originalVal, $basicFilterResult){
-            return $originalVal.'?';
-        });
-        $this->assertEquals("'Hello World.?'",$col->cleanValue('Hello World.'));
-    }
-    /**
-     * @test
-     */
-    public function testCustomCleaner01() {
-        $col = new MSSQLColumn('hello', 'int');
-        $col->setCustomFilter(function($originalVal, $basicFilterResult){
-            return $basicFilterResult*10;
-        });
-        $this->assertEquals(0,$col->cleanValue('Hello World.'));
-        $this->assertEquals(10,$col->cleanValue(1));
-        $this->assertEquals(260,$col->cleanValue(26));
-        $col->setCustomFilter(function($originalVal, $basicFilterResult){
-            return $basicFilterResult*$originalVal;
-        });
-        $this->assertEquals(100,$col->cleanValue(10));
-        $this->assertEquals(9,$col->cleanValue(3));
-    }
-    /**
-     * @test
-     */
-    public function testCustomCleaner02() {
-        $col = new MSSQLColumn('hello', 'int');
-        $col->setCustomFilter(function(){
-            return 5;
-        });
-        $this->assertEquals(5,$col->cleanValue('Hello World.'));
-    }
-    /**
-     * @test
-     */
-    public function testGetPHPType00() {
-        $colObj = new MSSQLColumn();
-        $this->assertEquals('string', $colObj->getPHPType());
-        $colObj->setIsNull(true);
-        $this->assertEquals('string|null', $colObj->getPHPType());
-    }
-    /**
-     * @test
-     */
-    public function testGetPHPType01() {
-        $colObj = new MSSQLColumn('col', 'money');
-        $this->assertEquals('float', $colObj->getPHPType());
-        $colObj->setIsNull(true);
-        $this->assertEquals('float|null', $colObj->getPHPType());
-    }
-    /**
-     * @test
-     */
-    public function testGetPHPType02() {
-        $colObj = new MSSQLColumn('col', 'boolean');
-        $this->assertEquals('bool', $colObj->getPHPType());
-        $colObj->setIsNull(true);
-        $this->assertEquals('bool', $colObj->getPHPType());
-    }
-    /**
-     * @test
-     */
-    public function testGetPHPType03() {
-        $colObj = new MSSQLColumn('col', 'decimal');
-        $this->assertEquals('float', $colObj->getPHPType());
-        $colObj->setIsNull(true);
-        $this->assertEquals('float|null', $colObj->getPHPType());
-    }
-    /**
-     * @test
-     */
-    public function testGetPHPType04() {
-        $colObj = new MSSQLColumn('col', 'binary');
-        $this->assertEquals('string', $colObj->getPHPType());
-        $colObj->setIsNull(true);
-        $this->assertEquals('string|null', $colObj->getPHPType());
-    }
-    /**
-     * @test
-     */
-    public function testGetPHPType05() {
-        $colObj = new MSSQLColumn('col', 'datetime2');
-        $this->assertEquals('string', $colObj->getPHPType());
-        $colObj->setIsNull(true);
-        $this->assertEquals('string|null', $colObj->getPHPType());
-    }
-    /**
-     * @test
-     */
-    public function testGetPHPType06() {
-        $colObj = new MSSQLColumn('col', 'mixed');
-        $this->assertEquals('string', $colObj->getPHPType());
-        $colObj->setIsNull(true);
-        $this->assertEquals('string|null', $colObj->getPHPType());
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault00() {
-        $col = new MSSQLColumn('date', 'datetime2');
-        $col->setDefault('2019-11-09');
-        $this->assertEquals('2019-11-09',$col->getDefault());
-        $this->assertEquals('[date] [datetime2](1) not null default \'2019-11-09\'',$col.'');
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault01() {
-        $col = new MSSQLColumn('date', 'datetime2');
-        $col->setDefault('2019-07-07 09:09:09');
-        $this->assertEquals('2019-07-07 09:09:09',$col->getDefault());
-        $this->assertEquals('[date] [datetime2](1) not null default \'2019-07-07 09:09:09\'',$col.'');
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault02() {
-        $col = new MSSQLColumn('date', 'datetime2');
-        $col->setDefault('');
-        $this->assertNull($col->getDefault());
-        $this->assertEquals('[date] [datetime2](1) not null',$col.'');
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault03() {
-        $col = new MSSQLColumn('date', 'datetime2');
-        $col->setDefault('2019-07-07 09:09:09');
-        $this->assertEquals('2019-07-07 09:09:09',$col->getDefault());
-        $col->setSize(4);
-        $this->assertEquals('[date] [datetime2](4) not null default \'2019-07-07 09:09:09\'',$col.'');
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault04() {
-        $col = new MSSQLColumn('date', 'datetime2');
-        $col->setDefault('2019-15-07 09:09:09');
-        $this->assertNull($col->getDefault());
-        $this->assertEquals('[date] [datetime2](1) not null',$col.'');
-        $col->setDefault('2019-12-33 09:09:09');
-        $this->assertNull($col->getDefault());
-        $this->assertEquals('[date] [datetime2](1) not null',$col.'');
-        $col->setDefault('2019-12-31 24:09:09');
-        $this->assertNull($col->getDefault());
-        $col->setDefault('2019-12-31 23:60:09');
-        $this->assertNull($col->getDefault());
-        $col->setDefault('2019-12-31 23:59:60');
-        $this->assertNull($col->getDefault());
-        $col->setDefault('2019-12-31 23:59:59');
-        $this->assertEquals('2019-12-31 23:59:59',$col->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault05() {
-        $col = new MSSQLColumn('id', 'int');
-        $this->assertEquals('[id] [int] not null',$col.'');
-        $col->setDefault(-122);
-        $this->assertEquals(-122,$col->getDefault());
-        $this->assertEquals('[id] [int] not null default -122',$col.'');
-        $col->setDefault(null);
-        $this->assertNull($col->getDefault());
-        $col->setDefault('a string');
-        $this->assertEquals(0,$col->getDefault());
-        $col->setDefault(1.8);
-        $this->assertEquals(1,$col->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault06() {
-        $col = new MSSQLColumn('id', 'varchar');
-        $this->assertEquals('[id] [varchar](1) not null',$col.'');
-        $col->setDefault('A random string.');
-        $this->assertEquals('A random string.',$col->getDefault());
-        $this->assertEquals('[id] [varchar](1) not null default \'A random string.\'',$col.'');
-        $col->setDefault(null);
-        $this->assertNull($col->getDefault());
-        $col->setDefault(33);
-        $this->assertEquals(33,$col->getDefault());
-        $col->setDefault(1.8);
-        $this->assertEquals(1.8,$col->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault07() {
-        $col = new MSSQLColumn('id', 'decimal');
-        $this->assertEquals('[id] [decimal](1,0) not null',$col.'');
-        $col->setDefault(1);
-        $this->assertEquals(1,$col->getDefault());
-        $this->assertEquals('[id] [decimal](1,0) not null default 1',$col.'');
-        $col->setDefault(1.66);
-        $this->assertEquals(1.66,$col->getDefault());
-        $this->assertEquals('[id] [decimal](1,0) not null default 1.66',$col.'');
-        $col->setDefault(null);
-        $this->assertNull($col->getDefault());
-        $col->setDefault('33');
-        $this->assertEquals(33,$col->getDefault());
-        $col->setDefault('');
-        $this->assertEquals(0,$col->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault08() {
-        $col = new MSSQLColumn('date', 'datetime2');
-        $col->setDefault('now');
-        $this->assertEquals('now',$col->getDefault());
-        $this->assertEquals('[date] [datetime2](1) not null default getdate()',$col.'');
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault09() {
-        $col = new MSSQLColumn('mix', 'mixed');
-        $col->setDefault('2019-11-09');
-        $this->assertEquals("2019-11-09",$col->getDefault());
-        $this->assertEquals("[mix] [nvarchar](256) not null default N'2019-11-09'",$col.'');
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault10() {
-        $col = new MSSQLColumn('mix', 'mixed');
-        $col->setDefault(1);
-        $this->assertEquals(1,$col->getDefault());
-        $this->assertEquals("[mix] [nvarchar](256) not null default N'1'",$col.'');
-    }
-    /**
-     * 
-     * @param MSSQLColumn $col
-     * @depends testConstructor09
-     */
-    public function testSetScale00($col) {
-        $col->setSize(10);
-        $this->assertTrue($col->setScale(3));
-        $this->assertEquals(3,$col->getScale());
-        $this->assertTrue($col->setScale(0));
-        $this->assertEquals(0,$col->getScale());
-        $this->assertTrue($col->setScale(9));
-        $this->assertEquals(9,$col->getScale());
-        $this->assertFalse($col->setScale(-1));
-        $this->assertEquals(9,$col->getScale());
-        $this->assertFalse($col->setScale(10));
-        $this->assertEquals(9,$col->getScale());
-    }
-    /**
-     * @test
-     */
-    public function testSetType00() {
-        $col = new MSSQLColumn();
-        $col->setDatatype('int');
-        $this->assertEquals('int',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-        $this->assertNull($col->getDefault());
-        $col->setSize(11);
-        $col->setDefault(6000);
-        $this->assertEquals(11,$col->getSize());
-        $this->assertEquals(6000,$col->getDefault());
-        $col->setDatatype('  int ');
-        $col->setSize(12);
-        $col->setDefault(698);
-        $this->assertEquals('int',$col->getDatatype());
-        $this->assertEquals(12,$col->getSize());
-    }
-    
-    /**
-     * @test
-     */
-    public function testSetType02() {
-        $col = new MSSQLColumn();
-        $col->setDatatype('varchar');
-        $this->assertEquals('varchar',$col->getDatatype());
-        $col->setSize(5000);
-        $this->assertEquals(5000,$col->getSize());
-        $col->setDefault('Hello');
-        $this->assertSame('Hello',$col->getDefault());
-        $col->setDatatype('int');
-        $this->assertEquals('int',$col->getDatatype());
-        $col->setSize(1);
-        $this->assertEquals(1,$col->getSize());
-        $this->assertNull($col->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testSetType03() {
-        $col = new MSSQLColumn();
-        $col->setDatatype('datetime2');
-        $this->assertEquals('datetime2',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-        $col->setDefault('2019-01-11');
-        $this->assertSame('2019-01-11',$col->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testSetType04() {
-        $col = new MSSQLColumn();
-        $col->setDatatype('datetime2');
-        $col->setDefault('2019-01-11 28:00:00');
-        $this->assertEquals('datetime2',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-        $this->assertNull($col->getDefault());
-        $col->setDefault('2019-13-11');
-        $this->assertNull($col->getDefault());
-        $col->setDefault('2019-04-44');
-        $this->assertNull($col->getDefault());
-        
-    }
-    /**
-     * @test
-     */
-    public function testSetType05() {
-        $col = new MSSQLColumn();
-        $col->setDatatype('datetime2');
-        $col->setDefault('now');
-        $this->assertEquals('now', $col->getDefault());
-        $col->setDefault('current_timestamp');
-        $this->assertEquals('current_timestamp', $col->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testSetType06() {
-        $col = new MSSQLColumn();
-        $col->setDatatype('datetime2');
-        $col->setDefault('now');
-        $this->assertEquals('now', $col->getDefault());
-        $col->setDefault('current_timestamp');
-        $this->assertEquals('current_timestamp', $col->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testSetType07() {
-        $col = new MSSQLColumn();
-        $col->setDatatype('datetime2');
-        $col->setSize(0);
-        $this->assertEquals(0, $col->getSize());
-        $col->setDatatype('datetime2');
-        $this->assertEquals(0, $col->getSize());
-        $col->setDatatype('int');
-        $this->assertEquals(1, $col->getSize());
-    }
-    /**
-     * @test
-     */
-    public function testMap00() {
-        $col = new MSSQLColumn();
-        $col->setDatatype('datetime2');
-        $col->setDefault('now');
-        $this->assertEquals('now', $col->getDefault());
-        $col->setDefault('current_timestamp');
-        
-        $newCol = ColumnFactory::map('mysql', $col);
-        $this->assertTrue($newCol instanceof MySQLColumn);
-        $this->assertEquals('col', $newCol->getNormalName());
-        $this->assertEquals('datetime', $newCol->getDatatype());
-        $this->assertEquals('current_timestamp', $newCol->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testIdentity00() {
-        $col = new MSSQLColumn();
-        $this->assertFalse($col->isIdentity());
-        $col->setIsIdentity(true);
-        $this->assertFalse($col->isIdentity());
-        $col->setDatatype('bigint');
-        $col->setIsIdentity(true);
-        $this->assertTrue($col->isIdentity());
-        $col->setDatatype('mixed');
-        $this->assertFalse($col->isIdentity());
-        $col->setDatatype('int');
-        $col->setIsIdentity(true);
-        $this->assertTrue($col->isIdentity());
-        $col->setDatatype('bigint');
-        $col->setIsIdentity(true);
-    }
-    /**
-     * @test
-     */
-    public function testIdentity01() {
-        $col = new MSSQLColumn('iden', 'int');
-        $col->setIsIdentity(true);
-        $this->assertEquals('[iden] [int] identity(1,1) not null',$col.'');
-    }
-    /**
-     * @test
-     */
-    public function testIdentity02() {
-        $col = new MSSQLColumn('iden', 'bigint');
-        $col->setIsIdentity(true);
-        $this->assertEquals('[iden] [bigint] identity(1,1) not null',$col.'');
-    }
-}
+<?php
+namespace WebFiori\Tests\Database\MsSql;
+
+use PHPUnit\Framework\TestCase;
+use WebFiori\Database\Factory\ColumnFactory;
+use WebFiori\Database\MsSql\MSSQLColumn;
+use WebFiori\Database\MySql\MySQLColumn;
+/**
+ * Description of MSSQLColumnTest
+ *
+ * @author Ibrahim
+ */
+class MSSQLColumnTest extends TestCase {
+    /**
+     * @test
+     */
+    public function testConstructor00() {
+        $col = new MSSQLColumn();
+        $this->assertEquals('nvarchar',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+        $this->assertEquals('[col]',$col->getName());
+    }
+    /**
+     * @test
+     */
+    public function testConstructor01() {
+        $col = new MSSQLColumn('user_id ', 'varchar', 15);
+        $this->assertEquals('varchar',$col->getDatatype());
+        $this->assertEquals(15,$col->getSize());
+        $this->assertEquals('[user_id]',$col->getName());
+    }
+    /**
+     * @test
+     */
+    public function testConstructor02() {
+        $this->expectException('WebFiori\Database\DatabaseException');
+        $col = new MSSQLColumn('valid_name', 'invalid type', 15);
+        $this->assertEquals('varchar',$col->getDatatype());
+        $this->assertEquals(15,$col->getSize());
+        $this->assertEquals('valid_name',$col->getName());
+    }
+    /**
+     * @test
+     */
+    public function testConstructor03() {
+        $col = new MSSQLColumn('valid_name', 'InT', 15);
+        $this->assertEquals('int',$col->getDatatype());
+        $this->assertEquals(15,$col->getSize());
+        $this->assertEquals('[valid_name]',$col->getName());
+    }
+    /**
+     * @test
+     */
+    public function testConstructor04() {
+        $col = new MSSQLColumn('valid_name', 'Varchar ', 15);
+        $this->assertEquals('varchar',$col->getDatatype());
+        $this->assertEquals(15,$col->getSize());
+        $this->assertEquals('[valid_name]',$col->getName());
+    }
+    /**
+     * @test
+     */
+    public function testConstructor06() {
+        $col = new MSSQLColumn('valid_name', 'Varchar ', 0);
+        $this->assertEquals('varchar',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+        $this->assertEquals('[valid_name]',$col->getName());
+    }
+    /**
+     * @test
+     */
+    public function testConstructor07() {
+        $col = new MSSQLColumn('amount', 'decimal ');
+        $this->assertEquals('decimal',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+
+        return $col;
+    }
+    /**
+     * @test
+     */
+    public function testConstructor08() {
+        $col = new MSSQLColumn('amount', 'decimal ',0);
+        $this->assertEquals('decimal',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+        $this->assertEquals(0,$col->getScale());
+
+        return $col;
+    }
+    /**
+     * @test
+     */
+    public function testConstructor09() {
+        $col = new MSSQLColumn('amount', 'decimal ',1);
+        $this->assertEquals('decimal',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+        $this->assertEquals(0,$col->getScale());
+
+        return $col;
+    }
+    /**
+     * @test
+     */
+    public function testConstructor10() {
+        $col = new MSSQLColumn('amount', 'decimal ',2);
+        $this->assertEquals('decimal',$col->getDatatype());
+        $this->assertEquals(2,$col->getSize());
+        $this->assertEquals(0,$col->getScale());
+
+        return $col;
+    }
+    /**
+     * @test
+     */
+    public function testConstructor11() {
+        $col = new MSSQLColumn('amount', 'decimal ',3);
+        $this->assertEquals('decimal',$col->getDatatype());
+        $this->assertEquals(3,$col->getSize());
+        $this->assertEquals(0,$col->getScale());
+
+        return $col;
+    }
+    /**
+     * @test
+     */
+    public function testConstructor12() {
+        $col = new MSSQLColumn('amount', 'decimal ',4);
+        $this->assertEquals('decimal',$col->getDatatype());
+        $this->assertEquals(4,$col->getSize());
+        $this->assertEquals(0,$col->getScale());
+
+        return $col;
+    }
+    /**
+     * @test
+     */
+    public function testConstructor13() {
+        $col = new MSSQLColumn('amount', 'decimal ',-9);
+        $this->assertEquals('decimal',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+        $this->assertEquals(0,$col->getScale());
+
+        return $col;
+    }
+    /**
+     * @test
+     */
+    public function testConstructor14() {
+        $col = new MSSQLColumn('free_text', 'varchar ', 44);
+        $this->assertEquals("'This isn''t good.'", $col->cleanValue("This isn't good."));
+
+        return $col;
+    }
+    /**
+     * @test
+     */
+    public function testCreateCol00() {
+        $colObj = MSSQLColumn::createColObj([]);
+        $this->assertNull($colObj);
+    }
+    /**
+     * @test
+     */
+    public function testCreateCol01() {
+        $colObj = MSSQLColumn::createColObj([
+            'name' => 'my_col',
+            'validator' => function ($orgVal, $cleaned) {
+                return 'Hello '.$cleaned;
+            }
+        ]);
+        $this->assertNotNull($colObj);
+        $this->assertEquals('[my_col]', $colObj->getName());
+        $this->assertEquals('mixed', $colObj->getDatatype());
+        $this->assertEquals(1, $colObj->getSize());
+        $this->assertEquals("N'Hello Ibrahim'", $colObj->cleanValue('Ibrahim'));
+    }
+    /**
+     * @test
+     */
+    public function testCustomCleaner00() {
+        $col = new MSSQLColumn('hello', 'varchar');
+        $col->setCustomFilter(function($originalVal, $basicFilterResult){
+            
+        });
+        $this->assertNull($col->cleanValue('Hello World'));
+        $col->setCustomFilter(function($originalVal, $basicFilterResult){
+            return $originalVal.'?';
+        });
+        $this->assertEquals("'Hello World.?'",$col->cleanValue('Hello World.'));
+    }
+    /**
+     * @test
+     */
+    public function testCustomCleaner01() {
+        $col = new MSSQLColumn('hello', 'int');
+        $col->setCustomFilter(function($originalVal, $basicFilterResult){
+            return $basicFilterResult*10;
+        });
+        $this->assertEquals(0,$col->cleanValue('Hello World.'));
+        $this->assertEquals(10,$col->cleanValue(1));
+        $this->assertEquals(260,$col->cleanValue(26));
+        $col->setCustomFilter(function($originalVal, $basicFilterResult){
+            return $basicFilterResult*$originalVal;
+        });
+        $this->assertEquals(100,$col->cleanValue(10));
+        $this->assertEquals(9,$col->cleanValue(3));
+    }
+    /**
+     * @test
+     */
+    public function testCustomCleaner02() {
+        $col = new MSSQLColumn('hello', 'int');
+        $col->setCustomFilter(function(){
+            return 5;
+        });
+        $this->assertEquals(5,$col->cleanValue('Hello World.'));
+    }
+    /**
+     * @test
+     */
+    public function testGetPHPType00() {
+        $colObj = new MSSQLColumn();
+        $this->assertEquals('string', $colObj->getPHPType());
+        $colObj->setIsNull(true);
+        $this->assertEquals('string|null', $colObj->getPHPType());
+    }
+    /**
+     * @test
+     */
+    public function testGetPHPType01() {
+        $colObj = new MSSQLColumn('col', 'money');
+        $this->assertEquals('float', $colObj->getPHPType());
+        $colObj->setIsNull(true);
+        $this->assertEquals('float|null', $colObj->getPHPType());
+    }
+    /**
+     * @test
+     */
+    public function testGetPHPType02() {
+        $colObj = new MSSQLColumn('col', 'bool');
+        $this->assertEquals('bool', $colObj->getPHPType());
+        $colObj->setIsNull(true);
+        $this->assertEquals('bool', $colObj->getPHPType());
+    }
+    /**
+     * @test
+     */
+    public function testGetPHPType03() {
+        $colObj = new MSSQLColumn('col', 'decimal');
+        $this->assertEquals('float', $colObj->getPHPType());
+        $colObj->setIsNull(true);
+        $this->assertEquals('float|null', $colObj->getPHPType());
+    }
+    /**
+     * @test
+     */
+    public function testGetPHPType04() {
+        $colObj = new MSSQLColumn('col', 'binary');
+        $this->assertEquals('string', $colObj->getPHPType());
+        $colObj->setIsNull(true);
+        $this->assertEquals('string|null', $colObj->getPHPType());
+    }
+    /**
+     * @test
+     */
+    public function testGetPHPType05() {
+        $colObj = new MSSQLColumn('col', 'datetime2');
+        $this->assertEquals('string', $colObj->getPHPType());
+        $colObj->setIsNull(true);
+        $this->assertEquals('string|null', $colObj->getPHPType());
+    }
+    /**
+     * @test
+     */
+    public function testGetPHPType06() {
+        $colObj = new MSSQLColumn('col', 'mixed');
+        $this->assertEquals('string', $colObj->getPHPType());
+        $colObj->setIsNull(true);
+        $this->assertEquals('string|null', $colObj->getPHPType());
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault00() {
+        $col = new MSSQLColumn('date', 'datetime2');
+        $col->setDefault('2019-11-09');
+        $this->assertEquals('2019-11-09',$col->getDefault());
+        $this->assertEquals('[date] [datetime2](1) not null default \'2019-11-09\'',$col.'');
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault01() {
+        $col = new MSSQLColumn('date', 'datetime2');
+        $col->setDefault('2019-07-07 09:09:09');
+        $this->assertEquals('2019-07-07 09:09:09',$col->getDefault());
+        $this->assertEquals('[date] [datetime2](1) not null default \'2019-07-07 09:09:09\'',$col.'');
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault02() {
+        $col = new MSSQLColumn('date', 'datetime2');
+        $col->setDefault('');
+        $this->assertNull($col->getDefault());
+        $this->assertEquals('[date] [datetime2](1) not null',$col.'');
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault03() {
+        $col = new MSSQLColumn('date', 'datetime2');
+        $col->setDefault('2019-07-07 09:09:09');
+        $this->assertEquals('2019-07-07 09:09:09',$col->getDefault());
+        $col->setSize(4);
+        $this->assertEquals('[date] [datetime2](4) not null default \'2019-07-07 09:09:09\'',$col.'');
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault04() {
+        $col = new MSSQLColumn('date', 'datetime2');
+        $col->setDefault('2019-15-07 09:09:09');
+        $this->assertNull($col->getDefault());
+        $this->assertEquals('[date] [datetime2](1) not null',$col.'');
+        $col->setDefault('2019-12-33 09:09:09');
+        $this->assertNull($col->getDefault());
+        $this->assertEquals('[date] [datetime2](1) not null',$col.'');
+        $col->setDefault('2019-12-31 24:09:09');
+        $this->assertNull($col->getDefault());
+        $col->setDefault('2019-12-31 23:60:09');
+        $this->assertNull($col->getDefault());
+        $col->setDefault('2019-12-31 23:59:60');
+        $this->assertNull($col->getDefault());
+        $col->setDefault('2019-12-31 23:59:59');
+        $this->assertEquals('2019-12-31 23:59:59',$col->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault05() {
+        $col = new MSSQLColumn('id', 'int');
+        $this->assertEquals('[id] [int] not null',$col.'');
+        $col->setDefault(-122);
+        $this->assertEquals(-122,$col->getDefault());
+        $this->assertEquals('[id] [int] not null default -122',$col.'');
+        $col->setDefault(null);
+        $this->assertNull($col->getDefault());
+        $col->setDefault('a string');
+        $this->assertEquals(0,$col->getDefault());
+        $col->setDefault(1.8);
+        $this->assertEquals(1,$col->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault06() {
+        $col = new MSSQLColumn('id', 'varchar');
+        $this->assertEquals('[id] [varchar](1) not null',$col.'');
+        $col->setDefault('A random string.');
+        $this->assertEquals('A random string.',$col->getDefault());
+        $this->assertEquals('[id] [varchar](1) not null default \'A random string.\'',$col.'');
+        $col->setDefault(null);
+        $this->assertNull($col->getDefault());
+        $col->setDefault(33);
+        $this->assertEquals(33,$col->getDefault());
+        $col->setDefault(1.8);
+        $this->assertEquals(1.8,$col->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault07() {
+        $col = new MSSQLColumn('id', 'decimal');
+        $this->assertEquals('[id] [decimal](1,0) not null',$col.'');
+        $col->setDefault(1);
+        $this->assertEquals(1,$col->getDefault());
+        $this->assertEquals('[id] [decimal](1,0) not null default 1',$col.'');
+        $col->setDefault(1.66);
+        $this->assertEquals(1.66,$col->getDefault());
+        $this->assertEquals('[id] [decimal](1,0) not null default 1.66',$col.'');
+        $col->setDefault(null);
+        $this->assertNull($col->getDefault());
+        $col->setDefault('33');
+        $this->assertEquals(33,$col->getDefault());
+        $col->setDefault('');
+        $this->assertEquals(0,$col->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault08() {
+        $col = new MSSQLColumn('date', 'datetime2');
+        $col->setDefault('now');
+        $this->assertEquals('now',$col->getDefault());
+        $this->assertEquals('[date] [datetime2](1) not null default getdate()',$col.'');
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault09() {
+        $col = new MSSQLColumn('mix', 'mixed');
+        $col->setDefault('2019-11-09');
+        $this->assertEquals("2019-11-09",$col->getDefault());
+        $this->assertEquals("[mix] [nvarchar](256) not null default N'2019-11-09'",$col.'');
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault10() {
+        $col = new MSSQLColumn('mix', 'mixed');
+        $col->setDefault(1);
+        $this->assertEquals(1,$col->getDefault());
+        $this->assertEquals("[mix] [nvarchar](256) not null default N'1'",$col.'');
+    }
+    /**
+     * 
+     * @param MSSQLColumn $col
+     * @depends testConstructor09
+     */
+    public function testSetScale00($col) {
+        $col->setSize(10);
+        $this->assertTrue($col->setScale(3));
+        $this->assertEquals(3,$col->getScale());
+        $this->assertTrue($col->setScale(0));
+        $this->assertEquals(0,$col->getScale());
+        $this->assertTrue($col->setScale(9));
+        $this->assertEquals(9,$col->getScale());
+        $this->assertFalse($col->setScale(-1));
+        $this->assertEquals(9,$col->getScale());
+        $this->assertFalse($col->setScale(10));
+        $this->assertEquals(9,$col->getScale());
+    }
+    /**
+     * @test
+     */
+    public function testSetType00() {
+        $col = new MSSQLColumn();
+        $col->setDatatype('int');
+        $this->assertEquals('int',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+        $this->assertNull($col->getDefault());
+        $col->setSize(11);
+        $col->setDefault(6000);
+        $this->assertEquals(11,$col->getSize());
+        $this->assertEquals(6000,$col->getDefault());
+        $col->setDatatype('  int ');
+        $col->setSize(12);
+        $col->setDefault(698);
+        $this->assertEquals('int',$col->getDatatype());
+        $this->assertEquals(12,$col->getSize());
+    }
+    
+    /**
+     * @test
+     */
+    public function testSetType02() {
+        $col = new MSSQLColumn();
+        $col->setDatatype('varchar');
+        $this->assertEquals('varchar',$col->getDatatype());
+        $col->setSize(5000);
+        $this->assertEquals(5000,$col->getSize());
+        $col->setDefault('Hello');
+        $this->assertSame('Hello',$col->getDefault());
+        $col->setDatatype('int');
+        $this->assertEquals('int',$col->getDatatype());
+        $col->setSize(1);
+        $this->assertEquals(1,$col->getSize());
+        $this->assertNull($col->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testSetType03() {
+        $col = new MSSQLColumn();
+        $col->setDatatype('datetime2');
+        $this->assertEquals('datetime2',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+        $col->setDefault('2019-01-11');
+        $this->assertSame('2019-01-11',$col->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testSetType04() {
+        $col = new MSSQLColumn();
+        $col->setDatatype('datetime2');
+        $col->setDefault('2019-01-11 28:00:00');
+        $this->assertEquals('datetime2',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+        $this->assertNull($col->getDefault());
+        $col->setDefault('2019-13-11');
+        $this->assertNull($col->getDefault());
+        $col->setDefault('2019-04-44');
+        $this->assertNull($col->getDefault());
+        
+    }
+    /**
+     * @test
+     */
+    public function testSetType05() {
+        $col = new MSSQLColumn();
+        $col->setDatatype('datetime2');
+        $col->setDefault('now');
+        $this->assertEquals('now', $col->getDefault());
+        $col->setDefault('current_timestamp');
+        $this->assertEquals('current_timestamp', $col->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testSetType06() {
+        $col = new MSSQLColumn();
+        $col->setDatatype('datetime2');
+        $col->setDefault('now');
+        $this->assertEquals('now', $col->getDefault());
+        $col->setDefault('current_timestamp');
+        $this->assertEquals('current_timestamp', $col->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testSetType07() {
+        $col = new MSSQLColumn();
+        $col->setDatatype('datetime2');
+        $col->setSize(0);
+        $this->assertEquals(0, $col->getSize());
+        $col->setDatatype('datetime2');
+        $this->assertEquals(0, $col->getSize());
+        $col->setDatatype('int');
+        $this->assertEquals(1, $col->getSize());
+    }
+    /**
+     * @test
+     */
+    public function testMap00() {
+        $col = new MSSQLColumn();
+        $col->setDatatype('datetime2');
+        $col->setDefault('now');
+        $this->assertEquals('now', $col->getDefault());
+        $col->setDefault('current_timestamp');
+        
+        $newCol = ColumnFactory::map('mysql', $col);
+        $this->assertTrue($newCol instanceof MySQLColumn);
+        $this->assertEquals('col', $newCol->getNormalName());
+        $this->assertEquals('datetime', $newCol->getDatatype());
+        $this->assertEquals('current_timestamp', $newCol->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testIdentity00() {
+        $col = new MSSQLColumn();
+        $this->assertFalse($col->isIdentity());
+        $col->setIsIdentity(true);
+        $this->assertFalse($col->isIdentity());
+        $col->setDatatype('bigint');
+        $col->setIsIdentity(true);
+        $this->assertTrue($col->isIdentity());
+        $col->setDatatype('mixed');
+        $this->assertFalse($col->isIdentity());
+        $col->setDatatype('int');
+        $col->setIsIdentity(true);
+        $this->assertTrue($col->isIdentity());
+        $col->setDatatype('bigint');
+        $col->setIsIdentity(true);
+    }
+    /**
+     * @test
+     */
+    public function testIdentity01() {
+        $col = new MSSQLColumn('iden', 'int');
+        $col->setIsIdentity(true);
+        $this->assertEquals('[iden] [int] identity(1,1) not null',$col.'');
+    }
+    /**
+     * @test
+     */
+    public function testIdentity02() {
+        $col = new MSSQLColumn('iden', 'bigint');
+        $col->setIsIdentity(true);
+        $this->assertEquals('[iden] [bigint] identity(1,1) not null',$col.'');
+    }
+}
diff --git a/tests/WebFiori/Tests/Database/MsSql/MSSQLTableTest.php b/tests/WebFiori/Tests/Database/MsSql/MSSQLTableTest.php
index 3fe74a6f..d92fc20a 100644
--- a/tests/WebFiori/Tests/Database/MsSql/MSSQLTableTest.php
+++ b/tests/WebFiori/Tests/Database/MsSql/MSSQLTableTest.php
@@ -1,572 +1,572 @@
-<?php
-namespace WebFiori\Tests\Database\MsSql;
-
-use PHPUnit\Framework\TestCase;
-use WebFiori\Database\ColOption;
-use WebFiori\Database\DataType;
-use WebFiori\Database\MsSql\MSSQLColumn;
-use WebFiori\Database\MsSql\MSSQLTable;
-use WebFiori\Database\MySql\MySQLTable;
-use WebFiori\Database\Table;
-/**
- * Description of MSSQLTableTest
- *
- * @author Ibrahim
- */
-class MSSQLTableTest extends TestCase {
-    /**
-     * @test
-     */
-    public function testAddColumn00() {
-        $table = new MSSQLTable();
-        $this->assertTrue($table->addColumn('new-col', new MSSQLColumn()));
-        $this->assertFalse($table->addColumn('new-col-2', new MSSQLColumn()));
-        $this->assertTrue($table->addColumn('new-col-2', new MSSQLColumn('col_2', 'varchar')));
-        $this->assertFalse($table->addColumn('new-col-2', new MSSQLColumn('col_3', 'varchar')));
-        $this->assertTrue($table->addColumn('new col-2', new MSSQLColumn('new col-2', 'varchar')));
-        
-        return $table;
-    }
-    /**
-     * @test
-     */
-    public function testAddColumn01() {
-        $table = new MSSQLTable();
-        $this->assertTrue($table->addColumn(' new-col ', new MSSQLColumn()));
-        $this->assertTrue($table->addColumn('valid key', new MSSQLColumn('col_2')));
-        $this->assertFalse($table->addColumn('-', new MSSQLColumn('col_2')));
-        $this->assertFalse($table->addColumn('--', new MSSQLColumn('col_2')));
-
-        return $table;
-    }
-    /**
-     * @test
-     */
-    public function testAddColumn02() {
-        $table = new MSSQLTable();
-        $table->addColumns([
-            'id' => new MSSQLColumn('col-01'),
-            'name' => new MSSQLColumn('col-02', 'int'),
-            'Other Col' => []
-        ]);
-        $this->assertTrue($table->hasColumnWithKey('id'));
-        $this->assertTrue($table->hasColumnWithKey('name'));
-        $this->assertTrue($table->hasColumnWithKey('Other Col'));
-        $this->assertTrue($table->hasColumn('col-01'));
-        $this->assertTrue($table->hasColumn('col-02'));
-        $this->assertTrue($table->hasColumn('Other Col'));
-
-        return $table;
-    }
-    /**
-     * @test
-     */
-    public function testConstructor01() {
-        $table = new MSSQLTable('valid_name');
-        $this->assertEquals('[valid_name]',$table->getName());
-        $this->assertEquals('valid_name',$table->getNormalName());
-    }
-    /**
-     * @test
-     */
-    public function testConstructor02() {
-        $table = new MSSQLTable('    another_Valid_Name    ');
-        $this->assertNull($table->getOldName());
-        $this->assertEquals('[another_Valid_Name]',$table->getName());
-        $table->setName('new-name');
-        $this->assertEquals('[another_Valid_Name]', $table->getOldName());
-    }
-    /**
-     * @test
-     */
-    public function testFK1() {
-        $table = new MSSQLTable('users');
-        $table->addColumns([
-            'user-id' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::SIZE => 11,
-                ColOption::PRIMARY => true,
-                ColOption::AUTO_INCREMENT => true
-            ],
-            'email' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256,
-                ColOption::UNIQUE => true
-            ],
-            'username' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 20,
-                ColOption::UNIQUE => true
-            ],
-            'password' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256
-            ],
-            'created-on' => [
-                ColOption::TYPE => DataType::DATETIME2,
-                ColOption::DEFAULT => 'now',
-            ],
-        ]);
-        $table2 = new MSSQLTable('t');
-        $table2->addColumns([
-            'user-id' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::SIZE => 11,
-                ColOption::PRIMARY => true,
-                ColOption::AUTO_INCREMENT => true
-            ],
-            'email' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256,
-                ColOption::UNIQUE => true
-            ],
-        ]);
-        $table2->addReference($table, ['user-id', 'email'], 'fk_ok', 'cascade', 'cascade');
-        $key = $table2->getForeignKey('fk_ok');
-        $this->assertEquals(2, count($key->getSourceCols()));
-        $this->assertEquals("if not exists (select * from sysobjects where name='t' and xtype='U')\n"
-                . "create table [t] (\n"
-                . "    [user_id] [int] not null,\n"
-                . "    [email] [varchar](256) not null,\n"
-                . "    constraint t_pk primary key clustered([user_id]) on [PRIMARY],\n"
-                . "    constraint fk_ok foreign key ([user_id], [email]) references [users] ([user_id], [email]) on update cascade on delete cascade,\n"
-                . "    constraint AK_t unique (email)\n"
-                . ")\n"
-                . "", $table2->toSQL());
-    }
-    /**
-     * @test
-     */
-    public function testFK2() {
-        $table = new MSSQLTable('users');
-        $table->addColumns([
-            'user-id' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::SIZE => 11,
-                ColOption::PRIMARY => true,
-                ColOption::AUTO_INCREMENT => true
-            ],
-            'email' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256,
-                ColOption::UNIQUE => true
-            ],
-            'username' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 20,
-                ColOption::UNIQUE => true
-            ],
-            'password' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256
-            ],
-            'created-on' => [
-                ColOption::TYPE => DataType::DATETIME2,
-                ColOption::DEFAULT => 'now',
-            ],
-        ]);
-        
-        $table2 = new MSSQLTable('t');
-        $table2->addColumns([
-            'user-id-super' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::SIZE => 11,
-                ColOption::PRIMARY => true,
-            ],
-            'email-x' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256,
-                ColOption::UNIQUE => true
-            ],
-        ]);
-        $table2->addReference($table, [
-            'user-id-super' => 'user-id','email-x' =>  'email'], 'fk_ok', 'cascade', 'cascade');
-        $key = $table2->getForeignKey('fk_ok');
-        $this->assertEquals(2, count($key->getSourceCols()));
-        $this->assertEquals("if not exists (select * from sysobjects where name='t' and xtype='U')\n"
-                . "create table [t] (\n"
-                . "    [user_id_super] [int] not null,\n"
-                . "    [email_x] [varchar](256) not null,\n"
-                . "    constraint t_pk primary key clustered([user_id_super]) on [PRIMARY],\n"
-                . "    constraint fk_ok foreign key ([user_id_super], [email_x]) references [users] ([user_id], [email]) on update cascade on delete cascade,\n"
-                . "    constraint AK_t unique (email_x)\n"
-                . ")\n"
-                . "", $table2->toSQL());
-    }
-    public function testFk3() {
-        $t1 = new MSSQLTable('users');
-        $t1->addColumns([
-            'id' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::PRIMARY => true,
-                ColOption::IDENTITY => true
-            ],
-            'name' => [
-                ColOption::TYPE => DataType::NVARCHAR,
-                ColOption::SIZE => 128,
-                ColOption::UNIQUE => true
-            ],
-            'email' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256,
-                ColOption::UNIQUE => true
-            ]
-        ]);
-        $this->assertEquals("if not exists (select * from sysobjects where name='users' and xtype='U')\n"
-                . "create table [users] (\n"
-                . "    [id] [int] identity(1,1) not null,\n"
-                . "    [name] [nvarchar](128) not null,\n"
-                . "    [email] [varchar](256) not null,\n"
-                . "    constraint users_pk primary key clustered([id]) on [PRIMARY],\n"
-                . "    constraint AK_users unique (name, email)\n"
-                . ")\n", $t1->toSQL());
-        $t2 = new MSSQLTable('locations');
-        $t2->addColumns([
-            'id' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::PRIMARY => true
-            ],
-            'name' => [
-                ColOption::TYPE => DataType::NVARCHAR,
-                ColOption::SIZE => 128
-            ],
-            'added-by' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::FK => [
-                    ColOption::FK_TABLE => $t1,
-                    ColOption::FK_COL => 'id',
-                    ColOption::FK_NAME => 'added_by_fk'
-                ]
-            ]
-        ]);
-        $this->assertEquals("if not exists (select * from sysobjects where name='locations' and xtype='U')\n"
-                . "create table [locations] (\n"
-                . "    [id] [int] not null,\n"
-                . "    [name] [nvarchar](128) not null,\n"
-                . "    [added_by] [int] not null,\n"
-                . "    constraint locations_pk primary key clustered([id]) on [PRIMARY],\n"
-                . "    constraint added_by_fk foreign key ([added_by]) references [users] ([id]) on update set null on delete set null\n"
-                . ")\n", $t2->toSQL());
-        $t3 = new MSSQLTable('user_location');
-        $t3->addColumns([
-            'user-id' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::PRIMARY => true
-            ],
-            'location' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::PRIMARY => true
-            ]
-        ]);
-        $t3->addReference($t1, ['user-id' => 'id'], 'user_loc_fk');
-        $t3->addReference($t2, ['location' => 'id'], 'loc_fk');
-        $this->assertEquals(2, $t3->getForeignKeysCount());
-        $this->assertEquals("if not exists (select * from sysobjects where name='user_location' and xtype='U')\n"
-                . "create table [user_location] (\n"
-                . "    [user_id] [int] not null,\n"
-                . "    [location] [int] not null,\n"
-                . "    constraint user_location_pk primary key clustered([user_id], [location]) on [PRIMARY],\n"
-                . "    constraint user_loc_fk foreign key ([user_id]) references [users] ([id]) on update set null on delete set null,\n"
-                . "    constraint loc_fk foreign key ([location]) references [locations] ([id]) on update set null on delete set null\n"
-                . ")\n", $t3->toSQL());
-    }
-    public function testMap00() {
-        $table = new MSSQLTable('users');
-        $table->addColumns([
-            'user-id' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::SIZE => 11,
-                ColOption::PRIMARY => true,
-                ColOption::AUTO_INCREMENT => true
-            ],
-            'email' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256,
-                ColOption::UNIQUE => true
-            ],
-            'username' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 20,
-                ColOption::UNIQUE => true
-            ],
-            'password' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256
-            ],
-            'created-on' => [
-                ColOption::TYPE => DataType::DATETIME2,
-                ColOption::DEFAULT => 'now',
-            ],
-        ]);
-        $table2 = new MSSQLTable('t');
-        $table2->addColumns([
-            'user-id' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::SIZE => 11,
-                ColOption::PRIMARY => true,
-                ColOption::AUTO_INCREMENT => true
-            ],
-            'email' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256,
-                ColOption::UNIQUE => true
-            ],
-        ]);
-        $table2->addReference($table, ['user-id', 'email'], 'fk_ok', 'cascade', 'cascade');
-        $key = $table2->getForeignKey('fk_ok');
-        $this->assertEquals(2, count($key->getSourceCols()));
-        $this->assertEquals("if not exists (select * from sysobjects where name='t' and xtype='U')\n"
-                . "create table [t] (\n"
-                . "    [user_id] [int] not null,\n"
-                . "    [email] [varchar](256) not null,\n"
-                . "    constraint t_pk primary key clustered([user_id]) on [PRIMARY],\n"
-                . "    constraint fk_ok foreign key ([user_id], [email]) references [users] ([user_id], [email]) on update cascade on delete cascade,\n"
-                . "    constraint AK_t unique (email)\n"
-                . ")\n"
-                . "", $table2->toSQL());
-        
-        $mappedInstance = Table::map('mysql', $table2);
-        $this->assertTrue($mappedInstance instanceof MySQLTable);
-        $this->assertEquals('`t`', $mappedInstance->getName());
-        $this->assertEquals("create table if not exists `t` (\n"
-                . "    `user_id` int not null unique,\n"
-                . "    `email` varchar(256) not null unique collate utf8mb4_unicode_520_ci,\n"
-                . "    constraint `t_pk` primary key (`user_id`),\n"
-                . "    constraint `fk_ok` foreign key (`user_id`, `email`) references `users` (`user_id`, `email`) on update cascade on delete cascade\n"
-                . ")\n"
-                . "engine = InnoDB\n"
-                . "default charset = utf8mb4\n"
-                . "collate = utf8mb4_unicode_520_ci;", $mappedInstance->toSQL());
-    }
-    /**
-     * 
-     * @test
-     */
-    public function testGetColByIndex() {
-        $table = new MSSQLTable();
-        $table->addColumns([
-            'user-id' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::SIZE => 11,
-                ColOption::PRIMARY => true
-            ],
-            'username' => [
-                ColOption::SIZE => 20,
-                ColOption::UNIQUE => true
-            ],
-            'email' => [
-                ColOption::SIZE => 150,
-                ColOption::UNIQUE => true
-            ],
-            'password' => [
-                ColOption::SIZE => 64
-            ]
-        ]);
-        $this->assertEquals(4, $table->getColsCount());
-        $col00 = $table->getColByIndex(0);
-        $this->assertEquals('[user_id]',$col00->getName());
-        $this->assertEquals('int',$col00->getDatatype());
-        $this->assertEquals(11,$col00->getSize());
-        $this->assertTrue($col00->isPrimary());
-        $this->assertEquals(1, $table->getPrimaryKeyColsCount());
-        
-        $col01 = $table->getColByIndex(2);
-        $this->assertEquals('mixed',$col01->getDatatype());
-        $this->assertEquals(150,$col01->getSize());
-        $this->assertFalse($col01->isPrimary());
-        $this->asserttrue($col01->isUnique());
-
-        $col02 = $table->getColByIndex(6);
-        $this->assertNull($col02);
-    }
-    /**
-     * @test
-     */
-    public function testIdentity00() {
-        $t1 = new MSSQLTable('users');
-        $t1->addColumns([
-            'id' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::PRIMARY => true,
-                ColOption::IDENTITY => true
-            ],
-            'name' => [
-                ColOption::TYPE => DataType::NVARCHAR,
-                ColOption::SIZE => 128,
-                ColOption::UNIQUE => true
-            ],
-            'email' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256,
-                ColOption::UNIQUE => true
-            ],
-            'age' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::IDENTITY => true
-            ]
-        ]);
-        $this->assertEquals("if not exists (select * from sysobjects where name='users' and xtype='U')\n"
-                . "create table [users] (\n"
-                . "    [id] [int] identity(1,1) not null,\n"
-                . "    [name] [nvarchar](128) not null,\n"
-                . "    [email] [varchar](256) not null,\n"
-                . "    constraint users_pk primary key clustered([id]) on [PRIMARY],\n"
-                . "    constraint AK_users unique (name, email)\n"
-                . ")\n", $t1->toSQL());
-    }
-    /**
-     * 
-     * @param MSSQLTable $table
-     * @depends testAddColumn00
-     */
-    public function testHasCol00($table) {
-        $this->assertTrue($table->hasColumnWithKey('new-col'));
-        $this->assertTrue($table->hasColumnWithKey(' new-col '));
-        $this->assertTrue($table->hasColumnWithKey('new-col-2'));
-        $this->assertTrue($table->hasColumnWithKey('new col-2'));
-        $col = $table->getColByKey('new col-2');
-        $this->assertEquals('[new col-2]', $col->getName());
-    }
-    /**
-     * 
-     * @param MySQLTable $table
-     * @depends testAddColumn00
-     */
-    public function testHasCol01($table) {
-        $this->assertTrue($table->hasColumnWithKey('new-col'));
-        $this->assertFalse($table->hasColumnWithKey('invalid key'));
-        
-    }
-    /**
-     * @test
-     */
-    public function testPrimaryKey00() {
-        $table = new MSSQLTable('hello');
-        $table->addColumns([
-            'id-col'=>[
-                ColOption::PRIMARY => true,
-                ColOption::SIZE => 3
-            ]
-        ]);
-        $this->assertEquals(1, $table->getPrimaryKeyColsCount());
-        return $table;
-    }
-    /**
-     * @test
-     * @param MSSQLTable $table
-     * @depends testPrimaryKey00
-     */
-    public function testPrimaryKey01($table) {
-        $table->addColumns([
-            'id-col-2'=>[
-                ColOption::PRIMARY => true
-            ]
-        ]);
-        $this->assertFalse($table->getColByKey('id-col')->isUnique());
-        $this->assertFalse($table->getColByKey('id-col-2')->isUnique());
-        $this->assertEquals(2, $table->getPrimaryKeyColsCount());
-        return $table;
-    }
-    /**
-     * @test
-     */
-    public function testRemoveColFromRef00() {
-        $table = new MSSQLTable('active_or_not');
-        $table->addColumns([
-            'user-id' => [
-                ColOption::SIZE => 15
-            ],
-            'username' => [
-                ColOption::SIZE => 50
-            ],
-            'is-active' => [
-                ColOption::TYPE => DataType::BOOL
-            ]
-        ]);
-        $table2 = new MSSQLTable('user_info');
-        $table2->addColumns([
-            'user-id' => [
-                ColOption::SIZE => 15
-            ],
-            'first-name' => [
-                ColOption::SIZE => '50'
-            ],
-            'last-name' => [
-                ColOption::SIZE => '50'
-            ]
-        ]);
-        $table2->addReference($table, [
-            'user-id',
-            'first-name' => 'username'
-            ], 'hello_fk');
-        $key = $table2->getForeignKey('hello_fk');
-        $this->assertEquals(2, count($key->getOwnerCols()));
-        $this->assertFalse($key->removeReference('username'));
-        $this->assertTrue($key->removeReference('first-name'));
-        $this->assertEquals(1, count($table2->getForeignKey('hello_fk')->getSourceCols()));
-    }
-    /**
-     * @test
-     */
-    public function testRemoveRef00() {
-        $table = new MSSQLTable();
-        $table->addColumns([
-            'user-id' => [
-                ColOption::SIZE => 15
-            ],
-            'is-active' => [
-                ColOption::TYPE => DataType::BOOL
-            ]
-        ]);
-        $this->assertNull($table->removeReference('not-exist'));
-    }
-    /**
-     * @test
-     */
-    public function testRemoveRef01() {
-        $table = new MSSQLTable('active_or_not');
-        $table->addColumns([
-            'user-id' => [
-                ColOption::SIZE => 15
-            ],
-            'is-active' => [
-                ColOption::TYPE => DataType::BOOL
-            ]
-        ]);
-        $table2 = new MSSQLTable('user_info');
-        $table2->addColumns([
-            'user-id' => [
-                ColOption::SIZE => 15
-            ],
-            'first-name' => [
-                ColOption::SIZE => '50'
-            ],
-            'last-name' => [
-                ColOption::SIZE => '50'
-            ]
-        ]);
-        $table->addReference($table2, ['user-id'], 'hello_fk');
-        $this->assertEquals(1, $table->getForeignKeysCount());
-        $this->assertNull($table->removeReference('not-exist'));
-        $obj = $table->removeReference('hello_fk');
-        $this->assertEquals('hello_fk', $obj->getKeyName());
-        $this->assertEquals(0, $table->getForeignKeysCount());
-    }
-    /**
-     * @test
-     */
-    public function testWithBoolCol00() {
-        $table = new MSSQLTable();
-        $table->addColumns([
-            'user-id' => [
-                ColOption::SIZE => 15
-            ],
-            'is-active' => [
-                ColOption::TYPE => 'boolean'
-            ]
-        ]);
-        $this->assertEquals('boolean',$table->getColByKey('is-active')->getDatatype());
-    }
+<?php
+namespace WebFiori\Tests\Database\MsSql;
+
+use PHPUnit\Framework\TestCase;
+use WebFiori\Database\ColOption;
+use WebFiori\Database\DataType;
+use WebFiori\Database\MsSql\MSSQLColumn;
+use WebFiori\Database\MsSql\MSSQLTable;
+use WebFiori\Database\MySql\MySQLTable;
+use WebFiori\Database\Table;
+/**
+ * Description of MSSQLTableTest
+ *
+ * @author Ibrahim
+ */
+class MSSQLTableTest extends TestCase {
+    /**
+     * @test
+     */
+    public function testAddColumn00() {
+        $table = new MSSQLTable();
+        $this->assertTrue($table->addColumn('new-col', new MSSQLColumn()));
+        $this->assertFalse($table->addColumn('new-col-2', new MSSQLColumn()));
+        $this->assertTrue($table->addColumn('new-col-2', new MSSQLColumn('col_2', 'varchar')));
+        $this->assertFalse($table->addColumn('new-col-2', new MSSQLColumn('col_3', 'varchar')));
+        $this->assertTrue($table->addColumn('new col-2', new MSSQLColumn('new col-2', 'varchar')));
+        
+        return $table;
+    }
+    /**
+     * @test
+     */
+    public function testAddColumn01() {
+        $table = new MSSQLTable();
+        $this->assertTrue($table->addColumn(' new-col ', new MSSQLColumn()));
+        $this->assertTrue($table->addColumn('valid key', new MSSQLColumn('col_2')));
+        $this->assertFalse($table->addColumn('-', new MSSQLColumn('col_2')));
+        $this->assertFalse($table->addColumn('--', new MSSQLColumn('col_2')));
+
+        return $table;
+    }
+    /**
+     * @test
+     */
+    public function testAddColumn02() {
+        $table = new MSSQLTable();
+        $table->addColumns([
+            'id' => new MSSQLColumn('col-01'),
+            'name' => new MSSQLColumn('col-02', 'int'),
+            'Other Col' => []
+        ]);
+        $this->assertTrue($table->hasColumnWithKey('id'));
+        $this->assertTrue($table->hasColumnWithKey('name'));
+        $this->assertTrue($table->hasColumnWithKey('Other Col'));
+        $this->assertTrue($table->hasColumn('col-01'));
+        $this->assertTrue($table->hasColumn('col-02'));
+        $this->assertTrue($table->hasColumn('Other Col'));
+
+        return $table;
+    }
+    /**
+     * @test
+     */
+    public function testConstructor01() {
+        $table = new MSSQLTable('valid_name');
+        $this->assertEquals('[valid_name]',$table->getName());
+        $this->assertEquals('valid_name',$table->getNormalName());
+    }
+    /**
+     * @test
+     */
+    public function testConstructor02() {
+        $table = new MSSQLTable('    another_Valid_Name    ');
+        $this->assertNull($table->getOldName());
+        $this->assertEquals('[another_Valid_Name]',$table->getName());
+        $table->setName('new-name');
+        $this->assertEquals('[another_Valid_Name]', $table->getOldName());
+    }
+    /**
+     * @test
+     */
+    public function testFK1() {
+        $table = new MSSQLTable('users');
+        $table->addColumns([
+            'user-id' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::SIZE => 11,
+                ColOption::PRIMARY => true,
+                ColOption::AUTO_INCREMENT => true
+            ],
+            'email' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256,
+                ColOption::UNIQUE => true
+            ],
+            'username' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 20,
+                ColOption::UNIQUE => true
+            ],
+            'password' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256
+            ],
+            'created-on' => [
+                ColOption::TYPE => DataType::DATETIME2,
+                ColOption::DEFAULT => 'now',
+            ],
+        ]);
+        $table2 = new MSSQLTable('t');
+        $table2->addColumns([
+            'user-id' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::SIZE => 11,
+                ColOption::PRIMARY => true,
+                ColOption::AUTO_INCREMENT => true
+            ],
+            'email' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256,
+                ColOption::UNIQUE => true
+            ],
+        ]);
+        $table2->addReference($table, ['user-id', 'email'], 'fk_ok', 'cascade', 'cascade');
+        $key = $table2->getForeignKey('fk_ok');
+        $this->assertEquals(2, count($key->getSourceCols()));
+        $this->assertEquals("if not exists (select * from sysobjects where name='t' and xtype='U')\n"
+                . "create table [t] (\n"
+                . "    [user_id] [int] not null,\n"
+                . "    [email] [varchar](256) not null,\n"
+                . "    constraint t_pk primary key clustered([user_id]) on [PRIMARY],\n"
+                . "    constraint fk_ok foreign key ([user_id], [email]) references [users] ([user_id], [email]) on update cascade on delete cascade,\n"
+                . "    constraint AK_t unique (email)\n"
+                . ")\n"
+                . "", $table2->toSQL());
+    }
+    /**
+     * @test
+     */
+    public function testFK2() {
+        $table = new MSSQLTable('users');
+        $table->addColumns([
+            'user-id' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::SIZE => 11,
+                ColOption::PRIMARY => true,
+                ColOption::AUTO_INCREMENT => true
+            ],
+            'email' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256,
+                ColOption::UNIQUE => true
+            ],
+            'username' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 20,
+                ColOption::UNIQUE => true
+            ],
+            'password' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256
+            ],
+            'created-on' => [
+                ColOption::TYPE => DataType::DATETIME2,
+                ColOption::DEFAULT => 'now',
+            ],
+        ]);
+        
+        $table2 = new MSSQLTable('t');
+        $table2->addColumns([
+            'user-id-super' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::SIZE => 11,
+                ColOption::PRIMARY => true,
+            ],
+            'email-x' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256,
+                ColOption::UNIQUE => true
+            ],
+        ]);
+        $table2->addReference($table, [
+            'user-id-super' => 'user-id','email-x' =>  'email'], 'fk_ok', 'cascade', 'cascade');
+        $key = $table2->getForeignKey('fk_ok');
+        $this->assertEquals(2, count($key->getSourceCols()));
+        $this->assertEquals("if not exists (select * from sysobjects where name='t' and xtype='U')\n"
+                . "create table [t] (\n"
+                . "    [user_id_super] [int] not null,\n"
+                . "    [email_x] [varchar](256) not null,\n"
+                . "    constraint t_pk primary key clustered([user_id_super]) on [PRIMARY],\n"
+                . "    constraint fk_ok foreign key ([user_id_super], [email_x]) references [users] ([user_id], [email]) on update cascade on delete cascade,\n"
+                . "    constraint AK_t unique (email_x)\n"
+                . ")\n"
+                . "", $table2->toSQL());
+    }
+    public function testFk3() {
+        $t1 = new MSSQLTable('users');
+        $t1->addColumns([
+            'id' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::PRIMARY => true,
+                ColOption::IDENTITY => true
+            ],
+            'name' => [
+                ColOption::TYPE => DataType::NVARCHAR,
+                ColOption::SIZE => 128,
+                ColOption::UNIQUE => true
+            ],
+            'email' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256,
+                ColOption::UNIQUE => true
+            ]
+        ]);
+        $this->assertEquals("if not exists (select * from sysobjects where name='users' and xtype='U')\n"
+                . "create table [users] (\n"
+                . "    [id] [int] identity(1,1) not null,\n"
+                . "    [name] [nvarchar](128) not null,\n"
+                . "    [email] [varchar](256) not null,\n"
+                . "    constraint users_pk primary key clustered([id]) on [PRIMARY],\n"
+                . "    constraint AK_users unique (name, email)\n"
+                . ")\n", $t1->toSQL());
+        $t2 = new MSSQLTable('locations');
+        $t2->addColumns([
+            'id' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::PRIMARY => true
+            ],
+            'name' => [
+                ColOption::TYPE => DataType::NVARCHAR,
+                ColOption::SIZE => 128
+            ],
+            'added-by' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::FK => [
+                    ColOption::FK_TABLE => $t1,
+                    ColOption::FK_COL => 'id',
+                    ColOption::FK_NAME => 'added_by_fk'
+                ]
+            ]
+        ]);
+        $this->assertEquals("if not exists (select * from sysobjects where name='locations' and xtype='U')\n"
+                . "create table [locations] (\n"
+                . "    [id] [int] not null,\n"
+                . "    [name] [nvarchar](128) not null,\n"
+                . "    [added_by] [int] not null,\n"
+                . "    constraint locations_pk primary key clustered([id]) on [PRIMARY],\n"
+                . "    constraint added_by_fk foreign key ([added_by]) references [users] ([id]) on update set null on delete set null\n"
+                . ")\n", $t2->toSQL());
+        $t3 = new MSSQLTable('user_location');
+        $t3->addColumns([
+            'user-id' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::PRIMARY => true
+            ],
+            'location' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::PRIMARY => true
+            ]
+        ]);
+        $t3->addReference($t1, ['user-id' => 'id'], 'user_loc_fk');
+        $t3->addReference($t2, ['location' => 'id'], 'loc_fk');
+        $this->assertEquals(2, $t3->getForeignKeysCount());
+        $this->assertEquals("if not exists (select * from sysobjects where name='user_location' and xtype='U')\n"
+                . "create table [user_location] (\n"
+                . "    [user_id] [int] not null,\n"
+                . "    [location] [int] not null,\n"
+                . "    constraint user_location_pk primary key clustered([user_id], [location]) on [PRIMARY],\n"
+                . "    constraint user_loc_fk foreign key ([user_id]) references [users] ([id]) on update set null on delete set null,\n"
+                . "    constraint loc_fk foreign key ([location]) references [locations] ([id]) on update set null on delete set null\n"
+                . ")\n", $t3->toSQL());
+    }
+    public function testMap00() {
+        $table = new MSSQLTable('users');
+        $table->addColumns([
+            'user-id' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::SIZE => 11,
+                ColOption::PRIMARY => true,
+                ColOption::AUTO_INCREMENT => true
+            ],
+            'email' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256,
+                ColOption::UNIQUE => true
+            ],
+            'username' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 20,
+                ColOption::UNIQUE => true
+            ],
+            'password' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256
+            ],
+            'created-on' => [
+                ColOption::TYPE => DataType::DATETIME2,
+                ColOption::DEFAULT => 'now',
+            ],
+        ]);
+        $table2 = new MSSQLTable('t');
+        $table2->addColumns([
+            'user-id' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::SIZE => 11,
+                ColOption::PRIMARY => true,
+                ColOption::AUTO_INCREMENT => true
+            ],
+            'email' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256,
+                ColOption::UNIQUE => true
+            ],
+        ]);
+        $table2->addReference($table, ['user-id', 'email'], 'fk_ok', 'cascade', 'cascade');
+        $key = $table2->getForeignKey('fk_ok');
+        $this->assertEquals(2, count($key->getSourceCols()));
+        $this->assertEquals("if not exists (select * from sysobjects where name='t' and xtype='U')\n"
+                . "create table [t] (\n"
+                . "    [user_id] [int] not null,\n"
+                . "    [email] [varchar](256) not null,\n"
+                . "    constraint t_pk primary key clustered([user_id]) on [PRIMARY],\n"
+                . "    constraint fk_ok foreign key ([user_id], [email]) references [users] ([user_id], [email]) on update cascade on delete cascade,\n"
+                . "    constraint AK_t unique (email)\n"
+                . ")\n"
+                . "", $table2->toSQL());
+        
+        $mappedInstance = Table::map('mysql', $table2);
+        $this->assertTrue($mappedInstance instanceof MySQLTable);
+        $this->assertEquals('`t`', $mappedInstance->getName());
+        $this->assertEquals("create table if not exists `t` (\n"
+                . "    `user_id` int not null unique,\n"
+                . "    `email` varchar(256) not null unique collate utf8mb4_unicode_520_ci,\n"
+                . "    constraint `t_pk` primary key (`user_id`),\n"
+                . "    constraint `fk_ok` foreign key (`user_id`, `email`) references `users` (`user_id`, `email`) on update cascade on delete cascade\n"
+                . ")\n"
+                . "engine = InnoDB\n"
+                . "default charset = utf8mb4\n"
+                . "collate = utf8mb4_unicode_520_ci;", $mappedInstance->toSQL());
+    }
+    /**
+     * 
+     * @test
+     */
+    public function testGetColByIndex() {
+        $table = new MSSQLTable();
+        $table->addColumns([
+            'user-id' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::SIZE => 11,
+                ColOption::PRIMARY => true
+            ],
+            'username' => [
+                ColOption::SIZE => 20,
+                ColOption::UNIQUE => true
+            ],
+            'email' => [
+                ColOption::SIZE => 150,
+                ColOption::UNIQUE => true
+            ],
+            'password' => [
+                ColOption::SIZE => 64
+            ]
+        ]);
+        $this->assertEquals(4, $table->getColsCount());
+        $col00 = $table->getColByIndex(0);
+        $this->assertEquals('[user_id]',$col00->getName());
+        $this->assertEquals('int',$col00->getDatatype());
+        $this->assertEquals(11,$col00->getSize());
+        $this->assertTrue($col00->isPrimary());
+        $this->assertEquals(1, $table->getPrimaryKeyColsCount());
+        
+        $col01 = $table->getColByIndex(2);
+        $this->assertEquals('mixed',$col01->getDatatype());
+        $this->assertEquals(150,$col01->getSize());
+        $this->assertFalse($col01->isPrimary());
+        $this->asserttrue($col01->isUnique());
+
+        $col02 = $table->getColByIndex(6);
+        $this->assertNull($col02);
+    }
+    /**
+     * @test
+     */
+    public function testIdentity00() {
+        $t1 = new MSSQLTable('users');
+        $t1->addColumns([
+            'id' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::PRIMARY => true,
+                ColOption::IDENTITY => true
+            ],
+            'name' => [
+                ColOption::TYPE => DataType::NVARCHAR,
+                ColOption::SIZE => 128,
+                ColOption::UNIQUE => true
+            ],
+            'email' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256,
+                ColOption::UNIQUE => true
+            ],
+            'age' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::IDENTITY => true
+            ]
+        ]);
+        $this->assertEquals("if not exists (select * from sysobjects where name='users' and xtype='U')\n"
+                . "create table [users] (\n"
+                . "    [id] [int] identity(1,1) not null,\n"
+                . "    [name] [nvarchar](128) not null,\n"
+                . "    [email] [varchar](256) not null,\n"
+                . "    constraint users_pk primary key clustered([id]) on [PRIMARY],\n"
+                . "    constraint AK_users unique (name, email)\n"
+                . ")\n", $t1->toSQL());
+    }
+    /**
+     * 
+     * @param MSSQLTable $table
+     * @depends testAddColumn00
+     */
+    public function testHasCol00($table) {
+        $this->assertTrue($table->hasColumnWithKey('new-col'));
+        $this->assertTrue($table->hasColumnWithKey(' new-col '));
+        $this->assertTrue($table->hasColumnWithKey('new-col-2'));
+        $this->assertTrue($table->hasColumnWithKey('new col-2'));
+        $col = $table->getColByKey('new col-2');
+        $this->assertEquals('[new col-2]', $col->getName());
+    }
+    /**
+     * 
+     * @param MySQLTable $table
+     * @depends testAddColumn00
+     */
+    public function testHasCol01($table) {
+        $this->assertTrue($table->hasColumnWithKey('new-col'));
+        $this->assertFalse($table->hasColumnWithKey('invalid key'));
+        
+    }
+    /**
+     * @test
+     */
+    public function testPrimaryKey00() {
+        $table = new MSSQLTable('hello');
+        $table->addColumns([
+            'id-col'=>[
+                ColOption::PRIMARY => true,
+                ColOption::SIZE => 3
+            ]
+        ]);
+        $this->assertEquals(1, $table->getPrimaryKeyColsCount());
+        return $table;
+    }
+    /**
+     * @test
+     * @param MSSQLTable $table
+     * @depends testPrimaryKey00
+     */
+    public function testPrimaryKey01($table) {
+        $table->addColumns([
+            'id-col-2'=>[
+                ColOption::PRIMARY => true
+            ]
+        ]);
+        $this->assertFalse($table->getColByKey('id-col')->isUnique());
+        $this->assertFalse($table->getColByKey('id-col-2')->isUnique());
+        $this->assertEquals(2, $table->getPrimaryKeyColsCount());
+        return $table;
+    }
+    /**
+     * @test
+     */
+    public function testRemoveColFromRef00() {
+        $table = new MSSQLTable('active_or_not');
+        $table->addColumns([
+            'user-id' => [
+                ColOption::SIZE => 15
+            ],
+            'username' => [
+                ColOption::SIZE => 50
+            ],
+            'is-active' => [
+                ColOption::TYPE => DataType::BOOL
+            ]
+        ]);
+        $table2 = new MSSQLTable('user_info');
+        $table2->addColumns([
+            'user-id' => [
+                ColOption::SIZE => 15
+            ],
+            'first-name' => [
+                ColOption::SIZE => '50'
+            ],
+            'last-name' => [
+                ColOption::SIZE => '50'
+            ]
+        ]);
+        $table2->addReference($table, [
+            'user-id',
+            'first-name' => 'username'
+            ], 'hello_fk');
+        $key = $table2->getForeignKey('hello_fk');
+        $this->assertEquals(2, count($key->getOwnerCols()));
+        $this->assertFalse($key->removeReference('username'));
+        $this->assertTrue($key->removeReference('first-name'));
+        $this->assertEquals(1, count($table2->getForeignKey('hello_fk')->getSourceCols()));
+    }
+    /**
+     * @test
+     */
+    public function testRemoveRef00() {
+        $table = new MSSQLTable();
+        $table->addColumns([
+            'user-id' => [
+                ColOption::SIZE => 15
+            ],
+            'is-active' => [
+                ColOption::TYPE => DataType::BOOL
+            ]
+        ]);
+        $this->assertNull($table->removeReference('not-exist'));
+    }
+    /**
+     * @test
+     */
+    public function testRemoveRef01() {
+        $table = new MSSQLTable('active_or_not');
+        $table->addColumns([
+            'user-id' => [
+                ColOption::SIZE => 15
+            ],
+            'is-active' => [
+                ColOption::TYPE => DataType::BOOL
+            ]
+        ]);
+        $table2 = new MSSQLTable('user_info');
+        $table2->addColumns([
+            'user-id' => [
+                ColOption::SIZE => 15
+            ],
+            'first-name' => [
+                ColOption::SIZE => '50'
+            ],
+            'last-name' => [
+                ColOption::SIZE => '50'
+            ]
+        ]);
+        $table->addReference($table2, ['user-id'], 'hello_fk');
+        $this->assertEquals(1, $table->getForeignKeysCount());
+        $this->assertNull($table->removeReference('not-exist'));
+        $obj = $table->removeReference('hello_fk');
+        $this->assertEquals('hello_fk', $obj->getKeyName());
+        $this->assertEquals(0, $table->getForeignKeysCount());
+    }
+    /**
+     * @test
+     */
+    public function testWithBoolCol00() {
+        $table = new MSSQLTable();
+        $table->addColumns([
+            'user-id' => [
+                ColOption::SIZE => 15
+            ],
+            'is-active' => [
+                ColOption::TYPE => 'bool'
+            ]
+        ]);
+        $this->assertEquals('bool',$table->getColByKey('is-active')->getDatatype());
+    }
     /**
      * @test
      */
diff --git a/tests/WebFiori/Tests/Database/MySql/MySQLColumnTest.php b/tests/WebFiori/Tests/Database/MySql/MySQLColumnTest.php
index 5ee28134..82fc65bb 100644
--- a/tests/WebFiori/Tests/Database/MySql/MySQLColumnTest.php
+++ b/tests/WebFiori/Tests/Database/MySql/MySQLColumnTest.php
@@ -1,799 +1,799 @@
-<?php
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-namespace WebFiori\Tests\Database\MySql;
-
-use PHPUnit\Framework\TestCase;
-use WebFiori\Database\Factory\ColumnFactory;
-use WebFiori\Database\DataType;
-use WebFiori\Database\MsSql\MSSQLColumn;
-use WebFiori\Database\MySql\MySQLColumn;
-/**
- * Description of MySQLColumnTest
- *
- * @author Ibrahim
- */
-class MySQLColumnTest extends TestCase {
-    /**
-     * @test
-     */
-    public function testConstructor16() {
-        $col = new MySQLColumn('hello_col', 'varchar');
-        $this->assertNotNull($col->getOldName());
-        $this->assertEquals('`hello_col`', $col->getName());
-        $this->assertEquals('`hello_col`', $col->getOldName());
-        $this->assertEquals('varchar', $col->getDatatype());
-        $this->assertNull($col->getDefault());
-        $this->assertFalse($col->isNull());
-        $this->assertFalse($col->isPrimary());
-        $this->assertFalse($col->isUnique());
-        $this->assertEquals(1, $col->getSize());
-        $this->assertEquals(0, $col->getScale());
-    }
-    /**
-     * @test
-     */
-    public function testCustomCleaner00() {
-        $col = new MySQLColumn('hello', 'varchar');
-        $col->setCustomFilter(function($originalVal, $basicFilterResult){
-            
-        });
-        $this->assertNull($col->cleanValue('Hello World'));
-        $col->setCustomFilter(function($originalVal, $basicFilterResult){
-            return $originalVal.'?';
-        });
-        $this->assertEquals("'Hello World.?'",$col->cleanValue('Hello World.'));
-    }
-    /**
-     * @test
-     */
-    public function testCustomCleaner01() {
-        $col = new MySQLColumn('hello', 'int');
-        $col->setCustomFilter(function($originalVal, $basicFilterResult){
-            return $basicFilterResult*10;
-        });
-        $this->assertEquals(0,$col->cleanValue('Hello World.'));
-        $this->assertEquals(10,$col->cleanValue(1));
-        $this->assertEquals(260,$col->cleanValue(26));
-        $col->setCustomFilter(function($originalVal, $basicFilterResult){
-            return $basicFilterResult*$originalVal;
-        });
-        $this->assertEquals(100,$col->cleanValue(10));
-        $this->assertEquals(9,$col->cleanValue(3));
-    }
-    /**
-     * @test
-     */
-    public function testCustomCleaner02() {
-        $col = new MySQLColumn('hello', 'int');
-        $col->setCustomFilter(function(){
-            return 5;
-        });
-        $this->assertEquals(5,$col->cleanValue('Hello World.'));
-    }
-    /**
-     * @test
-     */
-    public function setCommentTest00() {
-        $col = new MySQLColumn('user_id ', 'varchar', 15);
-        $col->setComment('A unique ID for the user.');
-        $this->assertEquals('A unique ID for the user.',$col->getComment());
-        $this->assertEquals('`user_id` varchar(15) not null collate utf8mb4_unicode_520_ci comment \'A unique ID for the user.\'',$col.'');
-
-        return $col;
-    }
-    /**
-     * @test
-     * @depends setCommentTest00
-     * @param MySQLColumn $col Description
-     */
-    public function setCommentTest01($col) {
-        $col->setComment(null);
-        $this->assertNull($col->getComment());
-        $this->assertEquals('`user_id` varchar(15) not null collate utf8mb4_unicode_520_ci',$col.'');
-    }
-    /**
-     * @test
-     */
-    public function testAutoUpdate00() {
-        $col = new MySQLColumn();
-        $this->assertFalse($col->isAutoUpdate());
-        $col->setAutoUpdate(true);
-        $this->assertFalse($col->isAutoUpdate());
-        $col->setDatatype('datetime');
-        $col->setAutoUpdate(true);
-        $this->assertTrue($col->isAutoUpdate());
-    }
-    /**
-     * @test
-     */
-    public function testAutoUpdate01() {
-        $col = new MySQLColumn();
-        $this->assertFalse($col->isAutoUpdate());
-        $col->setAutoUpdate(true);
-        $this->assertFalse($col->isAutoUpdate());
-        $col->setDatatype('timestamp');
-        $col->setAutoUpdate(true);
-        $this->assertTrue($col->isAutoUpdate());
-    }
-    /**
-     * @test
-     */
-    public function testBoolean00() {
-        $col = new MySQLColumn('my_col', 'boolean');
-        $this->assertEquals('boolean',$col->getDatatype());
-        $this->assertEquals('`my_col` bit(1) not null',$col.'');
-    }
-    /**
-     * @test
-     */
-    public function testBoolean01() {
-        $col = new MySQLColumn('my_col', 'bool');
-        $this->assertEquals('bool',$col->getDatatype());
-        $col->setDefault(true);
-        $this->assertEquals('`my_col` bit(1) not null default b\'1\'',$col.'');
-        $col->setDefault(false);
-        $this->assertEquals('`my_col` bit(1) not null default b\'0\'',$col.'');
-        $col->setDefault(null);
-        $this->assertEquals('`my_col` bit(1) not null',$col.'');
-        $col->setDefault('Random Val');
-        $this->assertEquals('`my_col` bit(1) not null default b\'0\'',$col.'');
-    }
-    /**
-     * @test
-     */
-    public function testBoolean02() {
-        $col = new MySQLColumn('my_col', 'bool');
-        $this->assertEquals('bool',$col->getDatatype());
-        $col->setIsNull(true);
-        $this->assertEquals('`my_col` bit(1) not null',$col.'');
-        $col->setIsAutoInc(true);
-        $this->assertEquals('`my_col` bit(1) not null',$col.'');
-        $col->setIsPrimary(true);
-        $this->assertEquals('`my_col` bit(1) not null',$col.'');
-        $col->setIsUnique(true);
-        $this->assertEquals('`my_col` bit(1) not null',$col.'');
-    }
-    /**
-     * @test
-     */
-    public function testCleanValue00() {
-        $col = new MySQLColumn('col', 'varchar');
-        $this->assertEquals('\'Hello World!\'',$col->cleanValue('Hello World!'));
-        $this->assertEquals('\'I wouln\\\'t do That\'',$col->cleanValue('I wouln\'t do That'));
-    }
-    /**
-     * @test
-     */
-    public function testCleanValue01() {
-        $col = new MySQLColumn('col', 'text');
-        $this->assertEquals('\'Hello World!\'',$col->cleanValue('Hello World!'));
-        $this->assertEquals('\'I wouln\\\'t do That\'',$col->cleanValue('I wouln\'t do That'));
-    }
-    /**
-     * @test
-     */
-    public function testCleanValue02() {
-        $col = new MySQLColumn('col', 'mediumtext');
-        $this->assertEquals('\'Hello World!\'',$col->cleanValue('Hello World!'));
-        $this->assertEquals('\'I wouln\\\'t do That\'',$col->cleanValue('I wouln\'t do That'));
-    }
-    /**
-     * @test
-     */
-    public function testCleanValue03() {
-        $col = new MySQLColumn('col', 'int');
-        $this->assertEquals(0,$col->cleanValue('Hello World!'));
-        $this->assertEquals(0,$col->cleanValue('I wouln\';select * from x'));
-        $this->assertEquals(43,$col->cleanValue('43'));
-        $this->assertEquals(-99,$col->cleanValue('-99.65'));
-        $this->assertEquals(0,$col->cleanValue('hello-99.65'));
-        $this->assertEquals(5,$col->cleanValue(5));
-        $this->assertNotNull($col->getOldName());
-        $this->assertEquals('`col`',$col->getOldName());
-        $col->setName('new');
-        $this->assertEquals('`col`', $col->getOldName());
-    }
-    /**
-     * @test
-     */
-    public function testCleanValue04() {
-        $col = new MySQLColumn('col', 'decimal');
-        $this->assertEquals('\'0\'',$col->cleanValue('Hello World!'));
-        $this->assertEquals('\'0\'',$col->cleanValue('I wouln\';select * from x'));
-        $this->assertEquals('\'43\'',$col->cleanValue('43'));
-        $this->assertEquals('\'-99.65\'',$col->cleanValue('-99.65'));
-        $this->assertEquals('\'0\'',$col->cleanValue('hello-99.65'));
-        $this->assertEquals('\'5\'',$col->cleanValue(5));
-        $this->assertEquals('\'6532.887\'',$col->cleanValue(6532.887));
-    }
-    /**
-     * @test
-     */
-    public function testCleanValue06() {
-        $col = new MySQLColumn('col', 'decimal');
-        $this->assertEquals('\'0\'',$col->cleanValue('Hello World!'));
-        $this->assertEquals('\'0\'',$col->cleanValue('I wouln\';select * from x'));
-        $this->assertEquals('\'43\'',$col->cleanValue('43'));
-        $this->assertEquals('\'-99.65\'',$col->cleanValue('-99.65'));
-        $this->assertEquals('\'0\'',$col->cleanValue('hello-99.65'));
-        $this->assertEquals('\'5\'',$col->cleanValue(5));
-        $this->assertEquals('\'6532.887\'',$col->cleanValue(6532.887));
-    }
-    /**
-     * @test
-     */
-    public function testCleanValue07() {
-        $col = new MySQLColumn('col', 'timestamp');
-        $this->assertEquals('',$col->cleanValue('Hello World!'));
-        $this->assertEquals('',$col->cleanValue('I wouln\';select * from x'));
-        $this->assertEquals('',$col->cleanValue(5));
-        $this->assertEquals('\'2019-11-01 00:00:00\'',$col->cleanValue('2019-11-01'));
-        $this->assertEquals('\'2019-11-01 23:09:44\'',$col->cleanValue('2019-11-01 23:09:44'));
-    }
-    /**
-     * @test
-     */
-    public function testCleanValue08() {
-        $col = new MySQLColumn('col');
-        $cleanedArr = $col->cleanValue([1, false, null, 'string', '1.8', 7.9]);
-        $this->assertEquals([
-            "'1'",
-            "''",
-            null,
-            "'string'",
-            "'1.8'",
-            "'7.9'"
-        ],$cleanedArr);
-        
-    }
-    /**
-     * @test
-     */
-    public function testCleanValue09() {
-        $col = new MySQLColumn('col', 'bool');
-        $cleanedArr = $col->cleanValue([1, false, null, 'string', '1.8', 7.9, true]);
-        $this->assertEquals([
-            "b'0'",
-            "b'0'",
-            null,
-            "b'0'",
-            "b'0'",
-            "b'0'",
-            "b'1'"
-        ],$cleanedArr);
-        
-    }
-    /**
-     * @test
-     */
-    public function testCreateCol00() {
-        $colObj = MySQLColumn::createColObj([]);
-        $this->assertNull($colObj);
-    }
-    /**
-     * @test
-     */
-    public function testCreateCol01() {
-        $colObj = MySQLColumn::createColObj([
-            'name' => 'my_col',
-            'type' => DataType::VARCHAR,
-            'validator' => function ($orgVal, $cleaned) {
-                return 'Hello '.$cleaned;
-            }
-        ]);
-        $this->assertNotNull($colObj);
-        $this->assertEquals('`my_col`', $colObj->getName());
-        $this->assertEquals('varchar', $colObj->getDatatype());
-        $this->assertEquals(1, $colObj->getSize());
-        $this->assertEquals("'Hello Ibrahim'", $colObj->cleanValue('Ibrahim'));
-    }
-    /**
-     * @test
-     */
-    public function testConstructor00() {
-        $col = new MySQLColumn();
-        $this->assertEquals('varchar',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-        $this->assertEquals('`col`',$col->getName());
-    }
-    /**
-     * @test
-     */
-    public function testConstructor01() {
-        $col = new MySQLColumn('user_id ', 'varchar', 15);
-        $this->assertEquals('varchar',$col->getDatatype());
-        $this->assertEquals(15,$col->getSize());
-        $this->assertEquals('`user_id`',$col->getName());
-    }
-    /**
-     * @test
-     */
-    public function testConstructor04() {
-        $this->expectException('WebFiori\Database\DatabaseException');
-        $col = new MySQLColumn('valid_name', 'invalid type', 15);
-        $this->assertEquals('varchar',$col->getDatatype());
-        $this->assertEquals(15,$col->getSize());
-        $this->assertEquals('valid_name',$col->getName());
-    }
-    /**
-     * @test
-     */
-    public function testConstructor05() {
-        $col = new MySQLColumn('valid_name', 'InT', 15);
-        $this->assertEquals('int',$col->getDatatype());
-        $this->assertEquals(11,$col->getSize());
-        $this->assertEquals('`valid_name`',$col->getName());
-    }
-    /**
-     * @test
-     */
-    public function testConstructor06() {
-        $col = new MySQLColumn('valid_name', 'Varchar ', 15);
-        $this->assertEquals('varchar',$col->getDatatype());
-        $this->assertEquals(15,$col->getSize());
-        $this->assertEquals('`valid_name`',$col->getName());
-    }
-    /**
-     * @test
-     */
-    public function testConstructor07() {
-        $col = new MySQLColumn('valid_name', 'Varchar ', 21846);
-        $this->assertEquals('mediumtext',$col->getDatatype());
-        $this->assertEquals(21846,$col->getSize());
-        $this->assertEquals('`valid_name`',$col->getName());
-    }
-    /**
-     * @test
-     */
-    public function testConstructor08() {
-        $col = new MySQLColumn('valid_name', 'Varchar ', 0);
-        $this->assertEquals('varchar',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-        $this->assertEquals('`valid_name`',$col->getName());
-    }
-    /**
-     * @test
-     */
-    public function testConstructor09() {
-        $col = new MySQLColumn('amount', 'decimal ');
-        $this->assertEquals('decimal',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-
-        return $col;
-    }
-    /**
-     * @test
-     */
-    public function testConstructor10() {
-        $col = new MySQLColumn('amount', 'decimal ',0);
-        $this->assertEquals('decimal',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-        $this->assertEquals(0,$col->getScale());
-
-        return $col;
-    }
-    /**
-     * @test
-     */
-    public function testConstructor11() {
-        $col = new MySQLColumn('amount', 'decimal ',1);
-        $this->assertEquals('decimal',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-        $this->assertEquals(0,$col->getScale());
-
-        return $col;
-    }
-    /**
-     * @test
-     */
-    public function testConstructor12() {
-        $col = new MySQLColumn('amount', 'decimal ',2);
-        $this->assertEquals('decimal',$col->getDatatype());
-        $this->assertEquals(2,$col->getSize());
-        $this->assertEquals(0,$col->getScale());
-
-        return $col;
-    }
-    /**
-     * @test
-     */
-    public function testConstructor13() {
-        $col = new MySQLColumn('amount', 'decimal ',3);
-        $this->assertEquals('decimal',$col->getDatatype());
-        $this->assertEquals(3,$col->getSize());
-        $this->assertEquals(0,$col->getScale());
-
-        return $col;
-    }
-    /**
-     * @test
-     */
-    public function testConstructor14() {
-        $col = new MySQLColumn('amount', 'decimal ',4);
-        $this->assertEquals('decimal',$col->getDatatype());
-        $this->assertEquals(4,$col->getSize());
-        $this->assertEquals(0,$col->getScale());
-
-        return $col;
-    }
-    /**
-     * @test
-     */
-    public function testConstructor15() {
-        $col = new MySQLColumn('amount', 'decimal ',-9);
-        $this->assertEquals('decimal',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-        $this->assertEquals(0,$col->getScale());
-
-        return $col;
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault00() {
-        $col = new MySQLColumn('date', 'timestamp');
-        $col->setDefault('2019-11-09');
-        $this->assertEquals('2019-11-09 00:00:00',$col->getDefault());
-        $this->assertEquals('`date` timestamp not null default \'2019-11-09 00:00:00\'',$col.'');
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault01() {
-        $col = new MySQLColumn('date', 'timestamp');
-        $col->setDefault('2019-07-07 09:09:09');
-        $this->assertEquals('2019-07-07 09:09:09',$col->getDefault());
-        $this->assertEquals('`date` timestamp not null default \'2019-07-07 09:09:09\'',$col.'');
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault02() {
-        $col = new MySQLColumn('date', 'datetime');
-        $col->setDefault('');
-        $this->assertNull($col->getDefault());
-        $this->assertEquals('`date` datetime not null',$col.'');
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault03() {
-        $col = new MySQLColumn('date', 'datetime');
-        $col->setDefault('2019-07-07 09:09:09');
-        $this->assertEquals('2019-07-07 09:09:09',$col->getDefault());
-        $this->assertEquals('`date` datetime not null default \'2019-07-07 09:09:09\'',$col.'');
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault04() {
-        $col = new MySQLColumn('date', 'datetime');
-        $col->setDefault('2019-15-07 09:09:09');
-        $this->assertNull($col->getDefault());
-        $this->assertEquals('`date` datetime not null',$col.'');
-        $col->setDefault('2019-12-33 09:09:09');
-        $this->assertNull($col->getDefault());
-        $this->assertEquals('`date` datetime not null',$col.'');
-        $col->setDefault('2019-12-31 24:09:09');
-        $this->assertNull($col->getDefault());
-        $col->setDefault('2019-12-31 23:60:09');
-        $this->assertNull($col->getDefault());
-        $col->setDefault('2019-12-31 23:59:60');
-        $this->assertNull($col->getDefault());
-        $col->setDefault('2019-12-31 23:59:59');
-        $this->assertEquals('2019-12-31 23:59:59',$col->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault05() {
-        $col = new MySQLColumn('id', 'int');
-        $this->assertEquals('`id` int not null',$col.'');
-        $col->setMySQLVersion('5.0.0');
-        $col->setDefault(-122);
-        $this->assertEquals(-122,$col->getDefault());
-        $this->assertEquals('`id` int(1) not null default -122',$col.'');
-        $col->setDefault(null);
-        $this->assertNull($col->getDefault());
-        $col->setDefault('a string');
-        $this->assertEquals(0,$col->getDefault());
-        $col->setDefault(1.8);
-        $this->assertEquals(1,$col->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault06() {
-        $col = new MySQLColumn('id', 'varchar');
-        $this->assertEquals('`id` varchar(1) not null collate utf8mb4_unicode_520_ci',$col.'');
-        $col->setDefault('A random string.');
-        $this->assertEquals('A random string.',$col->getDefault());
-        $col->setMySQLVersion('5.0.0');
-        $this->assertEquals('`id` varchar(1) not null default \'A random string.\' collate utf8mb4_unicode_ci',$col.'');
-        $col->setDefault(null);
-        $this->assertNull($col->getDefault());
-        $col->setDefault(33);
-        $this->assertEquals(33,$col->getDefault());
-        $col->setDefault(1.8);
-        $this->assertEquals(1.8,$col->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault07() {
-        $col = new MySQLColumn('id', 'decimal');
-        $this->assertEquals('`id` decimal(1,0) not null',$col.'');
-        $col->setDefault(1);
-        $this->assertEquals(1,$col->getDefault());
-        $this->assertEquals('`id` decimal(1,0) not null default \'1\'',$col.'');
-        $col->setDefault(1.66);
-        $this->assertEquals(1.66,$col->getDefault());
-        $this->assertEquals('`id` decimal(1,0) not null default \'1.66\'',$col.'');
-        $col->setDefault(null);
-        $this->assertNull($col->getDefault());
-        $col->setDefault('33');
-        $this->assertEquals(33,$col->getDefault());
-        $col->setDefault('');
-        $this->assertEquals(0,$col->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault08() {
-        $col = new MySQLColumn('date', 'datetime');
-        $col->setDefault('now()');
-        $this->assertEquals('now()',$col->getDefault());
-        $this->assertEquals('`date` datetime not null default now()',$col.'');
-    }
-    /**
-     * @test
-     */
-    public function testSetDefault09() {
-        $col = new MySQLColumn('mix', 'mixed');
-        $col->setDefault('2019-11-09');
-        $this->assertEquals("2019-11-09",$col->getDefault());
-        $this->assertEquals("`mix` varchar(256) not null default '2019-11-09' collate utf8mb4_unicode_520_ci",$col.'');
-    }
-    /**
-     * @test
-     */
-    public function testSetMySQLVersion00() {
-        $col = new MySQLColumn();
-        $col->setMySQLVersion('5.4');
-        $this->assertEquals('5.4',$col->getMySQLVersion());
-        $this->assertEquals('utf8mb4_unicode_ci',$col->getCollation());
-    }
-    /**
-     * @test
-     */
-    public function testSetMySQLVersion01() {
-        $col = new MySQLColumn();
-        $col->setMySQLVersion('8.0');
-        $this->assertEquals('8.0',$col->getMySQLVersion());
-        $this->assertEquals('utf8mb4_unicode_520_ci',$col->getCollation());
-    }
-    /**
-     * @test
-     */
-    public function testSetMySQLVersion02() {
-        $column = new MySQLColumn();
-        $column->setMySQLVersion('5');
-        $this->assertEquals('8.0',$column->getMySQLVersion());
-        $this->assertEquals('utf8mb4_unicode_520_ci',$column->getCollation());
-    }
-    /**
-     * @test
-     */
-    public function testSetMySQLVersion03() {
-        $col = new MySQLColumn();
-        $col->setMySQLVersion('8.0.77');
-        $this->assertEquals('8.0.77',$col->getMySQLVersion());
-        $this->assertEquals('utf8mb4_unicode_520_ci',$col->getCollation());
-    }
-    /**
-     * 
-     * @param MySQLColumn $col
-     * @depends testConstructor09
-     */
-    public function testSetScale00($col) {
-        $col->setSize(10);
-        $this->assertTrue($col->setScale(3));
-        $this->assertEquals(3,$col->getScale());
-        $this->assertTrue($col->setScale(0));
-        $this->assertEquals(0,$col->getScale());
-        $this->assertTrue($col->setScale(9));
-        $this->assertEquals(9,$col->getScale());
-        $this->assertFalse($col->setScale(10));
-        $this->assertEquals(9,$col->getScale());
-    }
-    /**
-     * @test
-     */
-    public function testSetType00() {
-        $col = new MySQLColumn();
-        $col->setDatatype('int');
-        $this->assertEquals('int',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-        $this->assertNull($col->getDefault());
-        $col->setSize(11);
-        $col->setDefault(6000);
-        $this->assertEquals(11,$col->getSize());
-        $this->assertEquals(6000,$col->getDefault());
-        $col->setDatatype('  int ');
-        $col->setSize(12);
-        $col->setDefault(698);
-        $this->assertEquals('int',$col->getDatatype());
-        $this->assertEquals(11,$col->getSize());
-    }
-    /**
-     * @test
-     */
-    public function testSetType01() {
-        $col = new MySQLColumn();
-        $col->setDatatype('varchar');
-        $col->setSize(0);
-        $this->assertEquals('varchar',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-        $this->assertNull($col->getDefault());
-        $col->setDatatype('  varchar');
-        $col->setSize(5000);
-        $col->setDefault(6000);
-        $this->assertEquals(5000,$col->getSize());
-        $this->assertSame('6000',$col->getDefault());
-        $col->setSize(500000);
-        $col->setDefault('Hello World');
-        $this->assertEquals('mediumtext',$col->getDatatype());
-        $this->assertEquals(500000,$col->getSize());
-        $this->assertSame('Hello World',$col->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testSetType02() {
-        $col = new MySQLColumn();
-        $col->setDatatype('varchar');
-        $this->assertEquals('varchar',$col->getDatatype());
-        $col->setSize(5000);
-        $this->assertEquals(5000,$col->getSize());
-        $col->setDefault('Hello');
-        $this->assertSame('Hello',$col->getDefault());
-        $col->setDatatype('int');
-        $this->assertEquals('int',$col->getDatatype());
-        $col->setSize(1);
-        $this->assertEquals(1,$col->getSize());
-        $this->assertNull($col->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testSetType03() {
-        $col = new MySQLColumn();
-        $col->setDatatype('datetime');
-        $this->assertEquals('datetime',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-        $col->setDefault('2019-01-11');
-        $this->assertSame('2019-01-11 00:00:00',$col->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testSetType04() {
-        $col = new MySQLColumn();
-        $col->setDatatype('datetime');
-        $col->setDefault('2019-01-11 28:00:00');
-        $this->assertEquals('datetime',$col->getDatatype());
-        $this->assertEquals(1,$col->getSize());
-        $this->assertNull($col->getDefault());
-        $col->setDefault('2019-13-11 00:00:00');
-        $this->assertNull($col->getDefault());
-        $col->setDefault('2019-04-44 00:00:00');
-        $this->assertNull($col->getDefault());
-        
-        $col->setDatatype('timestamp');
-        $col->setDefault('2019-12-11 00:60:00');
-        $this->assertNull($col->getDefault());
-        $col->setDefault('2019-12-11 00:00:60');
-        $this->assertNull($col->getDefault());
-        $col->setDefault('2019-12-30 23:59:59');
-        $this->assertEquals('2019-12-30 23:59:59',$col->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testSetType05() {
-        $col = new MySQLColumn();
-        $col->setDatatype('datetime');
-        $col->setDefault('now()');
-        $this->assertEquals('now()', $col->getDefault());
-        $col->setDefault('current_timestamp');
-        $this->assertEquals('current_timestamp', $col->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testSetType06() {
-        $col = new MySQLColumn();
-        $col->setDatatype('timestamp');
-        $col->setDefault('now()');
-        $this->assertEquals('now()', $col->getDefault());
-        $col->setDefault('current_timestamp');
-        $this->assertEquals('current_timestamp', $col->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testMap00() {
-        $col = new MySQLColumn();
-        $col->setDatatype('timestamp');
-        $col->setDefault('now()');
-        $this->assertEquals('now()', $col->getDefault());
-        $col->setDefault('current_timestamp');
-        $this->assertEquals('current_timestamp', $col->getDefault());
-        
-        $newCol = ColumnFactory::map('mssql', $col);
-        $this->assertTrue($newCol instanceof MSSQLColumn);
-        $this->assertEquals('col', $newCol->getNormalName());
-        $this->assertEquals('datetime2', $newCol->getDatatype());
-        $this->assertEquals('current_timestamp', $newCol->getDefault());
-    }
-    /**
-     * @test
-     */
-    public function testGetPHPType00() {
-        $colObj = new MySQLColumn();
-        $this->assertEquals('string', $colObj->getPHPType());
-        $colObj->setIsNull(true);
-        $this->assertEquals('string|null', $colObj->getPHPType());
-    }
-    /**
-     * @test
-     */
-    public function testGetPHPType01() {
-        $colObj = new MySQLColumn('col', 'bool');
-        $this->assertEquals('bool', $colObj->getPHPType());
-        $colObj->setIsNull(true);
-        $this->assertEquals('bool', $colObj->getPHPType());
-    }
-    /**
-     * @test
-     */
-    public function testGetPHPType02() {
-        $colObj = new MySQLColumn('col', 'boolean');
-        $this->assertEquals('bool', $colObj->getPHPType());
-        $colObj->setIsNull(true);
-        $this->assertEquals('bool', $colObj->getPHPType());
-    }
-    /**
-     * @test
-     */
-    public function testGetPHPType03() {
-        $colObj = new MySQLColumn('col', 'decimal');
-        $this->assertEquals('float', $colObj->getPHPType());
-        $colObj->setIsNull(true);
-        $this->assertEquals('float|null', $colObj->getPHPType());
-    }
-    /**
-     * @test
-     */
-    public function testGetPHPType04() {
-        $colObj = new MySQLColumn('col', 'blob');
-        $this->assertEquals('string', $colObj->getPHPType());
-        $colObj->setIsNull(true);
-        $this->assertEquals('string|null', $colObj->getPHPType());
-    }
-    /**
-     * @test
-     */
-    public function testGetPHPType05() {
-        $colObj = new MySQLColumn('col', 'datetime');
-        $this->assertEquals('string', $colObj->getPHPType());
-        $colObj->setIsNull(true);
-        $this->assertEquals('string|null', $colObj->getPHPType());
-    }
-}
+<?php
+
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+namespace WebFiori\Tests\Database\MySql;
+
+use PHPUnit\Framework\TestCase;
+use WebFiori\Database\Factory\ColumnFactory;
+use WebFiori\Database\DataType;
+use WebFiori\Database\MsSql\MSSQLColumn;
+use WebFiori\Database\MySql\MySQLColumn;
+/**
+ * Description of MySQLColumnTest
+ *
+ * @author Ibrahim
+ */
+class MySQLColumnTest extends TestCase {
+    /**
+     * @test
+     */
+    public function testConstructor16() {
+        $col = new MySQLColumn('hello_col', 'varchar');
+        $this->assertNotNull($col->getOldName());
+        $this->assertEquals('`hello_col`', $col->getName());
+        $this->assertEquals('`hello_col`', $col->getOldName());
+        $this->assertEquals('varchar', $col->getDatatype());
+        $this->assertNull($col->getDefault());
+        $this->assertFalse($col->isNull());
+        $this->assertFalse($col->isPrimary());
+        $this->assertFalse($col->isUnique());
+        $this->assertEquals(1, $col->getSize());
+        $this->assertEquals(0, $col->getScale());
+    }
+    /**
+     * @test
+     */
+    public function testCustomCleaner00() {
+        $col = new MySQLColumn('hello', 'varchar');
+        $col->setCustomFilter(function($originalVal, $basicFilterResult){
+            
+        });
+        $this->assertNull($col->cleanValue('Hello World'));
+        $col->setCustomFilter(function($originalVal, $basicFilterResult){
+            return $originalVal.'?';
+        });
+        $this->assertEquals("'Hello World.?'",$col->cleanValue('Hello World.'));
+    }
+    /**
+     * @test
+     */
+    public function testCustomCleaner01() {
+        $col = new MySQLColumn('hello', 'int');
+        $col->setCustomFilter(function($originalVal, $basicFilterResult){
+            return $basicFilterResult*10;
+        });
+        $this->assertEquals(0,$col->cleanValue('Hello World.'));
+        $this->assertEquals(10,$col->cleanValue(1));
+        $this->assertEquals(260,$col->cleanValue(26));
+        $col->setCustomFilter(function($originalVal, $basicFilterResult){
+            return $basicFilterResult*$originalVal;
+        });
+        $this->assertEquals(100,$col->cleanValue(10));
+        $this->assertEquals(9,$col->cleanValue(3));
+    }
+    /**
+     * @test
+     */
+    public function testCustomCleaner02() {
+        $col = new MySQLColumn('hello', 'int');
+        $col->setCustomFilter(function(){
+            return 5;
+        });
+        $this->assertEquals(5,$col->cleanValue('Hello World.'));
+    }
+    /**
+     * @test
+     */
+    public function setCommentTest00() {
+        $col = new MySQLColumn('user_id ', 'varchar', 15);
+        $col->setComment('A unique ID for the user.');
+        $this->assertEquals('A unique ID for the user.',$col->getComment());
+        $this->assertEquals('`user_id` varchar(15) not null collate utf8mb4_unicode_520_ci comment \'A unique ID for the user.\'',$col.'');
+
+        return $col;
+    }
+    /**
+     * @test
+     * @depends setCommentTest00
+     * @param MySQLColumn $col Description
+     */
+    public function setCommentTest01($col) {
+        $col->setComment(null);
+        $this->assertNull($col->getComment());
+        $this->assertEquals('`user_id` varchar(15) not null collate utf8mb4_unicode_520_ci',$col.'');
+    }
+    /**
+     * @test
+     */
+    public function testAutoUpdate00() {
+        $col = new MySQLColumn();
+        $this->assertFalse($col->isAutoUpdate());
+        $col->setAutoUpdate(true);
+        $this->assertFalse($col->isAutoUpdate());
+        $col->setDatatype('datetime');
+        $col->setAutoUpdate(true);
+        $this->assertTrue($col->isAutoUpdate());
+    }
+    /**
+     * @test
+     */
+    public function testAutoUpdate01() {
+        $col = new MySQLColumn();
+        $this->assertFalse($col->isAutoUpdate());
+        $col->setAutoUpdate(true);
+        $this->assertFalse($col->isAutoUpdate());
+        $col->setDatatype('timestamp');
+        $col->setAutoUpdate(true);
+        $this->assertTrue($col->isAutoUpdate());
+    }
+    /**
+     * @test
+     */
+    public function testBoolean00() {
+        $col = new MySQLColumn('my_col', 'bool');
+        $this->assertEquals('bool',$col->getDatatype());
+        $this->assertEquals('`my_col` bit(1) not null',$col.'');
+    }
+    /**
+     * @test
+     */
+    public function testBoolean01() {
+        $col = new MySQLColumn('my_col', 'bool');
+        $this->assertEquals('bool',$col->getDatatype());
+        $col->setDefault(true);
+        $this->assertEquals('`my_col` bit(1) not null default b\'1\'',$col.'');
+        $col->setDefault(false);
+        $this->assertEquals('`my_col` bit(1) not null default b\'0\'',$col.'');
+        $col->setDefault(null);
+        $this->assertEquals('`my_col` bit(1) not null',$col.'');
+        $col->setDefault('Random Val');
+        $this->assertEquals('`my_col` bit(1) not null default b\'0\'',$col.'');
+    }
+    /**
+     * @test
+     */
+    public function testBoolean02() {
+        $col = new MySQLColumn('my_col', 'bool');
+        $this->assertEquals('bool',$col->getDatatype());
+        $col->setIsNull(true);
+        $this->assertEquals('`my_col` bit(1) not null',$col.'');
+        $col->setIsAutoInc(true);
+        $this->assertEquals('`my_col` bit(1) not null',$col.'');
+        $col->setIsPrimary(true);
+        $this->assertEquals('`my_col` bit(1) not null',$col.'');
+        $col->setIsUnique(true);
+        $this->assertEquals('`my_col` bit(1) not null',$col.'');
+    }
+    /**
+     * @test
+     */
+    public function testCleanValue00() {
+        $col = new MySQLColumn('col', 'varchar');
+        $this->assertEquals('\'Hello World!\'',$col->cleanValue('Hello World!'));
+        $this->assertEquals('\'I wouln\\\'t do That\'',$col->cleanValue('I wouln\'t do That'));
+    }
+    /**
+     * @test
+     */
+    public function testCleanValue01() {
+        $col = new MySQLColumn('col', 'text');
+        $this->assertEquals('\'Hello World!\'',$col->cleanValue('Hello World!'));
+        $this->assertEquals('\'I wouln\\\'t do That\'',$col->cleanValue('I wouln\'t do That'));
+    }
+    /**
+     * @test
+     */
+    public function testCleanValue02() {
+        $col = new MySQLColumn('col', 'mediumtext');
+        $this->assertEquals('\'Hello World!\'',$col->cleanValue('Hello World!'));
+        $this->assertEquals('\'I wouln\\\'t do That\'',$col->cleanValue('I wouln\'t do That'));
+    }
+    /**
+     * @test
+     */
+    public function testCleanValue03() {
+        $col = new MySQLColumn('col', 'int');
+        $this->assertEquals(0,$col->cleanValue('Hello World!'));
+        $this->assertEquals(0,$col->cleanValue('I wouln\';select * from x'));
+        $this->assertEquals(43,$col->cleanValue('43'));
+        $this->assertEquals(-99,$col->cleanValue('-99.65'));
+        $this->assertEquals(0,$col->cleanValue('hello-99.65'));
+        $this->assertEquals(5,$col->cleanValue(5));
+        $this->assertNotNull($col->getOldName());
+        $this->assertEquals('`col`',$col->getOldName());
+        $col->setName('new');
+        $this->assertEquals('`col`', $col->getOldName());
+    }
+    /**
+     * @test
+     */
+    public function testCleanValue04() {
+        $col = new MySQLColumn('col', 'decimal');
+        $this->assertEquals('\'0\'',$col->cleanValue('Hello World!'));
+        $this->assertEquals('\'0\'',$col->cleanValue('I wouln\';select * from x'));
+        $this->assertEquals('\'43\'',$col->cleanValue('43'));
+        $this->assertEquals('\'-99.65\'',$col->cleanValue('-99.65'));
+        $this->assertEquals('\'0\'',$col->cleanValue('hello-99.65'));
+        $this->assertEquals('\'5\'',$col->cleanValue(5));
+        $this->assertEquals('\'6532.887\'',$col->cleanValue(6532.887));
+    }
+    /**
+     * @test
+     */
+    public function testCleanValue06() {
+        $col = new MySQLColumn('col', 'decimal');
+        $this->assertEquals('\'0\'',$col->cleanValue('Hello World!'));
+        $this->assertEquals('\'0\'',$col->cleanValue('I wouln\';select * from x'));
+        $this->assertEquals('\'43\'',$col->cleanValue('43'));
+        $this->assertEquals('\'-99.65\'',$col->cleanValue('-99.65'));
+        $this->assertEquals('\'0\'',$col->cleanValue('hello-99.65'));
+        $this->assertEquals('\'5\'',$col->cleanValue(5));
+        $this->assertEquals('\'6532.887\'',$col->cleanValue(6532.887));
+    }
+    /**
+     * @test
+     */
+    public function testCleanValue07() {
+        $col = new MySQLColumn('col', 'timestamp');
+        $this->assertEquals('',$col->cleanValue('Hello World!'));
+        $this->assertEquals('',$col->cleanValue('I wouln\';select * from x'));
+        $this->assertEquals('',$col->cleanValue(5));
+        $this->assertEquals('\'2019-11-01 00:00:00\'',$col->cleanValue('2019-11-01'));
+        $this->assertEquals('\'2019-11-01 23:09:44\'',$col->cleanValue('2019-11-01 23:09:44'));
+    }
+    /**
+     * @test
+     */
+    public function testCleanValue08() {
+        $col = new MySQLColumn('col');
+        $cleanedArr = $col->cleanValue([1, false, null, 'string', '1.8', 7.9]);
+        $this->assertEquals([
+            "'1'",
+            "''",
+            null,
+            "'string'",
+            "'1.8'",
+            "'7.9'"
+        ],$cleanedArr);
+        
+    }
+    /**
+     * @test
+     */
+    public function testCleanValue09() {
+        $col = new MySQLColumn('col', 'bool');
+        $cleanedArr = $col->cleanValue([1, false, null, 'string', '1.8', 7.9, true]);
+        $this->assertEquals([
+            "b'0'",
+            "b'0'",
+            null,
+            "b'0'",
+            "b'0'",
+            "b'0'",
+            "b'1'"
+        ],$cleanedArr);
+        
+    }
+    /**
+     * @test
+     */
+    public function testCreateCol00() {
+        $colObj = MySQLColumn::createColObj([]);
+        $this->assertNull($colObj);
+    }
+    /**
+     * @test
+     */
+    public function testCreateCol01() {
+        $colObj = MySQLColumn::createColObj([
+            'name' => 'my_col',
+            'type' => DataType::VARCHAR,
+            'validator' => function ($orgVal, $cleaned) {
+                return 'Hello '.$cleaned;
+            }
+        ]);
+        $this->assertNotNull($colObj);
+        $this->assertEquals('`my_col`', $colObj->getName());
+        $this->assertEquals('varchar', $colObj->getDatatype());
+        $this->assertEquals(1, $colObj->getSize());
+        $this->assertEquals("'Hello Ibrahim'", $colObj->cleanValue('Ibrahim'));
+    }
+    /**
+     * @test
+     */
+    public function testConstructor00() {
+        $col = new MySQLColumn();
+        $this->assertEquals('varchar',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+        $this->assertEquals('`col`',$col->getName());
+    }
+    /**
+     * @test
+     */
+    public function testConstructor01() {
+        $col = new MySQLColumn('user_id ', 'varchar', 15);
+        $this->assertEquals('varchar',$col->getDatatype());
+        $this->assertEquals(15,$col->getSize());
+        $this->assertEquals('`user_id`',$col->getName());
+    }
+    /**
+     * @test
+     */
+    public function testConstructor04() {
+        $this->expectException('WebFiori\Database\DatabaseException');
+        $col = new MySQLColumn('valid_name', 'invalid type', 15);
+        $this->assertEquals('varchar',$col->getDatatype());
+        $this->assertEquals(15,$col->getSize());
+        $this->assertEquals('valid_name',$col->getName());
+    }
+    /**
+     * @test
+     */
+    public function testConstructor05() {
+        $col = new MySQLColumn('valid_name', 'InT', 15);
+        $this->assertEquals('int',$col->getDatatype());
+        $this->assertEquals(11,$col->getSize());
+        $this->assertEquals('`valid_name`',$col->getName());
+    }
+    /**
+     * @test
+     */
+    public function testConstructor06() {
+        $col = new MySQLColumn('valid_name', 'Varchar ', 15);
+        $this->assertEquals('varchar',$col->getDatatype());
+        $this->assertEquals(15,$col->getSize());
+        $this->assertEquals('`valid_name`',$col->getName());
+    }
+    /**
+     * @test
+     */
+    public function testConstructor07() {
+        $col = new MySQLColumn('valid_name', 'Varchar ', 21846);
+        $this->assertEquals('mediumtext',$col->getDatatype());
+        $this->assertEquals(21846,$col->getSize());
+        $this->assertEquals('`valid_name`',$col->getName());
+    }
+    /**
+     * @test
+     */
+    public function testConstructor08() {
+        $col = new MySQLColumn('valid_name', 'Varchar ', 0);
+        $this->assertEquals('varchar',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+        $this->assertEquals('`valid_name`',$col->getName());
+    }
+    /**
+     * @test
+     */
+    public function testConstructor09() {
+        $col = new MySQLColumn('amount', 'decimal ');
+        $this->assertEquals('decimal',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+
+        return $col;
+    }
+    /**
+     * @test
+     */
+    public function testConstructor10() {
+        $col = new MySQLColumn('amount', 'decimal ',0);
+        $this->assertEquals('decimal',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+        $this->assertEquals(0,$col->getScale());
+
+        return $col;
+    }
+    /**
+     * @test
+     */
+    public function testConstructor11() {
+        $col = new MySQLColumn('amount', 'decimal ',1);
+        $this->assertEquals('decimal',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+        $this->assertEquals(0,$col->getScale());
+
+        return $col;
+    }
+    /**
+     * @test
+     */
+    public function testConstructor12() {
+        $col = new MySQLColumn('amount', 'decimal ',2);
+        $this->assertEquals('decimal',$col->getDatatype());
+        $this->assertEquals(2,$col->getSize());
+        $this->assertEquals(0,$col->getScale());
+
+        return $col;
+    }
+    /**
+     * @test
+     */
+    public function testConstructor13() {
+        $col = new MySQLColumn('amount', 'decimal ',3);
+        $this->assertEquals('decimal',$col->getDatatype());
+        $this->assertEquals(3,$col->getSize());
+        $this->assertEquals(0,$col->getScale());
+
+        return $col;
+    }
+    /**
+     * @test
+     */
+    public function testConstructor14() {
+        $col = new MySQLColumn('amount', 'decimal ',4);
+        $this->assertEquals('decimal',$col->getDatatype());
+        $this->assertEquals(4,$col->getSize());
+        $this->assertEquals(0,$col->getScale());
+
+        return $col;
+    }
+    /**
+     * @test
+     */
+    public function testConstructor15() {
+        $col = new MySQLColumn('amount', 'decimal ',-9);
+        $this->assertEquals('decimal',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+        $this->assertEquals(0,$col->getScale());
+
+        return $col;
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault00() {
+        $col = new MySQLColumn('date', 'timestamp');
+        $col->setDefault('2019-11-09');
+        $this->assertEquals('2019-11-09 00:00:00',$col->getDefault());
+        $this->assertEquals('`date` timestamp not null default \'2019-11-09 00:00:00\'',$col.'');
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault01() {
+        $col = new MySQLColumn('date', 'timestamp');
+        $col->setDefault('2019-07-07 09:09:09');
+        $this->assertEquals('2019-07-07 09:09:09',$col->getDefault());
+        $this->assertEquals('`date` timestamp not null default \'2019-07-07 09:09:09\'',$col.'');
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault02() {
+        $col = new MySQLColumn('date', 'datetime');
+        $col->setDefault('');
+        $this->assertNull($col->getDefault());
+        $this->assertEquals('`date` datetime not null',$col.'');
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault03() {
+        $col = new MySQLColumn('date', 'datetime');
+        $col->setDefault('2019-07-07 09:09:09');
+        $this->assertEquals('2019-07-07 09:09:09',$col->getDefault());
+        $this->assertEquals('`date` datetime not null default \'2019-07-07 09:09:09\'',$col.'');
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault04() {
+        $col = new MySQLColumn('date', 'datetime');
+        $col->setDefault('2019-15-07 09:09:09');
+        $this->assertNull($col->getDefault());
+        $this->assertEquals('`date` datetime not null',$col.'');
+        $col->setDefault('2019-12-33 09:09:09');
+        $this->assertNull($col->getDefault());
+        $this->assertEquals('`date` datetime not null',$col.'');
+        $col->setDefault('2019-12-31 24:09:09');
+        $this->assertNull($col->getDefault());
+        $col->setDefault('2019-12-31 23:60:09');
+        $this->assertNull($col->getDefault());
+        $col->setDefault('2019-12-31 23:59:60');
+        $this->assertNull($col->getDefault());
+        $col->setDefault('2019-12-31 23:59:59');
+        $this->assertEquals('2019-12-31 23:59:59',$col->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault05() {
+        $col = new MySQLColumn('id', 'int');
+        $this->assertEquals('`id` int not null',$col.'');
+        $col->setMySQLVersion('5.0.0');
+        $col->setDefault(-122);
+        $this->assertEquals(-122,$col->getDefault());
+        $this->assertEquals('`id` int(1) not null default -122',$col.'');
+        $col->setDefault(null);
+        $this->assertNull($col->getDefault());
+        $col->setDefault('a string');
+        $this->assertEquals(0,$col->getDefault());
+        $col->setDefault(1.8);
+        $this->assertEquals(1,$col->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault06() {
+        $col = new MySQLColumn('id', 'varchar');
+        $this->assertEquals('`id` varchar(1) not null collate utf8mb4_unicode_520_ci',$col.'');
+        $col->setDefault('A random string.');
+        $this->assertEquals('A random string.',$col->getDefault());
+        $col->setMySQLVersion('5.0.0');
+        $this->assertEquals('`id` varchar(1) not null default \'A random string.\' collate utf8mb4_unicode_ci',$col.'');
+        $col->setDefault(null);
+        $this->assertNull($col->getDefault());
+        $col->setDefault(33);
+        $this->assertEquals(33,$col->getDefault());
+        $col->setDefault(1.8);
+        $this->assertEquals(1.8,$col->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault07() {
+        $col = new MySQLColumn('id', 'decimal');
+        $this->assertEquals('`id` decimal(1,0) not null',$col.'');
+        $col->setDefault(1);
+        $this->assertEquals(1,$col->getDefault());
+        $this->assertEquals('`id` decimal(1,0) not null default \'1\'',$col.'');
+        $col->setDefault(1.66);
+        $this->assertEquals(1.66,$col->getDefault());
+        $this->assertEquals('`id` decimal(1,0) not null default \'1.66\'',$col.'');
+        $col->setDefault(null);
+        $this->assertNull($col->getDefault());
+        $col->setDefault('33');
+        $this->assertEquals(33,$col->getDefault());
+        $col->setDefault('');
+        $this->assertEquals(0,$col->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault08() {
+        $col = new MySQLColumn('date', 'datetime');
+        $col->setDefault('now()');
+        $this->assertEquals('now()',$col->getDefault());
+        $this->assertEquals('`date` datetime not null default now()',$col.'');
+    }
+    /**
+     * @test
+     */
+    public function testSetDefault09() {
+        $col = new MySQLColumn('mix', 'mixed');
+        $col->setDefault('2019-11-09');
+        $this->assertEquals("2019-11-09",$col->getDefault());
+        $this->assertEquals("`mix` varchar(256) not null default '2019-11-09' collate utf8mb4_unicode_520_ci",$col.'');
+    }
+    /**
+     * @test
+     */
+    public function testSetMySQLVersion00() {
+        $col = new MySQLColumn();
+        $col->setMySQLVersion('5.4');
+        $this->assertEquals('5.4',$col->getMySQLVersion());
+        $this->assertEquals('utf8mb4_unicode_ci',$col->getCollation());
+    }
+    /**
+     * @test
+     */
+    public function testSetMySQLVersion01() {
+        $col = new MySQLColumn();
+        $col->setMySQLVersion('8.0');
+        $this->assertEquals('8.0',$col->getMySQLVersion());
+        $this->assertEquals('utf8mb4_unicode_520_ci',$col->getCollation());
+    }
+    /**
+     * @test
+     */
+    public function testSetMySQLVersion02() {
+        $column = new MySQLColumn();
+        $column->setMySQLVersion('5');
+        $this->assertEquals('8.0',$column->getMySQLVersion());
+        $this->assertEquals('utf8mb4_unicode_520_ci',$column->getCollation());
+    }
+    /**
+     * @test
+     */
+    public function testSetMySQLVersion03() {
+        $col = new MySQLColumn();
+        $col->setMySQLVersion('8.0.77');
+        $this->assertEquals('8.0.77',$col->getMySQLVersion());
+        $this->assertEquals('utf8mb4_unicode_520_ci',$col->getCollation());
+    }
+    /**
+     * 
+     * @param MySQLColumn $col
+     * @depends testConstructor09
+     */
+    public function testSetScale00($col) {
+        $col->setSize(10);
+        $this->assertTrue($col->setScale(3));
+        $this->assertEquals(3,$col->getScale());
+        $this->assertTrue($col->setScale(0));
+        $this->assertEquals(0,$col->getScale());
+        $this->assertTrue($col->setScale(9));
+        $this->assertEquals(9,$col->getScale());
+        $this->assertFalse($col->setScale(10));
+        $this->assertEquals(9,$col->getScale());
+    }
+    /**
+     * @test
+     */
+    public function testSetType00() {
+        $col = new MySQLColumn();
+        $col->setDatatype('int');
+        $this->assertEquals('int',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+        $this->assertNull($col->getDefault());
+        $col->setSize(11);
+        $col->setDefault(6000);
+        $this->assertEquals(11,$col->getSize());
+        $this->assertEquals(6000,$col->getDefault());
+        $col->setDatatype('  int ');
+        $col->setSize(12);
+        $col->setDefault(698);
+        $this->assertEquals('int',$col->getDatatype());
+        $this->assertEquals(11,$col->getSize());
+    }
+    /**
+     * @test
+     */
+    public function testSetType01() {
+        $col = new MySQLColumn();
+        $col->setDatatype('varchar');
+        $col->setSize(0);
+        $this->assertEquals('varchar',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+        $this->assertNull($col->getDefault());
+        $col->setDatatype('  varchar');
+        $col->setSize(5000);
+        $col->setDefault(6000);
+        $this->assertEquals(5000,$col->getSize());
+        $this->assertSame('6000',$col->getDefault());
+        $col->setSize(500000);
+        $col->setDefault('Hello World');
+        $this->assertEquals('mediumtext',$col->getDatatype());
+        $this->assertEquals(500000,$col->getSize());
+        $this->assertSame('Hello World',$col->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testSetType02() {
+        $col = new MySQLColumn();
+        $col->setDatatype('varchar');
+        $this->assertEquals('varchar',$col->getDatatype());
+        $col->setSize(5000);
+        $this->assertEquals(5000,$col->getSize());
+        $col->setDefault('Hello');
+        $this->assertSame('Hello',$col->getDefault());
+        $col->setDatatype('int');
+        $this->assertEquals('int',$col->getDatatype());
+        $col->setSize(1);
+        $this->assertEquals(1,$col->getSize());
+        $this->assertNull($col->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testSetType03() {
+        $col = new MySQLColumn();
+        $col->setDatatype('datetime');
+        $this->assertEquals('datetime',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+        $col->setDefault('2019-01-11');
+        $this->assertSame('2019-01-11 00:00:00',$col->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testSetType04() {
+        $col = new MySQLColumn();
+        $col->setDatatype('datetime');
+        $col->setDefault('2019-01-11 28:00:00');
+        $this->assertEquals('datetime',$col->getDatatype());
+        $this->assertEquals(1,$col->getSize());
+        $this->assertNull($col->getDefault());
+        $col->setDefault('2019-13-11 00:00:00');
+        $this->assertNull($col->getDefault());
+        $col->setDefault('2019-04-44 00:00:00');
+        $this->assertNull($col->getDefault());
+        
+        $col->setDatatype('timestamp');
+        $col->setDefault('2019-12-11 00:60:00');
+        $this->assertNull($col->getDefault());
+        $col->setDefault('2019-12-11 00:00:60');
+        $this->assertNull($col->getDefault());
+        $col->setDefault('2019-12-30 23:59:59');
+        $this->assertEquals('2019-12-30 23:59:59',$col->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testSetType05() {
+        $col = new MySQLColumn();
+        $col->setDatatype('datetime');
+        $col->setDefault('now()');
+        $this->assertEquals('now()', $col->getDefault());
+        $col->setDefault('current_timestamp');
+        $this->assertEquals('current_timestamp', $col->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testSetType06() {
+        $col = new MySQLColumn();
+        $col->setDatatype('timestamp');
+        $col->setDefault('now()');
+        $this->assertEquals('now()', $col->getDefault());
+        $col->setDefault('current_timestamp');
+        $this->assertEquals('current_timestamp', $col->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testMap00() {
+        $col = new MySQLColumn();
+        $col->setDatatype('timestamp');
+        $col->setDefault('now()');
+        $this->assertEquals('now()', $col->getDefault());
+        $col->setDefault('current_timestamp');
+        $this->assertEquals('current_timestamp', $col->getDefault());
+        
+        $newCol = ColumnFactory::map('mssql', $col);
+        $this->assertTrue($newCol instanceof MSSQLColumn);
+        $this->assertEquals('col', $newCol->getNormalName());
+        $this->assertEquals('datetime2', $newCol->getDatatype());
+        $this->assertEquals('current_timestamp', $newCol->getDefault());
+    }
+    /**
+     * @test
+     */
+    public function testGetPHPType00() {
+        $colObj = new MySQLColumn();
+        $this->assertEquals('string', $colObj->getPHPType());
+        $colObj->setIsNull(true);
+        $this->assertEquals('string|null', $colObj->getPHPType());
+    }
+    /**
+     * @test
+     */
+    public function testGetPHPType01() {
+        $colObj = new MySQLColumn('col', 'bool');
+        $this->assertEquals('bool', $colObj->getPHPType());
+        $colObj->setIsNull(true);
+        $this->assertEquals('bool', $colObj->getPHPType());
+    }
+    /**
+     * @test
+     */
+    public function testGetPHPType02() {
+        $colObj = new MySQLColumn('col', 'bool');
+        $this->assertEquals('bool', $colObj->getPHPType());
+        $colObj->setIsNull(true);
+        $this->assertEquals('bool', $colObj->getPHPType());
+    }
+    /**
+     * @test
+     */
+    public function testGetPHPType03() {
+        $colObj = new MySQLColumn('col', 'decimal');
+        $this->assertEquals('float', $colObj->getPHPType());
+        $colObj->setIsNull(true);
+        $this->assertEquals('float|null', $colObj->getPHPType());
+    }
+    /**
+     * @test
+     */
+    public function testGetPHPType04() {
+        $colObj = new MySQLColumn('col', 'blob');
+        $this->assertEquals('string', $colObj->getPHPType());
+        $colObj->setIsNull(true);
+        $this->assertEquals('string|null', $colObj->getPHPType());
+    }
+    /**
+     * @test
+     */
+    public function testGetPHPType05() {
+        $colObj = new MySQLColumn('col', 'datetime');
+        $this->assertEquals('string', $colObj->getPHPType());
+        $colObj->setIsNull(true);
+        $this->assertEquals('string|null', $colObj->getPHPType());
+    }
+}
diff --git a/tests/WebFiori/Tests/Database/MySql/MySQLTableTest.php b/tests/WebFiori/Tests/Database/MySql/MySQLTableTest.php
index dfb4f572..3434652c 100644
--- a/tests/WebFiori/Tests/Database/MySql/MySQLTableTest.php
+++ b/tests/WebFiori/Tests/Database/MySql/MySQLTableTest.php
@@ -1,554 +1,554 @@
-<?php
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-namespace WebFiori\Tests\Database\MySql;
-
-use PHPUnit\Framework\TestCase;
+<?php
+
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+namespace WebFiori\Tests\Database\MySql;
+
+use PHPUnit\Framework\TestCase;
 use WebFiori\Database\DataType;
-use WebFiori\Database\ColOption;
-use WebFiori\Database\MsSql\MSSQLTable;
-use WebFiori\Database\MySql\MySQLColumn;
-use WebFiori\Database\MySql\MySQLTable;
-use WebFiori\Database\Table;
-/**
- * Description of MySQLTableTest
- *
- * @author Ibrahim
- */
-class MySQLTableTest extends TestCase {
-    /**
-     * @test
-     */
-    public function testFK1() {
-        $table = new MySQLTable('users');
-        $table->addColumns([
-            'user-id' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::SIZE => 11,
-                ColOption::PRIMARY => true,
-                ColOption::AUTO_INCREMENT => true
-            ],
-            'email' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256,
-                'is-unique' => true
-            ],
-            'username' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 20,
-                'is-unique' => true
-            ],
-            'password' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256
-            ],
-            'created-on' => [
-                ColOption::TYPE => DataType::TIMESTAMP,
-                ColOption::DEFAULT => 'now()',
-            ],
-        ]);
-        
-        $table2 = new MySQLTable('t');
-        $table2->addColumns([
-            'user-id' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::SIZE => 11,
-                ColOption::PRIMARY => true,
-                ColOption::AUTO_INCREMENT => true
-            ],
-            'email' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256,
-                'is-unique' => true
-            ],
-        ]);
-        $table2->addReference($table, ['user-id', 'email'], 'fk_ok', 'cascade', 'cascade');
-        $key = $table2->getForeignKey('fk_ok');
-        $this->assertEquals(2, count($key->getSourceCols()));
-        $this->assertEquals("create table if not exists `t` (\n"
-                . "    `user_id` int not null unique auto_increment,\n"
-                . "    `email` varchar(256) not null unique collate utf8mb4_unicode_520_ci,\n"
-                . "    constraint `t_pk` primary key (`user_id`),\n"
-                . "    constraint `fk_ok` foreign key (`user_id`, `email`) references `users` (`user_id`, `email`) on update cascade on delete cascade\n"
-                . ")\n"
-                . "engine = InnoDB\n"
-                . "default charset = utf8mb4\n"
-                . "collate = utf8mb4_unicode_520_ci;", $table2->toSQL());
-        $this->assertEquals(3, $table->getUniqueColsCount());
-    }
-    /**
-     * @test
-     */
-    public function testFK2() {
-        $table = new MySQLTable('users');
-        $table->addColumns([
-            'user-id' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::SIZE => 11,
-                ColOption::PRIMARY => true,
-                ColOption::AUTO_INCREMENT => true
-            ],
-            'email' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256,
-                'is-unique' => true
-            ],
-            'username' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 20,
-                'is-unique' => true
-            ],
-            'password' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256
-            ],
-            'created-on' => [
-                ColOption::TYPE => DataType::TIMESTAMP,
-                ColOption::DEFAULT => 'now()',
-            ],
-        ]);
-        
-        $table2 = new MySQLTable('t');
-        $table2->addColumns([
-            'user-id-super' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::SIZE => 11,
-                ColOption::PRIMARY => true,
-                ColOption::AUTO_INCREMENT => true
-            ],
-            'email-x' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256,
-                'is-unique' => true
-            ],
-        ]);
-        $table2->addReference($table, [
-            'user-id-super' => 'user-id','email-x' =>  'email'], 'fk_ok', 'cascade', 'cascade');
-        $key = $table2->getForeignKey('fk_ok');
-        $this->assertEquals(2, count($key->getSourceCols()));
-        $this->assertEquals("create table if not exists `t` (\n"
-                . "    `user_id_super` int not null unique auto_increment,\n"
-                . "    `email_x` varchar(256) not null unique collate utf8mb4_unicode_520_ci,\n"
-                . "    constraint `t_pk` primary key (`user_id_super`),\n"
-                . "    constraint `fk_ok` foreign key (`user_id_super`, `email_x`) references `users` (`user_id`, `email`) on update cascade on delete cascade\n"
-                . ")\n"
-                . "engine = InnoDB\n"
-                . "default charset = utf8mb4\n"
-                . "collate = utf8mb4_unicode_520_ci;", $table2->toSQL());
-    }
-    /**
-     * @test
-     */
-    public function testMap00() {
-        $table = new MySQLTable('users');
-        $table->addColumns([
-            'user-id' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::SIZE => 11,
-                ColOption::PRIMARY => true,
-                ColOption::AUTO_INCREMENT => true
-            ],
-            'email' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256,
-                'is-unique' => true
-            ],
-            'username' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 20,
-                'is-unique' => true
-            ],
-            'password' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256
-            ],
-            'created-on' => [
-                ColOption::TYPE => DataType::TIMESTAMP,
-                ColOption::DEFAULT => 'now()',
-            ],
-        ]);
-        
-        $table2 = new MySQLTable('t');
-        $table2->addColumns([
-            'user-id-super' => [
-                ColOption::TYPE => DataType::INT,
-                ColOption::SIZE => 11,
-                ColOption::PRIMARY => true,
-                ColOption::AUTO_INCREMENT => true
-            ],
-            'email-x' => [
-                ColOption::TYPE => DataType::VARCHAR,
-                ColOption::SIZE => 256,
-                'is-unique' => true
-            ],
-        ]);
-        $table2->addReference($table, [
-            'user-id-super' => 'user-id','email-x' =>  'email'], 'fk_ok', 'cascade', 'cascade');
-        $key = $table2->getForeignKey('fk_ok');
-        $this->assertEquals(2, count($key->getSourceCols()));
-        $this->assertEquals("create table if not exists `t` (\n"
-                . "    `user_id_super` int not null unique auto_increment,\n"
-                . "    `email_x` varchar(256) not null unique collate utf8mb4_unicode_520_ci,\n"
-                . "    constraint `t_pk` primary key (`user_id_super`),\n"
-                . "    constraint `fk_ok` foreign key (`user_id_super`, `email_x`) references `users` (`user_id`, `email`) on update cascade on delete cascade\n"
-                . ")\n"
-                . "engine = InnoDB\n"
-                . "default charset = utf8mb4\n"
-                . "collate = utf8mb4_unicode_520_ci;", $table2->toSQL());
-        
-        $mappedInstance = Table::map('mssql', $table2);
-        $this->assertTrue($mappedInstance instanceof MSSQLTable);
-        $this->assertEquals('[t]', $mappedInstance->getName());
-        $this->assertEquals("if not exists (select * from sysobjects where name='t' and xtype='U')\n"
-                . "create table [t] (\n"
-                . "    [user_id_super] [int] identity(1,1) not null,\n"
-                . "    [email_x] [varchar](256) not null,\n"
-                . "    constraint t_pk primary key clustered([user_id_super]) on [PRIMARY],\n"
-                . "    constraint fk_ok foreign key ([user_id_super], [email_x]) references [users] ([user_id], [email]) on update cascade on delete cascade,\n"
-                . "    constraint AK_t unique (user_id_super, email_x)\n"
-                . ")\n", $mappedInstance->toSQL());
-    }
-    /**
-     * @test
-     */
-    public function testAddColumn00() {
-        $table = new MySQLTable();
-        $this->assertTrue($table->addColumn('new-col', new MySQLColumn()));
-        $this->assertFalse($table->addColumn('new-col-2', new MySQLColumn()));
-        $this->assertTrue($table->addColumn('new-col-2', new MySQLColumn('col_2', 'varchar')));
-        $this->assertFalse($table->addColumn('new-col-2', new MySQLColumn('col_3', 'varchar')));
-
-        return $table;
-    }
-    /**
-     * @test
-     */
-    public function testAddColumn01() {
-        $table = new MySQLTable();
-        $this->assertTrue($table->addColumn(' new-col ', new MySQLColumn()));
-        $this->assertTrue($table->addColumn('valid key', new MySQLColumn('col_')));
-        $this->assertFalse($table->addColumn('-', new MySQLColumn('col_2')));
-        $this->assertFalse($table->addColumn('--', new MySQLColumn('col_2')));
-
-        return $table;
-    }
-    /**
-     * @test
-     */
-    public function testAddColumn02() {
-        $table = new MySQLTable();
-        $table->addColumns([
-            'id' => new MySQLColumn('col-01'),
-            'name' => new MySQLColumn('col-02', 'int')
-        ]);
-        $this->assertTrue($table->hasColumnWithKey('id'));
-        $this->assertTrue($table->hasColumnWithKey('name'));
-        $this->assertTrue($table->hasColumn('col-01'));
-        $this->assertTrue($table->hasColumn('col-02'));
-
-        return $table;
-    }
-    /**
-     * @test
-     */
-    public function testConstructor00() {
-        $table = new MySQLTable();
-        $this->assertNull($table->getOldName());
-        $this->assertEquals('`new_table`',$table->getName());
-    }
-    /**
-     * @test
-     */
-    public function testConstructor01() {
-        $table = new MySQLTable('valid_name');
-        $this->assertEquals('`valid_name`',$table->getName());
-    }
-    /**
-     * @test
-     */
-    public function testConstructor02() {
-        $table = new MySQLTable('    another_Valid_Name    ');
-        $this->assertNull($table->getOldName());
-        $this->assertEquals('`another_Valid_Name`',$table->getName());
-        $table->setName('new-name');
-        $this->assertEquals('`another_Valid_Name`', $table->getOldName());
-    }
-    /**
-     * 
-     * @test
-     */
-    public function testGetColByIndex() {
-        $table = new MySQLTable();
-        $table->addColumns([
-            'user-id' => [
-                'datatype' => DataType::INT,
-                ColOption::SIZE => 11,
-                'is-primary' => true
-            ],
-            'username' => [
-                ColOption::SIZE => 20,
-                'is-unique' => true
-            ],
-            'email' => [
-                ColOption::SIZE => 150,
-                'is-unique' => true
-            ],
-            'password' => [
-                ColOption::SIZE => 64
-            ]
-        ]);
-        $this->assertEquals(4, $table->getColsCount());
-        $col00 = $table->getColByIndex(0);
-        $this->assertEquals('`user_id`',$col00->getName());
-        $this->assertEquals('int',$col00->getDatatype());
-        $this->assertEquals(11,$col00->getSize());
-        $this->assertTrue($col00->isPrimary());
-        $this->assertEquals(1, $table->getPrimaryKeyColsCount());
-        
-        $col01 = $table->getColByIndex(2);
-        $this->assertEquals('mixed',$col01->getDatatype());
-        $this->assertEquals(1,$col01->getSize());
-        $this->assertFalse($col01->isPrimary());
-        $this->asserttrue($col01->isUnique());
-
-        $col02 = $table->getColByIndex(6);
-        $this->assertNull($col02);
-    }
-    /**
-     * @test
-     */
-    public function testGetCreatePrimaryKeyStatement00() {
-        $table = new MySQLTable();
-        $this->assertTrue(true);
-    }
-    /**
-     * 
-     * @param MySQLTable $table
-     * @depends testAddColumn00
-     */
-    public function testHasCol00($table) {
-        $this->assertTrue($table->hasColumnWithKey('new-col'));
-        $this->assertTrue($table->hasColumnWithKey(' new-col '));
-        $this->assertTrue($table->hasColumnWithKey('new-col-2'));
-    }
-    /**
-     * 
-     * @param MySQLTable $table
-     * @depends testAddColumn00
-     */
-    public function testHasCol01($table) {
-        $this->assertTrue($table->hasColumnWithKey('new-col'));
-        $this->assertFalse($table->hasColumnWithKey('invalid key'));
-    }
-    /**
-     * @test
-     */
-    public function testPrimaryKey00() {
-        $table = new MySQLTable('hello');
-        $table->addColumns([
-            'id-col'=>[
-            'is-primary' => true,
-            ColOption::SIZE => 3
-            ]
-        ]);
-        $this->assertTrue($table->getColByKey('id-col')->isUnique());
-        $this->assertEquals(1, $table->getPrimaryKeyColsCount());
-        $this->assertEquals(1, $table->getUniqueColsCount());
-        $this->assertEquals([
-            'id-col'
-        ], $table->getUniqueColsKeys());
-        return $table;
-    }
-    /**
-     * @test
-     * @param MySQLTable $table
-     * @depends testPrimaryKey00
-     */
-    public function testPrimaryKey01($table) {
-        $table->addColumns([
-            'id-col-2'=>[
-                'is-primary' => true
-            ]
-        ]);
-        $this->assertFalse($table->getColByKey('id-col')->isUnique());
-        $this->assertFalse($table->getColByKey('id-col-2')->isUnique());
-        $this->assertEquals(2, $table->getPrimaryKeyColsCount());
-        $this->assertEquals(0, $table->getUniqueColsCount());
-        return $table;
-    }
-    /**
-     * @test
-     * @param MySQLTable $table
-     * @depends testPrimaryKey01
-     */
-    public function testPrimaryKey02($table) {
-        $table->removeColByKey('id-col');
-        $this->assertTrue($table->getColByKey('id-col-2')->isUnique());
-        $this->assertEquals(1, $table->getUniqueColsCount());
-        return $table;
-    }
-    /**
-     * @test
-     */
-    public function testSetMySQLVersion00() {
-        $table = new MySQLTable();
-        $table->setMySQLVersion('5.4');
-        $this->assertEquals('5.4',$table->getMySQLVersion());
-        $this->assertEquals('utf8mb4_unicode_ci',$table->getCollation());
-    }
-    /**
-     * @test
-     */
-    public function testSetMySQLVersion01() {
-        $table = new MySQLTable();
-        $table->setMySQLVersion('8.0');
-        $this->assertEquals('8.0',$table->getMySQLVersion());
-        $this->assertEquals('utf8mb4_unicode_520_ci',$table->getCollation());
-    }
-    /**
-     * @test
-     */
-    public function testSetMySQLVersion02() {
-        $table = new MySQLTable();
-        $table->setMySQLVersion('8');
-        $this->assertEquals('8.0',$table->getMySQLVersion());
-        $this->assertEquals('utf8mb4_unicode_520_ci',$table->getCollation());
-        $table->setMySQLVersion('5.0.0');
-        $this->assertEquals('utf8mb4_unicode_ci', $table->getCollation());
-    }
-    /**
-     * @test
-     */
-    public function testSetMySQLVersion03() {
-        $table = new MySQLTable();
-        $table->setMySQLVersion('8.0.77');
-        $this->assertEquals('8.0.77',$table->getMySQLVersion());
-        $this->assertEquals('utf8mb4_unicode_520_ci',$table->getCollation());
-    }
-    /**
-     * @test
-     */
-    public function testWithBoolCol00() {
-        $table = new MySQLTable();
-        $table->addColumns([
-            'user-id' => [
-                ColOption::SIZE => 15
-            ],
-            'is-active' => [
-                ColOption::TYPE => 'boolean'
-            ]
-        ]);
-        $this->assertEquals('boolean',$table->getColByKey('is-active')->getDatatype());
-    }
-    /**
-     * @test
-     */
-    public function testWithBoolCol01() {
-        $table = new MySQLTable();
-        $table->addColumns([
-            'user-id' => [
-                ColOption::SIZE => 15
-            ],
-            'is-active' => [
-                ColOption::TYPE => DataType::BOOL
-            ]
-        ]);
-        $this->assertEquals('bool',$table->getColByKey('is-active')->getDatatype());
-    }
-    /**
-     * @test
-     */
-    public function testRemoveRef00() {
-        $table = new MySQLTable();
-        $table->addColumns([
-            'user-id' => [
-                ColOption::SIZE => 15,
-                'name' => 'cool'
-            ],
-            'is-active' => [
-                ColOption::TYPE => 'bool'
-            ]
-        ]);
-        $this->assertNull($table->getColByName('is-active'));
-        $this->assertNotNull($table->getColByName('is_active'));
-        $this->assertNull($table->getColByName('user_id'));
-        $this->assertNotNull($table->getColByName('cool'));
-        $this->assertNull($table->removeReference('not-exist'));
-        $this->assertEquals([
-            'user-id' => 'mixed',
-            'is-active' => DataType::BOOL
-        ], $table->getColsDataTypes());
-    }
-    /**
-     * @test
-     */
-    public function testRemoveRef01() {
-        $table = new MySQLTable('active_or_not');
-        $table->addColumns([
-            'user-id' => [
-                ColOption::SIZE => 15
-            ],
-            'is-active' => [
-                ColOption::TYPE => DataType::BOOL
-            ]
-        ]);
-        $table2 = new MySQLTable('user_info');
-        $table2->addColumns([
-            'user-id' => [
-                ColOption::SIZE => 15
-            ],
-            'first-name' => [
-                ColOption::SIZE => '50'
-            ],
-            'last-name' => [
-                ColOption::SIZE => '50'
-            ]
-        ]);
-        $table->addReference($table2, ['user-id'], 'hello_fk');
-        $this->assertEquals(1, $table->getForeignKeysCount());
-        $this->assertNull($table->removeReference('not-exist'));
-        $obj = $table->removeReference('hello_fk');
-        $this->assertEquals('hello_fk', $obj->getKeyName());
-        $this->assertEquals(0, $table->getForeignKeysCount());
-    }
-    public function testRemoveColFromRef00() {
-        $table = new MySQLTable('active_or_not');
-        $table->addColumns([
-            'user-id' => [
-                ColOption::SIZE => 15
-            ],
-            'username' => [
-                ColOption::SIZE => 50
-            ],
-            'is-active' => [
-                ColOption::TYPE => DataType::BOOL
-            ]
-        ]);
-        $table2 = new MySQLTable('user_info');
-        $table2->addColumns([
-            'user-id' => [
-                ColOption::SIZE => 15
-            ],
-            'first-name' => [
-                ColOption::SIZE => '50'
-            ],
-            'last-name' => [
-                ColOption::SIZE => '50'
-            ]
-        ]);
-        $table2->addReference($table, [
-            'user-id',
-            'first-name' => 'username'
-            ], 'hello_fk');
-        $key = $table2->getForeignKey('hello_fk');
-        $this->assertEquals(2, count($key->getOwnerCols()));
-        $this->assertFalse($key->removeReference('username'));
-        $this->assertTrue($key->removeReference('first-name'));
-        $this->assertEquals(1, count($table2->getForeignKey('hello_fk')->getSourceCols()));
-    }
-}
+use WebFiori\Database\ColOption;
+use WebFiori\Database\MsSql\MSSQLTable;
+use WebFiori\Database\MySql\MySQLColumn;
+use WebFiori\Database\MySql\MySQLTable;
+use WebFiori\Database\Table;
+/**
+ * Description of MySQLTableTest
+ *
+ * @author Ibrahim
+ */
+class MySQLTableTest extends TestCase {
+    /**
+     * @test
+     */
+    public function testFK1() {
+        $table = new MySQLTable('users');
+        $table->addColumns([
+            'user-id' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::SIZE => 11,
+                ColOption::PRIMARY => true,
+                ColOption::AUTO_INCREMENT => true
+            ],
+            'email' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256,
+                'is-unique' => true
+            ],
+            'username' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 20,
+                'is-unique' => true
+            ],
+            'password' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256
+            ],
+            'created-on' => [
+                ColOption::TYPE => DataType::TIMESTAMP,
+                ColOption::DEFAULT => 'now()',
+            ],
+        ]);
+        
+        $table2 = new MySQLTable('t');
+        $table2->addColumns([
+            'user-id' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::SIZE => 11,
+                ColOption::PRIMARY => true,
+                ColOption::AUTO_INCREMENT => true
+            ],
+            'email' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256,
+                'is-unique' => true
+            ],
+        ]);
+        $table2->addReference($table, ['user-id', 'email'], 'fk_ok', 'cascade', 'cascade');
+        $key = $table2->getForeignKey('fk_ok');
+        $this->assertEquals(2, count($key->getSourceCols()));
+        $this->assertEquals("create table if not exists `t` (\n"
+                . "    `user_id` int not null unique auto_increment,\n"
+                . "    `email` varchar(256) not null unique collate utf8mb4_unicode_520_ci,\n"
+                . "    constraint `t_pk` primary key (`user_id`),\n"
+                . "    constraint `fk_ok` foreign key (`user_id`, `email`) references `users` (`user_id`, `email`) on update cascade on delete cascade\n"
+                . ")\n"
+                . "engine = InnoDB\n"
+                . "default charset = utf8mb4\n"
+                . "collate = utf8mb4_unicode_520_ci;", $table2->toSQL());
+        $this->assertEquals(3, $table->getUniqueColsCount());
+    }
+    /**
+     * @test
+     */
+    public function testFK2() {
+        $table = new MySQLTable('users');
+        $table->addColumns([
+            'user-id' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::SIZE => 11,
+                ColOption::PRIMARY => true,
+                ColOption::AUTO_INCREMENT => true
+            ],
+            'email' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256,
+                'is-unique' => true
+            ],
+            'username' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 20,
+                'is-unique' => true
+            ],
+            'password' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256
+            ],
+            'created-on' => [
+                ColOption::TYPE => DataType::TIMESTAMP,
+                ColOption::DEFAULT => 'now()',
+            ],
+        ]);
+        
+        $table2 = new MySQLTable('t');
+        $table2->addColumns([
+            'user-id-super' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::SIZE => 11,
+                ColOption::PRIMARY => true,
+                ColOption::AUTO_INCREMENT => true
+            ],
+            'email-x' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256,
+                'is-unique' => true
+            ],
+        ]);
+        $table2->addReference($table, [
+            'user-id-super' => 'user-id','email-x' =>  'email'], 'fk_ok', 'cascade', 'cascade');
+        $key = $table2->getForeignKey('fk_ok');
+        $this->assertEquals(2, count($key->getSourceCols()));
+        $this->assertEquals("create table if not exists `t` (\n"
+                . "    `user_id_super` int not null unique auto_increment,\n"
+                . "    `email_x` varchar(256) not null unique collate utf8mb4_unicode_520_ci,\n"
+                . "    constraint `t_pk` primary key (`user_id_super`),\n"
+                . "    constraint `fk_ok` foreign key (`user_id_super`, `email_x`) references `users` (`user_id`, `email`) on update cascade on delete cascade\n"
+                . ")\n"
+                . "engine = InnoDB\n"
+                . "default charset = utf8mb4\n"
+                . "collate = utf8mb4_unicode_520_ci;", $table2->toSQL());
+    }
+    /**
+     * @test
+     */
+    public function testMap00() {
+        $table = new MySQLTable('users');
+        $table->addColumns([
+            'user-id' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::SIZE => 11,
+                ColOption::PRIMARY => true,
+                ColOption::AUTO_INCREMENT => true
+            ],
+            'email' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256,
+                'is-unique' => true
+            ],
+            'username' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 20,
+                'is-unique' => true
+            ],
+            'password' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256
+            ],
+            'created-on' => [
+                ColOption::TYPE => DataType::TIMESTAMP,
+                ColOption::DEFAULT => 'now()',
+            ],
+        ]);
+        
+        $table2 = new MySQLTable('t');
+        $table2->addColumns([
+            'user-id-super' => [
+                ColOption::TYPE => DataType::INT,
+                ColOption::SIZE => 11,
+                ColOption::PRIMARY => true,
+                ColOption::AUTO_INCREMENT => true
+            ],
+            'email-x' => [
+                ColOption::TYPE => DataType::VARCHAR,
+                ColOption::SIZE => 256,
+                'is-unique' => true
+            ],
+        ]);
+        $table2->addReference($table, [
+            'user-id-super' => 'user-id','email-x' =>  'email'], 'fk_ok', 'cascade', 'cascade');
+        $key = $table2->getForeignKey('fk_ok');
+        $this->assertEquals(2, count($key->getSourceCols()));
+        $this->assertEquals("create table if not exists `t` (\n"
+                . "    `user_id_super` int not null unique auto_increment,\n"
+                . "    `email_x` varchar(256) not null unique collate utf8mb4_unicode_520_ci,\n"
+                . "    constraint `t_pk` primary key (`user_id_super`),\n"
+                . "    constraint `fk_ok` foreign key (`user_id_super`, `email_x`) references `users` (`user_id`, `email`) on update cascade on delete cascade\n"
+                . ")\n"
+                . "engine = InnoDB\n"
+                . "default charset = utf8mb4\n"
+                . "collate = utf8mb4_unicode_520_ci;", $table2->toSQL());
+        
+        $mappedInstance = Table::map('mssql', $table2);
+        $this->assertTrue($mappedInstance instanceof MSSQLTable);
+        $this->assertEquals('[t]', $mappedInstance->getName());
+        $this->assertEquals("if not exists (select * from sysobjects where name='t' and xtype='U')\n"
+                . "create table [t] (\n"
+                . "    [user_id_super] [int] identity(1,1) not null,\n"
+                . "    [email_x] [varchar](256) not null,\n"
+                . "    constraint t_pk primary key clustered([user_id_super]) on [PRIMARY],\n"
+                . "    constraint fk_ok foreign key ([user_id_super], [email_x]) references [users] ([user_id], [email]) on update cascade on delete cascade,\n"
+                . "    constraint AK_t unique (user_id_super, email_x)\n"
+                . ")\n", $mappedInstance->toSQL());
+    }
+    /**
+     * @test
+     */
+    public function testAddColumn00() {
+        $table = new MySQLTable();
+        $this->assertTrue($table->addColumn('new-col', new MySQLColumn()));
+        $this->assertFalse($table->addColumn('new-col-2', new MySQLColumn()));
+        $this->assertTrue($table->addColumn('new-col-2', new MySQLColumn('col_2', 'varchar')));
+        $this->assertFalse($table->addColumn('new-col-2', new MySQLColumn('col_3', 'varchar')));
+
+        return $table;
+    }
+    /**
+     * @test
+     */
+    public function testAddColumn01() {
+        $table = new MySQLTable();
+        $this->assertTrue($table->addColumn(' new-col ', new MySQLColumn()));
+        $this->assertTrue($table->addColumn('valid key', new MySQLColumn('col_')));
+        $this->assertFalse($table->addColumn('-', new MySQLColumn('col_2')));
+        $this->assertFalse($table->addColumn('--', new MySQLColumn('col_2')));
+
+        return $table;
+    }
+    /**
+     * @test
+     */
+    public function testAddColumn02() {
+        $table = new MySQLTable();
+        $table->addColumns([
+            'id' => new MySQLColumn('col-01'),
+            'name' => new MySQLColumn('col-02', 'int')
+        ]);
+        $this->assertTrue($table->hasColumnWithKey('id'));
+        $this->assertTrue($table->hasColumnWithKey('name'));
+        $this->assertTrue($table->hasColumn('col-01'));
+        $this->assertTrue($table->hasColumn('col-02'));
+
+        return $table;
+    }
+    /**
+     * @test
+     */
+    public function testConstructor00() {
+        $table = new MySQLTable();
+        $this->assertNull($table->getOldName());
+        $this->assertEquals('`new_table`',$table->getName());
+    }
+    /**
+     * @test
+     */
+    public function testConstructor01() {
+        $table = new MySQLTable('valid_name');
+        $this->assertEquals('`valid_name`',$table->getName());
+    }
+    /**
+     * @test
+     */
+    public function testConstructor02() {
+        $table = new MySQLTable('    another_Valid_Name    ');
+        $this->assertNull($table->getOldName());
+        $this->assertEquals('`another_Valid_Name`',$table->getName());
+        $table->setName('new-name');
+        $this->assertEquals('`another_Valid_Name`', $table->getOldName());
+    }
+    /**
+     * 
+     * @test
+     */
+    public function testGetColByIndex() {
+        $table = new MySQLTable();
+        $table->addColumns([
+            'user-id' => [
+                'datatype' => DataType::INT,
+                ColOption::SIZE => 11,
+                'is-primary' => true
+            ],
+            'username' => [
+                ColOption::SIZE => 20,
+                'is-unique' => true
+            ],
+            'email' => [
+                ColOption::SIZE => 150,
+                'is-unique' => true
+            ],
+            'password' => [
+                ColOption::SIZE => 64
+            ]
+        ]);
+        $this->assertEquals(4, $table->getColsCount());
+        $col00 = $table->getColByIndex(0);
+        $this->assertEquals('`user_id`',$col00->getName());
+        $this->assertEquals('int',$col00->getDatatype());
+        $this->assertEquals(11,$col00->getSize());
+        $this->assertTrue($col00->isPrimary());
+        $this->assertEquals(1, $table->getPrimaryKeyColsCount());
+        
+        $col01 = $table->getColByIndex(2);
+        $this->assertEquals('mixed',$col01->getDatatype());
+        $this->assertEquals(1,$col01->getSize());
+        $this->assertFalse($col01->isPrimary());
+        $this->asserttrue($col01->isUnique());
+
+        $col02 = $table->getColByIndex(6);
+        $this->assertNull($col02);
+    }
+    /**
+     * @test
+     */
+    public function testGetCreatePrimaryKeyStatement00() {
+        $table = new MySQLTable();
+        $this->assertTrue(true);
+    }
+    /**
+     * 
+     * @param MySQLTable $table
+     * @depends testAddColumn00
+     */
+    public function testHasCol00($table) {
+        $this->assertTrue($table->hasColumnWithKey('new-col'));
+        $this->assertTrue($table->hasColumnWithKey(' new-col '));
+        $this->assertTrue($table->hasColumnWithKey('new-col-2'));
+    }
+    /**
+     * 
+     * @param MySQLTable $table
+     * @depends testAddColumn00
+     */
+    public function testHasCol01($table) {
+        $this->assertTrue($table->hasColumnWithKey('new-col'));
+        $this->assertFalse($table->hasColumnWithKey('invalid key'));
+    }
+    /**
+     * @test
+     */
+    public function testPrimaryKey00() {
+        $table = new MySQLTable('hello');
+        $table->addColumns([
+            'id-col'=>[
+            'is-primary' => true,
+            ColOption::SIZE => 3
+            ]
+        ]);
+        $this->assertTrue($table->getColByKey('id-col')->isUnique());
+        $this->assertEquals(1, $table->getPrimaryKeyColsCount());
+        $this->assertEquals(1, $table->getUniqueColsCount());
+        $this->assertEquals([
+            'id-col'
+        ], $table->getUniqueColsKeys());
+        return $table;
+    }
+    /**
+     * @test
+     * @param MySQLTable $table
+     * @depends testPrimaryKey00
+     */
+    public function testPrimaryKey01($table) {
+        $table->addColumns([
+            'id-col-2'=>[
+                'is-primary' => true
+            ]
+        ]);
+        $this->assertFalse($table->getColByKey('id-col')->isUnique());
+        $this->assertFalse($table->getColByKey('id-col-2')->isUnique());
+        $this->assertEquals(2, $table->getPrimaryKeyColsCount());
+        $this->assertEquals(0, $table->getUniqueColsCount());
+        return $table;
+    }
+    /**
+     * @test
+     * @param MySQLTable $table
+     * @depends testPrimaryKey01
+     */
+    public function testPrimaryKey02($table) {
+        $table->removeColByKey('id-col');
+        $this->assertTrue($table->getColByKey('id-col-2')->isUnique());
+        $this->assertEquals(1, $table->getUniqueColsCount());
+        return $table;
+    }
+    /**
+     * @test
+     */
+    public function testSetMySQLVersion00() {
+        $table = new MySQLTable();
+        $table->setMySQLVersion('5.4');
+        $this->assertEquals('5.4',$table->getMySQLVersion());
+        $this->assertEquals('utf8mb4_unicode_ci',$table->getCollation());
+    }
+    /**
+     * @test
+     */
+    public function testSetMySQLVersion01() {
+        $table = new MySQLTable();
+        $table->setMySQLVersion('8.0');
+        $this->assertEquals('8.0',$table->getMySQLVersion());
+        $this->assertEquals('utf8mb4_unicode_520_ci',$table->getCollation());
+    }
+    /**
+     * @test
+     */
+    public function testSetMySQLVersion02() {
+        $table = new MySQLTable();
+        $table->setMySQLVersion('8');
+        $this->assertEquals('8.0',$table->getMySQLVersion());
+        $this->assertEquals('utf8mb4_unicode_520_ci',$table->getCollation());
+        $table->setMySQLVersion('5.0.0');
+        $this->assertEquals('utf8mb4_unicode_ci', $table->getCollation());
+    }
+    /**
+     * @test
+     */
+    public function testSetMySQLVersion03() {
+        $table = new MySQLTable();
+        $table->setMySQLVersion('8.0.77');
+        $this->assertEquals('8.0.77',$table->getMySQLVersion());
+        $this->assertEquals('utf8mb4_unicode_520_ci',$table->getCollation());
+    }
+    /**
+     * @test
+     */
+    public function testWithBoolCol00() {
+        $table = new MySQLTable();
+        $table->addColumns([
+            'user-id' => [
+                ColOption::SIZE => 15
+            ],
+            'is-active' => [
+                ColOption::TYPE => 'bool'
+            ]
+        ]);
+        $this->assertEquals('bool',$table->getColByKey('is-active')->getDatatype());
+    }
+    /**
+     * @test
+     */
+    public function testWithBoolCol01() {
+        $table = new MySQLTable();
+        $table->addColumns([
+            'user-id' => [
+                ColOption::SIZE => 15
+            ],
+            'is-active' => [
+                ColOption::TYPE => DataType::BOOL
+            ]
+        ]);
+        $this->assertEquals('bool',$table->getColByKey('is-active')->getDatatype());
+    }
+    /**
+     * @test
+     */
+    public function testRemoveRef00() {
+        $table = new MySQLTable();
+        $table->addColumns([
+            'user-id' => [
+                ColOption::SIZE => 15,
+                'name' => 'cool'
+            ],
+            'is-active' => [
+                ColOption::TYPE => 'bool'
+            ]
+        ]);
+        $this->assertNull($table->getColByName('is-active'));
+        $this->assertNotNull($table->getColByName('is_active'));
+        $this->assertNull($table->getColByName('user_id'));
+        $this->assertNotNull($table->getColByName('cool'));
+        $this->assertNull($table->removeReference('not-exist'));
+        $this->assertEquals([
+            'user-id' => 'mixed',
+            'is-active' => DataType::BOOL
+        ], $table->getColsDataTypes());
+    }
+    /**
+     * @test
+     */
+    public function testRemoveRef01() {
+        $table = new MySQLTable('active_or_not');
+        $table->addColumns([
+            'user-id' => [
+                ColOption::SIZE => 15
+            ],
+            'is-active' => [
+                ColOption::TYPE => DataType::BOOL
+            ]
+        ]);
+        $table2 = new MySQLTable('user_info');
+        $table2->addColumns([
+            'user-id' => [
+                ColOption::SIZE => 15
+            ],
+            'first-name' => [
+                ColOption::SIZE => '50'
+            ],
+            'last-name' => [
+                ColOption::SIZE => '50'
+            ]
+        ]);
+        $table->addReference($table2, ['user-id'], 'hello_fk');
+        $this->assertEquals(1, $table->getForeignKeysCount());
+        $this->assertNull($table->removeReference('not-exist'));
+        $obj = $table->removeReference('hello_fk');
+        $this->assertEquals('hello_fk', $obj->getKeyName());
+        $this->assertEquals(0, $table->getForeignKeysCount());
+    }
+    public function testRemoveColFromRef00() {
+        $table = new MySQLTable('active_or_not');
+        $table->addColumns([
+            'user-id' => [
+                ColOption::SIZE => 15
+            ],
+            'username' => [
+                ColOption::SIZE => 50
+            ],
+            'is-active' => [
+                ColOption::TYPE => DataType::BOOL
+            ]
+        ]);
+        $table2 = new MySQLTable('user_info');
+        $table2->addColumns([
+            'user-id' => [
+                ColOption::SIZE => 15
+            ],
+            'first-name' => [
+                ColOption::SIZE => '50'
+            ],
+            'last-name' => [
+                ColOption::SIZE => '50'
+            ]
+        ]);
+        $table2->addReference($table, [
+            'user-id',
+            'first-name' => 'username'
+            ], 'hello_fk');
+        $key = $table2->getForeignKey('hello_fk');
+        $this->assertEquals(2, count($key->getOwnerCols()));
+        $this->assertFalse($key->removeReference('username'));
+        $this->assertTrue($key->removeReference('first-name'));
+        $this->assertEquals(1, count($table2->getForeignKey('hello_fk')->getSourceCols()));
+    }
+}

From a9c7596b7302da820b3abc36b654e3fdd8f24560 Mon Sep 17 00:00:00 2001
From: Ibrahim BinAlshikh <ibinshikh@hotmail.com>
Date: Wed, 11 Feb 2026 00:17:43 +0300
Subject: [PATCH 2/3] chore: Run CS Fixer

---
 WebFiori/Database/DataType.php | 104 ++++++++++++++++-----------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/WebFiori/Database/DataType.php b/WebFiori/Database/DataType.php
index 4e991c8f..80611dca 100644
--- a/WebFiori/Database/DataType.php
+++ b/WebFiori/Database/DataType.php
@@ -21,48 +21,6 @@
  * @author Ibrahim
  */
 class DataType {
-    /**
-     * Mapping of database engines to their supported data types.
-     */
-    private static array $EngineTypes = [
-        'mysql' => [
-            self::BIT,
-            self::BLOB,
-            self::BLOB_LONG,
-            self::BLOB_MEDIUM,
-            self::BLOB_TINY,
-            self::BOOL,
-            self::CHAR,
-            self::DATETIME,
-            self::DECIMAL,
-            self::DOUBLE,
-            self::FLOAT,
-            self::INT,
-            self::TEXT,
-            self::TEXT_MEDIUM,
-            self::TIMESTAMP,
-            self::VARCHAR,
-        ],
-        'mssql' => [
-            self::BIGINT,
-            self::BINARY,
-            self::BIT,
-            self::BOOL,
-            self::CHAR,
-            self::DATE,
-            self::DATETIME,
-            self::DATETIME2,
-            self::DECIMAL,
-            self::FLOAT,
-            self::INT,
-            self::MONEY,
-            self::NCHAR,
-            self::NVARCHAR,
-            self::TIME,
-            self::VARBINARY,
-            self::VARCHAR,
-        ],
-    ];
     /**
      * Big integer data type. Applicable to:
      * <ul>
@@ -246,6 +204,58 @@ class DataType {
      * </ul>
      */
     const VARCHAR = 'varchar';
+    /**
+     * Mapping of database engines to their supported data types.
+     */
+    private static array $EngineTypes = [
+        'mysql' => [
+            self::BIT,
+            self::BLOB,
+            self::BLOB_LONG,
+            self::BLOB_MEDIUM,
+            self::BLOB_TINY,
+            self::BOOL,
+            self::CHAR,
+            self::DATETIME,
+            self::DECIMAL,
+            self::DOUBLE,
+            self::FLOAT,
+            self::INT,
+            self::TEXT,
+            self::TEXT_MEDIUM,
+            self::TIMESTAMP,
+            self::VARCHAR,
+        ],
+        'mssql' => [
+            self::BIGINT,
+            self::BINARY,
+            self::BIT,
+            self::BOOL,
+            self::CHAR,
+            self::DATE,
+            self::DATETIME,
+            self::DATETIME2,
+            self::DECIMAL,
+            self::FLOAT,
+            self::INT,
+            self::MONEY,
+            self::NCHAR,
+            self::NVARCHAR,
+            self::TIME,
+            self::VARBINARY,
+            self::VARCHAR,
+        ],
+    ];
+
+    /**
+     * Returns an array of supported data types for a specific database engine.
+     * 
+     * @param string $engine The database engine name (e.g., 'mysql', 'mssql')
+     * @return array Array of supported data type constants, or empty array if engine is not supported
+     */
+    public static function getSupportedDataTypes(string $engine): array {
+        return self::$EngineTypes[strtolower($engine)] ?? [];
+    }
 
     /**
      * Maps database data type to PHP type.
@@ -261,14 +271,4 @@ public static function toPHPType(string $dbType): string {
             default => 'string'
         };
     }
-
-    /**
-     * Returns an array of supported data types for a specific database engine.
-     * 
-     * @param string $engine The database engine name (e.g., 'mysql', 'mssql')
-     * @return array Array of supported data type constants, or empty array if engine is not supported
-     */
-    public static function getSupportedDataTypes(string $engine): array {
-        return self::$EngineTypes[strtolower($engine)] ?? [];
-    }
 }

From 3eec2458b45695af3b95d0667b29f8aa7511c806 Mon Sep 17 00:00:00 2001
From: Ibrahim BinAlshikh <ibinshikh@hotmail.com>
Date: Wed, 11 Feb 2026 00:18:29 +0300
Subject: [PATCH 3/3] chore: Run CS Fixer

---
 WebFiori/Database/AbstractQuery.php           |  17 +-
 .../Attributes/AttributeTableBuilder.php      |  26 +-
 WebFiori/Database/Attributes/ForeignKey.php   |   1 +
 WebFiori/Database/Attributes/HasMany.php      |   3 +-
 WebFiori/Database/Entity/EntityGenerator.php  |   2 +-
 WebFiori/Database/MsSql/MSSQLQuery.php        |  15 +-
 .../Repository/AbstractRepository.php         | 553 +++++++++---------
 WebFiori/Database/Repository/Relation.php     |   2 +-
 .../Schema/SchemaChangeRepository.php         |   1 +
 WebFiori/Database/Schema/SchemaRunner.php     |   1 -
 examples/01-basic-connection/example.php      |   7 +-
 examples/02-basic-queries/example.php         |   8 +-
 examples/03-table-blueprints/example.php      |   4 +-
 examples/04-entity-mapping/example.php        |  13 +-
 examples/05-transactions/example.php          |  21 +-
 examples/06-migrations/example.php            |  10 +-
 examples/07-seeders/example.php               |  10 +-
 .../08-performance-monitoring/example.php     |   7 +-
 examples/09-multi-result-queries/example.php  |  14 +-
 .../10-attribute-based-tables/Article.php     |  11 +-
 examples/10-attribute-based-tables/Author.php |  11 +-
 .../10-attribute-based-tables/example.php     |   7 +-
 examples/11-repository-pattern/Product.php    |   2 +-
 .../ProductRepository.php                     |  52 +-
 examples/11-repository-pattern/example.php    |  12 +-
 .../12-clean-architecture/Domain/User.php     |   4 +-
 .../Repository/MySQLUserRepository.php        |  42 +-
 .../Repository/UserRepository.php             |  37 +-
 .../Infrastructure/Schema/UserTable.php       |   1 -
 examples/12-clean-architecture/example.php    |   8 +-
 examples/13-pagination/User.php               |   4 +-
 examples/13-pagination/UserRepository.php     |  22 +-
 examples/13-pagination/example.php            |  18 +-
 examples/14-active-record-model/Article.php   |  50 +-
 examples/14-active-record-model/example.php   |   9 +-
 examples/15-eager-loading/Author.php          |   1 +
 .../15-eager-loading/AuthorRepository.php     |  19 +-
 examples/15-eager-loading/Comment.php         |   4 +-
 .../15-eager-loading/CommentRepository.php    |  20 +-
 examples/15-eager-loading/CommentsTable.php   |   5 +-
 examples/15-eager-loading/Post.php            |   7 +-
 examples/15-eager-loading/PostRepository.php  |  21 +-
 examples/15-eager-loading/PostsTable.php      |   7 +-
 examples/15-eager-loading/example.php         |  25 +-
 .../Tests/Database/Common/ConditionTest.php   | 142 ++---
 .../Database/Common/EntityMapperTest.php      | 338 +++++------
 .../Tests/Database/Common/ExpressionTest.php  | 362 ++++++------
 .../Tests/Database/Common/HelloTable.php      |  38 +-
 .../Database/Common/RecordMapperTest.php      | 172 +++---
 .../Database/Schema/SchemaAdvancedTest.php    | 278 ++++-----
 .../Database/Schema/SchemaDependencyTest.php  | 452 +++++++-------
 .../Schema/SchemaErrorHandlingTest.php        | 474 +++++++--------
 .../Database/Schema/SchemaIntegrationTest.php | 116 ++--
 .../Database/Schema/SchemaTrackingTest.php    | 236 ++++----
 .../Tests/Database/Schema/TestMigration2.php  |  70 +--
 .../Tests/Database/Schema/TestMigration3.php  |  46 +-
 .../Tests/Database/Schema/TestSeeder.php      |  68 +--
 57 files changed, 1994 insertions(+), 1912 deletions(-)

diff --git a/WebFiori/Database/AbstractQuery.php b/WebFiori/Database/AbstractQuery.php
index e1d21e2c..fee6cdfc 100644
--- a/WebFiori/Database/AbstractQuery.php
+++ b/WebFiori/Database/AbstractQuery.php
@@ -264,14 +264,6 @@ public function drop(bool $ifExists = false) {
 
         return $this;
     }
-
-    /**
-     * Builds the DROP TABLE query. Override in subclasses for DBMS-specific syntax.
-     */
-    protected function buildDropQuery(string $tableName, bool $ifExists): string {
-        $ifExistsStr = $ifExists ? 'if exists ' : '';
-        return 'drop table ' . $ifExistsStr . $tableName . ';';
-    }
     /**
      * Constructs a query which can be used to drop a column from associated 
      * table.
@@ -1502,6 +1494,15 @@ private function getColsToSelect() {
 
         return $columnsToSelect;
     }
+
+    /**
+     * Builds the DROP TABLE query. Override in subclasses for DBMS-specific syntax.
+     */
+    protected function buildDropQuery(string $tableName, bool $ifExists): string {
+        $ifExistsStr = $ifExists ? 'if exists ' : '';
+
+        return 'drop table '.$ifExistsStr.$tableName.';';
+    }
     protected function getColType($phpVar) {
         $type = gettype($phpVar);
 
diff --git a/WebFiori/Database/Attributes/AttributeTableBuilder.php b/WebFiori/Database/Attributes/AttributeTableBuilder.php
index fc8920b4..a66e29a1 100644
--- a/WebFiori/Database/Attributes/AttributeTableBuilder.php
+++ b/WebFiori/Database/Attributes/AttributeTableBuilder.php
@@ -12,6 +12,7 @@ public static function build(string $entityClass, string $dbType = 'mysql'): Tab
         $reflection = new ReflectionClass($entityClass);
 
         $tableAttr = $reflection->getAttributes(Table::class)[0] ?? null;
+
         if (!$tableAttr) {
             throw new InvalidAttributeException("Class $entityClass must have #[Table] attribute");
         }
@@ -35,6 +36,7 @@ public static function build(string $entityClass, string $dbType = 'mysql'): Tab
         } else {
             foreach ($reflection->getProperties() as $property) {
                 $columnAttrs = $property->getAttributes(Column::class);
+
                 if (empty($columnAttrs)) {
                     continue;
                 }
@@ -116,17 +118,6 @@ private static function addPropertyForeignKey(TableClass $table, string $localCo
         );
     }
 
-    private static function resolveTableName(string $tableOrClass): string {
-        if (class_exists($tableOrClass)) {
-            $reflection = new ReflectionClass($tableOrClass);
-            $tableAttr = $reflection->getAttributes(Table::class)[0] ?? null;
-            if ($tableAttr) {
-                return $tableAttr->newInstance()->name;
-            }
-        }
-        return $tableOrClass;
-    }
-
     private static function columnConfigToArray(Column $config): array {
         return [
             ColOption::TYPE => $config->type,
@@ -148,4 +139,17 @@ private static function columnConfigToArray(Column $config): array {
     private static function propertyToKey(string $propertyName): string {
         return strtolower(preg_replace('/([a-z])([A-Z])/', '$1-$2', $propertyName));
     }
+
+    private static function resolveTableName(string $tableOrClass): string {
+        if (class_exists($tableOrClass)) {
+            $reflection = new ReflectionClass($tableOrClass);
+            $tableAttr = $reflection->getAttributes(Table::class)[0] ?? null;
+
+            if ($tableAttr) {
+                return $tableAttr->newInstance()->name;
+            }
+        }
+
+        return $tableOrClass;
+    }
 }
diff --git a/WebFiori/Database/Attributes/ForeignKey.php b/WebFiori/Database/Attributes/ForeignKey.php
index 66a81c13..fdcc968c 100644
--- a/WebFiori/Database/Attributes/ForeignKey.php
+++ b/WebFiori/Database/Attributes/ForeignKey.php
@@ -32,6 +32,7 @@ public function getColumnsMap(): array {
         if ($this->column !== null) {
             return [$this->column];
         }
+
         return $this->columns;
     }
 }
diff --git a/WebFiori/Database/Attributes/HasMany.php b/WebFiori/Database/Attributes/HasMany.php
index 4b911939..917d6a62 100644
--- a/WebFiori/Database/Attributes/HasMany.php
+++ b/WebFiori/Database/Attributes/HasMany.php
@@ -14,5 +14,6 @@ public function __construct(
         public string $property,
         public ?string $localKey = null,
         public ?string $table = null
-    ) {}
+    ) {
+    }
 }
diff --git a/WebFiori/Database/Entity/EntityGenerator.php b/WebFiori/Database/Entity/EntityGenerator.php
index ece65f11..503b3def 100644
--- a/WebFiori/Database/Entity/EntityGenerator.php
+++ b/WebFiori/Database/Entity/EntityGenerator.php
@@ -159,7 +159,7 @@ private function getDefault(Column $col): string {
 
         if ($default !== null) {
             return match ($phpType) {
-                'string' => " = '" . addslashes($default) . "'",
+                'string' => " = '".addslashes($default)."'",
                 'int', 'float' => " = {$default}",
                 'bool' => $default ? ' = true' : ' = false',
                 default => ''
diff --git a/WebFiori/Database/MsSql/MSSQLQuery.php b/WebFiori/Database/MsSql/MSSQLQuery.php
index d1554de8..a183e9ec 100644
--- a/WebFiori/Database/MsSql/MSSQLQuery.php
+++ b/WebFiori/Database/MsSql/MSSQLQuery.php
@@ -27,13 +27,6 @@ public function __construct() {
         $this->bindings = [];
     }
 
-    protected function buildDropQuery(string $tableName, bool $ifExists): string {
-        if ($ifExists) {
-            return "if object_id('{$tableName}', 'U') is not null drop table {$tableName};";
-        }
-        return "drop table {$tableName};";
-    }
-
     public function addBinding(Column $col, $value) {
         $this->bindings[] = $value;
     }
@@ -420,4 +413,12 @@ private function insertHelper(array $colsKeysArr, array $valuesToInsert) {
             'vals' => implode(', ', $valsArr)
         ];
     }
+
+    protected function buildDropQuery(string $tableName, bool $ifExists): string {
+        if ($ifExists) {
+            return "if object_id('{$tableName}', 'U') is not null drop table {$tableName};";
+        }
+
+        return "drop table {$tableName};";
+    }
 }
diff --git a/WebFiori/Database/Repository/AbstractRepository.php b/WebFiori/Database/Repository/AbstractRepository.php
index 8035b665..4b70d5c0 100644
--- a/WebFiori/Database/Repository/AbstractRepository.php
+++ b/WebFiori/Database/Repository/AbstractRepository.php
@@ -35,51 +35,6 @@ public function __construct(Database $db) {
         $this->db = $db;
     }
 
-    /**
-     * Specify relationships to eager load.
-     * 
-     * @param string|array $relations Relationship name(s) to load.
-     * 
-     * @return static Clone with eager loading configured.
-     */
-    public function with(string|array $relations): static {
-        $clone = clone $this;
-        $clone->eagerLoad = is_array($relations) ? $relations : [$relations];
-        return $clone;
-    }
-
-    /**
-     * Specify belongsTo relationships to load via JOIN.
-     * 
-     * Only works with belongsTo relationships (N:1). Throws exception
-     * if used with hasMany to prevent cartesian product issues.
-     * 
-     * @param string|array $relations Relationship name(s) to load via JOIN.
-     * 
-     * @return static Clone with JOIN loading configured.
-     * 
-     * @throws RepositoryException If relation is hasMany.
-     */
-    public function withJoin(string|array $relations): static {
-        $relations = is_array($relations) ? $relations : [$relations];
-        $relationships = $this->discoverRelationships();
-
-        foreach ($relations as $relation) {
-            if (!isset($relationships[$relation])) {
-                throw new RepositoryException("Unknown relationship: {$relation}");
-            }
-            if ($relationships[$relation]['type'] === Relation::HAS_MANY) {
-                throw new RepositoryException(
-                    "Cannot use withJoin() for hasMany relation '{$relation}'. Use with() instead to avoid cartesian product."
-                );
-            }
-        }
-
-        $clone = clone $this;
-        $clone->joinLoad = $relations;
-        return $clone;
-    }
-
     /**
      * Returns the total number of records in the table.
      * 
@@ -113,6 +68,7 @@ public function deleteAll(): void {
      */
     public function deleteById(mixed $id = null): void {
         $id = $id ?? $this->getEntityId();
+
         if ($id === null) {
             throw new RepositoryException('Cannot delete: no ID provided');
         }
@@ -137,6 +93,7 @@ public function findAll(): array {
             ->execute();
 
         $entities = array_map(fn($row) => $this->toEntity($row), $result->fetchAll());
+
         return $this->loadRelations($entities);
     }
 
@@ -151,6 +108,7 @@ public function findAll(): array {
      */
     public function findById(mixed $id = null): ?object {
         $id = $id ?? $this->getEntityId();
+
         if ($id === null) {
             throw new RepositoryException('Cannot find: no ID provided');
         }
@@ -170,37 +128,8 @@ public function findById(mixed $id = null): ?object {
 
         $entities = [$this->toEntity($result->fetch())];
         $loaded = $this->loadRelations($entities);
-        return $loaded[0];
-    }
-
-    /**
-     * Reloads $this or the given entity from the database.
-     * 
-     * @param T|null $entity The entity to reload, or null to reload $this.
-     * 
-     * @return T|null Fresh entity from database, or null if not found.
-     * 
-     * @throws RepositoryException If no entity provided and $this has no ID.
-     */
-    public function reload(?object $entity = null): ?object {
-        if ($entity === null) {
-            return $this->findById();
-        }
-        $id = $this->toArray($entity)[$this->getIdField()] ?? null;
-        return $this->findById($id);
-    }
 
-    /**
-     * Gets the ID value from $this if it has entity properties.
-     * 
-     * @return mixed The ID value or null.
-     */
-    private function getEntityId(): mixed {
-        $idField = $this->getIdField();
-        if (property_exists($this, $idField)) {
-            return $this->$idField;
-        }
-        return null;
+        return $loaded[0];
     }
 
     /**
@@ -284,6 +213,24 @@ public function paginateByCursor(
         return new CursorPage($items, $nextCursor, null, $hasMore);
     }
 
+    /**
+     * Reloads $this or the given entity from the database.
+     * 
+     * @param T|null $entity The entity to reload, or null to reload $this.
+     * 
+     * @return T|null Fresh entity from database, or null if not found.
+     * 
+     * @throws RepositoryException If no entity provided and $this has no ID.
+     */
+    public function reload(?object $entity = null): ?object {
+        if ($entity === null) {
+            return $this->findById();
+        }
+        $id = $this->toArray($entity)[$this->getIdField()] ?? null;
+
+        return $this->findById($id);
+    }
+
     /**
      * Saves an entity (insert if new, update if existing).
      * 
@@ -332,6 +279,7 @@ public function saveAll(array $entities): void {
 
         foreach ($entities as $entity) {
             $data = $this->toArray($entity);
+
             if (($data[$idField] ?? null) === null) {
                 unset($data[$idField]);
                 $newEntities[] = $data;
@@ -340,7 +288,8 @@ public function saveAll(array $entities): void {
             }
         }
 
-        $this->db->transaction(function (Database $db) use ($newEntities, $existingEntities, $idField) {
+        $this->db->transaction(function (Database $db) use ($newEntities, $existingEntities, $idField)
+        {
             if (!empty($newEntities)) {
                 $db->table($this->getTableName())->insert([
                     'cols' => array_keys($newEntities[0]),
@@ -360,92 +309,79 @@ public function saveAll(array $entities): void {
     }
 
     /**
-     * Creates a select query for the repository's table.
+     * Specify relationships to eager load.
      * 
-     * @return AbstractQuery Query builder instance.
-     */
-    protected function createQuery(): AbstractQuery {
-        return $this->db->table($this->getTableName())->select();
-    }
-
-    /**
-     * Returns the underlying database instance.
+     * @param string|array $relations Relationship name(s) to load.
      * 
-     * @return Database The database connection.
+     * @return static Clone with eager loading configured.
      */
-    protected function getDatabase(): Database {
-        return $this->db;
-    }
+    public function with(string|array $relations): static {
+        $clone = clone $this;
+        $clone->eagerLoad = is_array($relations) ? $relations : [$relations];
 
-    /**
-     * Returns the table definition class for relationship discovery.
-     * Override this to use a separate table class (clean architecture).
-     * 
-     * @return string|null Table class name or null to use $this.
-     */
-    protected function getTableClass(): ?string {
-        return null;
+        return $clone;
     }
 
     /**
-     * Returns the name of the ID/primary key field.
+     * Specify belongsTo relationships to load via JOIN.
      * 
-     * @return string Column name of the primary key.
-     */
-    abstract protected function getIdField(): string;
-
-    /**
-     * Returns the database table name for this repository.
+     * Only works with belongsTo relationships (N:1). Throws exception
+     * if used with hasMany to prevent cartesian product issues.
      * 
-     * @return string Table name.
-     */
-    abstract protected function getTableName(): string;
-
-    /**
-     * Converts an entity to an associative array for database operations.
+     * @param string|array $relations Relationship name(s) to load via JOIN.
      * 
-     * @param T $entity The entity to convert.
+     * @return static Clone with JOIN loading configured.
      * 
-     * @return array Associative array with column names as keys.
+     * @throws RepositoryException If relation is hasMany.
      */
-    abstract protected function toArray(object $entity): array;
+    public function withJoin(string|array $relations): static {
+        $relations = is_array($relations) ? $relations : [$relations];
+        $relationships = $this->discoverRelationships();
 
-    /**
-     * Converts a database row to an entity object.
-     * 
-     * @param array $row Associative array from database.
-     * 
-     * @return T The mapped entity.
-     */
-    abstract protected function toEntity(array $row): object;
+        foreach ($relations as $relation) {
+            if (!isset($relationships[$relation])) {
+                throw new RepositoryException("Unknown relationship: {$relation}");
+            }
+
+            if ($relationships[$relation]['type'] === Relation::HAS_MANY) {
+                throw new RepositoryException(
+                    "Cannot use withJoin() for hasMany relation '{$relation}'. Use with() instead to avoid cartesian product."
+                );
+            }
+        }
+
+        $clone = clone $this;
+        $clone->joinLoad = $relations;
+
+        return $clone;
+    }
 
     /**
-     * Creates a related entity instance from row data using reflection.
+     * Build query with LEFT JOINs for belongsTo relations.
      */
-    private function createRelatedEntity(array $config, array $row): object {
-        $entityClass = $config['entity'] ?? null;
+    private function buildJoinQuery(array $relationships): AbstractQuery {
+        $this->db->clear();
+        $query = $this->db->table($this->getTableName());
 
-        if ($entityClass === null || !class_exists($entityClass)) {
-            return (object) $row;
-        }
+        foreach ($this->joinLoad as $relation) {
+            $config = $relationships[$relation];
+            $relatedTable = $this->db->getTable($config['table']);
 
-        $entity = new $entityClass();
-        $ref = new ReflectionClass($entity);
+            // Select related columns with aliases to avoid duplicates
+            $cols = [];
 
-        foreach ($row as $key => $value) {
-            $propName = $this->toCamelCase($key);
-            if ($ref->hasProperty($propName)) {
-                $prop = $ref->getProperty($propName);
-                $prop->setAccessible(true);
-                $prop->setValue($entity, $this->castValue($prop, $value));
-            } elseif ($ref->hasProperty($key)) {
-                $prop = $ref->getProperty($key);
-                $prop->setAccessible(true);
-                $prop->setValue($entity, $this->castValue($prop, $value));
+            if ($relatedTable !== null) {
+                foreach ($relatedTable->getColsKeys() as $colKey) {
+                    $cols[$colKey] = ['as' => $relation.'_'.$colKey];
+                }
             }
+
+            $query = $query->leftJoin(
+                $this->db->table($config['table'])->select($cols)
+            )->on($config['foreignKey'], $config['ownerKey'] ?? 'id');
         }
 
-        return $entity;
+        return $query->select();
     }
 
     /**
@@ -457,6 +393,7 @@ private function castValue(\ReflectionProperty $prop, mixed $value): mixed {
         }
 
         $type = $prop->getType();
+
         if ($type instanceof \ReflectionNamedType) {
             return match ($type->getName()) {
                 'int' => (int) $value,
@@ -471,41 +408,97 @@ private function castValue(\ReflectionProperty $prop, mixed $value): mixed {
     }
 
     /**
-     * Load eager-loaded relationships onto entities.
+     * Creates a related entity instance from row data using reflection.
      */
-    private function loadRelations(array $entities): array {
-        if (empty($this->eagerLoad) || empty($entities)) {
-            return $entities;
-        }
+    private function createRelatedEntity(array $config, array $row): object {
+        $entityClass = $config['entity'] ?? null;
 
-        $relationships = $this->discoverRelationships();
+        if ($entityClass === null || !class_exists($entityClass)) {
+            return (object) $row;
+        }
 
-        foreach ($this->eagerLoad as $relation) {
-            if (!isset($relationships[$relation])) {
-                throw new RepositoryException("Unknown relationship: {$relation}");
-            }
+        $entity = new $entityClass();
+        $ref = new ReflectionClass($entity);
 
-            $config = $relationships[$relation];
+        foreach ($row as $key => $value) {
+            $propName = $this->toCamelCase($key);
 
-            if ($config['type'] === Relation::HAS_MANY) {
-                $this->loadHasMany($entities, $config);
-            } elseif ($config['type'] === Relation::BELONGS_TO) {
-                $this->loadBelongsTo($entities, $config);
+            if ($ref->hasProperty($propName)) {
+                $prop = $ref->getProperty($propName);
+                $prop->setAccessible(true);
+                $prop->setValue($entity, $this->castValue($prop, $value));
+            } elseif ($ref->hasProperty($key)) {
+                $prop = $ref->getProperty($key);
+                $prop->setAccessible(true);
+                $prop->setValue($entity, $this->castValue($prop, $value));
             }
         }
 
-        return $entities;
+        return $entity;
     }
 
     /**
-     * Execute findAll with JOIN for belongsTo relations (single query).
+     * Discover relationships from table class attributes.
      */
-    private function findAllWithJoin(): array {
-        $relationships = $this->discoverRelationships();
-        $query = $this->buildJoinQuery($relationships);
-        $rows = $query->execute()->fetchAll();
-
-        return $this->hydrateJoinedRows($rows, $this->joinLoad, $relationships);
+    private function discoverRelationships(): array {
+        if ($this->relationships !== null) {
+            return $this->relationships;
+        }
+
+        $this->relationships = [];
+        $tableClass = $this->getTableClass() ?? static::class;
+
+        if (!class_exists($tableClass)) {
+            return $this->relationships;
+        }
+
+        $reflection = new ReflectionClass($tableClass);
+
+        // Discover HasMany (class-level)
+        foreach ($reflection->getAttributes(HasMany::class) as $attr) {
+            $hasMany = $attr->newInstance();
+            $table = $hasMany->table ?? $this->resolveTableName($hasMany->entity);
+            $this->relationships[$hasMany->property] = [
+                'type' => Relation::HAS_MANY,
+                'table' => $table,
+                'foreignKey' => $hasMany->foreignKey,
+                'localKey' => $hasMany->localKey,
+                'property' => $hasMany->property,
+                'entity' => $hasMany->entity
+            ];
+        }
+
+        // Discover BelongsTo (ForeignKey with property)
+        foreach ($reflection->getProperties() as $prop) {
+            foreach ($prop->getAttributes(ForeignKey::class) as $attr) {
+                $fk = $attr->newInstance();
+
+                if ($fk->property !== null) {
+                    $table = $this->resolveTableName($fk->table);
+                    $this->relationships[$fk->property] = [
+                        'type' => Relation::BELONGS_TO,
+                        'table' => $table,
+                        'foreignKey' => $this->propertyToKey($prop->getName()),
+                        'ownerKey' => $fk->column,
+                        'property' => $fk->property,
+                        'entity' => $fk->entity
+                    ];
+                }
+            }
+        }
+
+        return $this->relationships;
+    }
+
+    /**
+     * Execute findAll with JOIN for belongsTo relations (single query).
+     */
+    private function findAllWithJoin(): array {
+        $relationships = $this->discoverRelationships();
+        $query = $this->buildJoinQuery($relationships);
+        $rows = $query->execute()->fetchAll();
+
+        return $this->hydrateJoinedRows($rows, $this->joinLoad, $relationships);
     }
 
     /**
@@ -522,34 +515,37 @@ private function findByIdWithJoin(mixed $id): ?object {
         }
 
         $entities = $this->hydrateJoinedRows($rows, $this->joinLoad, $relationships);
+
         return $entities[0] ?? null;
     }
 
     /**
-     * Build query with LEFT JOINs for belongsTo relations.
+     * Gets the ID value from $this if it has entity properties.
+     * 
+     * @return mixed The ID value or null.
      */
-    private function buildJoinQuery(array $relationships): AbstractQuery {
-        $this->db->clear();
-        $query = $this->db->table($this->getTableName());
+    private function getEntityId(): mixed {
+        $idField = $this->getIdField();
 
-        foreach ($this->joinLoad as $relation) {
-            $config = $relationships[$relation];
-            $relatedTable = $this->db->getTable($config['table']);
+        if (property_exists($this, $idField)) {
+            return $this->$idField;
+        }
 
-            // Select related columns with aliases to avoid duplicates
-            $cols = [];
-            if ($relatedTable !== null) {
-                foreach ($relatedTable->getColsKeys() as $colKey) {
-                    $cols[$colKey] = ['as' => $relation . '_' . $colKey];
-                }
-            }
+        return null;
+    }
 
-            $query = $query->leftJoin(
-                $this->db->table($config['table'])->select($cols)
-            )->on($config['foreignKey'], $config['ownerKey'] ?? 'id');
+    private function getPropertyValue(object $entity, string $property): mixed {
+        $camel = $this->toCamelCase($property);
+
+        if (property_exists($entity, $camel)) {
+            return $entity->$camel;
         }
 
-        return $query->select();
+        if (property_exists($entity, $property)) {
+            return $entity->$property;
+        }
+
+        return null;
     }
 
     /**
@@ -563,10 +559,11 @@ private function hydrateJoinedRows(array $rows, array $joinRelations, array $rel
 
             foreach ($joinRelations as $relation) {
                 $config = $relationships[$relation];
-                $prefix = $relation . '_';
+                $prefix = $relation.'_';
 
                 // Extract prefixed columns for this relation
                 $relatedData = [];
+
                 foreach ($row as $key => $value) {
                     if (str_starts_with($key, $prefix)) {
                         $relatedData[substr($key, strlen($prefix))] = $value;
@@ -592,14 +589,16 @@ private function hydrateJoinedRows(array $rows, array $joinRelations, array $rel
     }
 
     /**
-     * Load hasMany relationship (1+1 queries - preload strategy).
+     * Load belongsTo relationship (1+1 queries - smart strategy).
      */
-    private function loadHasMany(array &$entities, array $config): void {
-        $localKey = $config['localKey'] ?? $this->getIdField();
+    private function loadBelongsTo(array &$entities, array $config): void {
+        $foreignKey = $config['foreignKey'];
+        $ownerKey = $config['ownerKey'] ?? 'id';
         $ids = [];
 
         foreach ($entities as $entity) {
-            $id = $this->getPropertyValue($entity, $localKey);
+            $id = $this->getPropertyValue($entity, $foreignKey);
+
             if ($id !== null) {
                 $ids[] = $id;
             }
@@ -609,37 +608,39 @@ private function loadHasMany(array &$entities, array $config): void {
             return;
         }
 
-        $fkColumn = $config['foreignKey'];
+        $ownerColumn = $ownerKey;
         $related = $this->db->table($config['table'])
             ->select()
-            ->whereIn($fkColumn, array_unique($ids))
+            ->whereIn($ownerColumn, array_unique($ids))
             ->execute()
             ->fetchAll();
 
-        $grouped = [];
+        $indexed = [];
+
         foreach ($related as $row) {
-            $fkValue = $row[$fkColumn] ?? $row[str_replace('-', '_', $fkColumn)] ?? null;
-            if ($fkValue !== null) {
-                $grouped[$fkValue][] = $this->createRelatedEntity($config, $row);
+            $keyValue = $row[$ownerColumn] ?? $row[str_replace('-', '_', $ownerColumn)] ?? null;
+
+            if ($keyValue !== null) {
+                $indexed[$keyValue] = $this->createRelatedEntity($config, $row);
             }
         }
 
         foreach ($entities as $entity) {
-            $id = $this->getPropertyValue($entity, $localKey);
-            $this->setPropertyValue($entity, $config['property'], $grouped[$id] ?? []);
+            $fkValue = $this->getPropertyValue($entity, $foreignKey);
+            $this->setPropertyValue($entity, $config['property'], $indexed[$fkValue] ?? null);
         }
     }
 
     /**
-     * Load belongsTo relationship (1+1 queries - smart strategy).
+     * Load hasMany relationship (1+1 queries - preload strategy).
      */
-    private function loadBelongsTo(array &$entities, array $config): void {
-        $foreignKey = $config['foreignKey'];
-        $ownerKey = $config['ownerKey'] ?? 'id';
+    private function loadHasMany(array &$entities, array $config): void {
+        $localKey = $config['localKey'] ?? $this->getIdField();
         $ids = [];
 
         foreach ($entities as $entity) {
-            $id = $this->getPropertyValue($entity, $foreignKey);
+            $id = $this->getPropertyValue($entity, $localKey);
+
             if ($id !== null) {
                 $ids[] = $id;
             }
@@ -649,77 +650,58 @@ private function loadBelongsTo(array &$entities, array $config): void {
             return;
         }
 
-        $ownerColumn = $ownerKey;
+        $fkColumn = $config['foreignKey'];
         $related = $this->db->table($config['table'])
             ->select()
-            ->whereIn($ownerColumn, array_unique($ids))
+            ->whereIn($fkColumn, array_unique($ids))
             ->execute()
             ->fetchAll();
 
-        $indexed = [];
+        $grouped = [];
+
         foreach ($related as $row) {
-            $keyValue = $row[$ownerColumn] ?? $row[str_replace('-', '_', $ownerColumn)] ?? null;
-            if ($keyValue !== null) {
-                $indexed[$keyValue] = $this->createRelatedEntity($config, $row);
+            $fkValue = $row[$fkColumn] ?? $row[str_replace('-', '_', $fkColumn)] ?? null;
+
+            if ($fkValue !== null) {
+                $grouped[$fkValue][] = $this->createRelatedEntity($config, $row);
             }
         }
 
         foreach ($entities as $entity) {
-            $fkValue = $this->getPropertyValue($entity, $foreignKey);
-            $this->setPropertyValue($entity, $config['property'], $indexed[$fkValue] ?? null);
+            $id = $this->getPropertyValue($entity, $localKey);
+            $this->setPropertyValue($entity, $config['property'], $grouped[$id] ?? []);
         }
     }
 
     /**
-     * Discover relationships from table class attributes.
+     * Load eager-loaded relationships onto entities.
      */
-    private function discoverRelationships(): array {
-        if ($this->relationships !== null) {
-            return $this->relationships;
+    private function loadRelations(array $entities): array {
+        if (empty($this->eagerLoad) || empty($entities)) {
+            return $entities;
         }
 
-        $this->relationships = [];
-        $tableClass = $this->getTableClass() ?? static::class;
-
-        if (!class_exists($tableClass)) {
-            return $this->relationships;
-        }
+        $relationships = $this->discoverRelationships();
 
-        $reflection = new ReflectionClass($tableClass);
+        foreach ($this->eagerLoad as $relation) {
+            if (!isset($relationships[$relation])) {
+                throw new RepositoryException("Unknown relationship: {$relation}");
+            }
 
-        // Discover HasMany (class-level)
-        foreach ($reflection->getAttributes(HasMany::class) as $attr) {
-            $hasMany = $attr->newInstance();
-            $table = $hasMany->table ?? $this->resolveTableName($hasMany->entity);
-            $this->relationships[$hasMany->property] = [
-                'type' => Relation::HAS_MANY,
-                'table' => $table,
-                'foreignKey' => $hasMany->foreignKey,
-                'localKey' => $hasMany->localKey,
-                'property' => $hasMany->property,
-                'entity' => $hasMany->entity
-            ];
-        }
+            $config = $relationships[$relation];
 
-        // Discover BelongsTo (ForeignKey with property)
-        foreach ($reflection->getProperties() as $prop) {
-            foreach ($prop->getAttributes(ForeignKey::class) as $attr) {
-                $fk = $attr->newInstance();
-                if ($fk->property !== null) {
-                    $table = $this->resolveTableName($fk->table);
-                    $this->relationships[$fk->property] = [
-                        'type' => Relation::BELONGS_TO,
-                        'table' => $table,
-                        'foreignKey' => $this->propertyToKey($prop->getName()),
-                        'ownerKey' => $fk->column,
-                        'property' => $fk->property,
-                        'entity' => $fk->entity
-                    ];
-                }
+            if ($config['type'] === Relation::HAS_MANY) {
+                $this->loadHasMany($entities, $config);
+            } elseif ($config['type'] === Relation::BELONGS_TO) {
+                $this->loadBelongsTo($entities, $config);
             }
         }
 
-        return $this->relationships;
+        return $entities;
+    }
+
+    private function propertyToKey(string $name): string {
+        return strtolower(preg_replace('/([a-z])([A-Z])/', '$1-$2', $name));
     }
 
     /**
@@ -729,26 +711,13 @@ private function resolveTableName(string $classOrTable): string {
         if (class_exists($classOrTable)) {
             $ref = new ReflectionClass($classOrTable);
             $attrs = $ref->getAttributes(Table::class);
+
             if (!empty($attrs)) {
                 return $attrs[0]->newInstance()->name;
             }
         }
-        return $classOrTable;
-    }
 
-    private function propertyToKey(string $name): string {
-        return strtolower(preg_replace('/([a-z])([A-Z])/', '$1-$2', $name));
-    }
-
-    private function getPropertyValue(object $entity, string $property): mixed {
-        $camel = $this->toCamelCase($property);
-        if (property_exists($entity, $camel)) {
-            return $entity->$camel;
-        }
-        if (property_exists($entity, $property)) {
-            return $entity->$property;
-        }
-        return null;
+        return $classOrTable;
     }
 
     private function setPropertyValue(object $entity, string $property, mixed $value): void {
@@ -758,4 +727,64 @@ private function setPropertyValue(object $entity, string $property, mixed $value
     private function toCamelCase(string $key): string {
         return lcfirst(str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key))));
     }
+
+    /**
+     * Creates a select query for the repository's table.
+     * 
+     * @return AbstractQuery Query builder instance.
+     */
+    protected function createQuery(): AbstractQuery {
+        return $this->db->table($this->getTableName())->select();
+    }
+
+    /**
+     * Returns the underlying database instance.
+     * 
+     * @return Database The database connection.
+     */
+    protected function getDatabase(): Database {
+        return $this->db;
+    }
+
+    /**
+     * Returns the name of the ID/primary key field.
+     * 
+     * @return string Column name of the primary key.
+     */
+    abstract protected function getIdField(): string;
+
+    /**
+     * Returns the table definition class for relationship discovery.
+     * Override this to use a separate table class (clean architecture).
+     * 
+     * @return string|null Table class name or null to use $this.
+     */
+    protected function getTableClass(): ?string {
+        return null;
+    }
+
+    /**
+     * Returns the database table name for this repository.
+     * 
+     * @return string Table name.
+     */
+    abstract protected function getTableName(): string;
+
+    /**
+     * Converts an entity to an associative array for database operations.
+     * 
+     * @param T $entity The entity to convert.
+     * 
+     * @return array Associative array with column names as keys.
+     */
+    abstract protected function toArray(object $entity): array;
+
+    /**
+     * Converts a database row to an entity object.
+     * 
+     * @param array $row Associative array from database.
+     * 
+     * @return T The mapped entity.
+     */
+    abstract protected function toEntity(array $row): object;
 }
diff --git a/WebFiori/Database/Repository/Relation.php b/WebFiori/Database/Repository/Relation.php
index cecef8a9..cf6a8982 100644
--- a/WebFiori/Database/Repository/Relation.php
+++ b/WebFiori/Database/Repository/Relation.php
@@ -5,6 +5,6 @@
  * Relationship type constants.
  */
 class Relation {
-    public const HAS_MANY = 'hasMany';
     public const BELONGS_TO = 'belongsTo';
+    public const HAS_MANY = 'hasMany';
 }
diff --git a/WebFiori/Database/Schema/SchemaChangeRepository.php b/WebFiori/Database/Schema/SchemaChangeRepository.php
index 3e6370a5..cfb526ee 100644
--- a/WebFiori/Database/Schema/SchemaChangeRepository.php
+++ b/WebFiori/Database/Schema/SchemaChangeRepository.php
@@ -42,6 +42,7 @@ public function __construct(Database $database) {
     public function clearAll(): int {
         $count = $this->count();
         $this->deleteAll();
+
         return $count;
     }
 
diff --git a/WebFiori/Database/Schema/SchemaRunner.php b/WebFiori/Database/Schema/SchemaRunner.php
index 3d940dd9..883d7234 100644
--- a/WebFiori/Database/Schema/SchemaRunner.php
+++ b/WebFiori/Database/Schema/SchemaRunner.php
@@ -12,7 +12,6 @@
 namespace WebFiori\Database\Schema;
 
 use Error;
-use Exception;
 use ReflectionClass;
 use WebFiori\Database\Attributes\AttributeTableBuilder;
 use WebFiori\Database\ConnectionInfo;
diff --git a/examples/01-basic-connection/example.php b/examples/01-basic-connection/example.php
index 45f0836e..e2586dd7 100644
--- a/examples/01-basic-connection/example.php
+++ b/examples/01-basic-connection/example.php
@@ -45,30 +45,33 @@
     echo "4. Additional Connection Info:\n";
 
     $result = $database->raw("SELECT DATABASE() as current_db")->execute();
+
     if ($result && $result->getRowsCount() > 0) {
         echo "   ✓ Current database: ".$result->getRows()[0]['current_db']."\n";
     }
 
     $result = $database->raw("SHOW STATUS LIKE 'Uptime'")->execute();
+
     if ($result && $result->getRowsCount() > 0) {
         $uptime = $result->getRows()[0]['Value'];
         echo "   ✓ Server uptime: ".$uptime." seconds\n";
     }
 
     $result = $database->raw("SELECT CONNECTION_ID() as connection_id")->execute();
+
     if ($result && $result->getRowsCount() > 0) {
         echo "   ✓ Connection ID: ".$result->getRows()[0]['connection_id']."\n";
     }
 
     $result = $database->raw("SELECT USER() as user_name")->execute();
+
     if ($result && $result->getRowsCount() > 0) {
         echo "   ✓ Current User: ".$result->getRows()[0]['user_name']."\n";
     }
-
 } catch (Exception $e) {
     echo "✗ Error: ".$e->getMessage()."\n";
     echo "Note: Make sure MySQL is running and accessible with the provided credentials.\n";
 }
 
-echo "\n" . SEP;
+echo "\n".SEP;
 echo "=== Example Complete ===\n";
diff --git a/examples/02-basic-queries/example.php b/examples/02-basic-queries/example.php
index 64873288..409ed621 100644
--- a/examples/02-basic-queries/example.php
+++ b/examples/02-basic-queries/example.php
@@ -6,7 +6,6 @@
 use WebFiori\Database\ConnectionInfo;
 use WebFiori\Database\Database;
 use WebFiori\Database\DataType;
-use WebFiori\Database\MultiResultSet;
 
 const SEP = "────────────────────────────────────────────────────────────────────\n";
 
@@ -51,6 +50,7 @@
 
     $result = $database->table('test_users')->select()->execute();
     echo "   All users:\n";
+
     foreach ($result as $user) {
         echo "   - {$user['name']} ({$user['email']}) - Age: {$user['age']}\n";
     }
@@ -58,6 +58,7 @@
 
     $result = $database->table('test_users')->select()->where('age', 30, '>')->execute();
     echo "   Users older than 30:\n";
+
     foreach ($result as $user) {
         echo "   - {$user['name']} - Age: {$user['age']}\n";
     }
@@ -71,6 +72,7 @@
     echo "   ✓ Updated Fatima Al-Zahra's age to 26\n";
 
     $result = $database->table('test_users')->select()->where('name', 'Fatima Al-Zahra')->execute();
+
     foreach ($result as $user) {
         echo "   Fatima's new age: {$user['age']}\n";
     }
@@ -85,6 +87,7 @@
 
     $result = $database->table('test_users')->select()->execute();
     echo "   Remaining users:\n";
+
     foreach ($result as $user) {
         echo "   - {$user['name']} ({$user['email']}) - Age: {$user['age']}\n";
     }
@@ -95,10 +98,9 @@
     echo "6. Cleanup:\n";
     $database->table('test_users')->drop()->execute();
     echo "   ✓ Table dropped\n";
-
 } catch (Exception $e) {
     echo "✗ Error: ".$e->getMessage()."\n";
 }
 
-echo "\n" . SEP;
+echo "\n".SEP;
 echo "=== Example Complete ===\n";
diff --git a/examples/03-table-blueprints/example.php b/examples/03-table-blueprints/example.php
index 86e1e331..97eaf885 100644
--- a/examples/03-table-blueprints/example.php
+++ b/examples/03-table-blueprints/example.php
@@ -74,6 +74,7 @@
 
     $result = $database->table('users')->select()->execute();
     echo "   Users:\n";
+
     foreach ($result as $row) {
         echo "   - {$row['username']} ({$row['email']})\n";
     }
@@ -84,10 +85,9 @@
     $database->table('posts')->drop()->execute();
     $database->table('users')->drop()->execute();
     echo "   ✓ Tables dropped\n";
-
 } catch (Exception $e) {
     echo "✗ Error: ".$e->getMessage()."\n";
 }
 
-echo "\n" . SEP;
+echo "\n".SEP;
 echo "=== Example Complete ===\n";
diff --git a/examples/04-entity-mapping/example.php b/examples/04-entity-mapping/example.php
index c82e7492..8a629c85 100644
--- a/examples/04-entity-mapping/example.php
+++ b/examples/04-entity-mapping/example.php
@@ -63,6 +63,7 @@
     ));
 
     echo "   Mapped users:\n";
+
     foreach ($mappedUsers as $user) {
         echo "   - {$user->getFirstName()} {$user->getLastName()} ({$user->getEmail()})\n";
     }
@@ -72,6 +73,7 @@
     echo "4. Manual Entity Mapping:\n";
 
     $result = $database->table('users')->select()->execute();
+
     foreach ($result as $row) {
         $user = (object) [
             'id' => (int) $row['id'],
@@ -93,14 +95,17 @@
         unlink(__DIR__.'/User.php');
         echo "   ✓ Generated User.php file removed\n";
     }
-
 } catch (Exception $e) {
     echo "✗ Error: ".$e->getMessage()."\n";
     try {
         $database->table('users')->drop(true)->execute();
-        if (file_exists(__DIR__.'/User.php')) unlink(__DIR__.'/User.php');
-    } catch (Exception $cleanupError) {}
+
+        if (file_exists(__DIR__.'/User.php')) {
+            unlink(__DIR__.'/User.php');
+        }
+    } catch (Exception $cleanupError) {
+    }
 }
 
-echo "\n" . SEP;
+echo "\n".SEP;
 echo "=== Example Complete ===\n";
diff --git a/examples/05-transactions/example.php b/examples/05-transactions/example.php
index ae347778..89c3b495 100644
--- a/examples/05-transactions/example.php
+++ b/examples/05-transactions/example.php
@@ -50,6 +50,7 @@
     ])->execute();
 
     $result = $database->table('accounts')->select()->execute();
+
     foreach ($result as $account) {
         echo "   {$account['name']}: $".number_format($account['balance'], 2)."\n";
     }
@@ -60,15 +61,16 @@
 
     $transferAmount = 200.00;
 
-    $database->transaction(function (Database $db) use ($transferAmount) {
+    $database->transaction(function (Database $db) use ($transferAmount)
+    {
         $sender = $db->table('accounts')->select()->where('id', 1)->execute()->fetch();
-        
+
         if ($sender['balance'] < $transferAmount) {
             throw new DatabaseException("Insufficient funds");
         }
 
         $db->table('accounts')->update(['balance' => $sender['balance'] - $transferAmount])->where('id', 1)->execute();
-        
+
         $receiver = $db->table('accounts')->select()->where('id', 2)->execute()->fetch();
         $db->table('accounts')->update(['balance' => $receiver['balance'] + $transferAmount])->where('id', 2)->execute();
 
@@ -84,6 +86,7 @@
 
     $result = $database->table('accounts')->select()->execute();
     echo "   Balances after transfer:\n";
+
     foreach ($result as $account) {
         echo "   - {$account['name']}: $".number_format($account['balance'], 2)."\n";
     }
@@ -93,9 +96,10 @@
     echo "4. Failed Transaction (Insufficient Funds):\n";
 
     try {
-        $database->transaction(function (Database $db) {
+        $database->transaction(function (Database $db)
+        {
             $sender = $db->table('accounts')->select()->where('id', 1)->execute()->fetch();
-            
+
             if ($sender['balance'] < 2000.00) {
                 throw new DatabaseException("Insufficient funds for $2000.00 transfer");
             }
@@ -107,6 +111,7 @@
 
     $result = $database->table('accounts')->select()->execute();
     echo "   Balances unchanged:\n";
+
     foreach ($result as $account) {
         echo "   - {$account['name']}: $".number_format($account['balance'], 2)."\n";
     }
@@ -117,14 +122,14 @@
     $database->table('transactions')->drop()->execute();
     $database->table('accounts')->drop()->execute();
     echo "   ✓ Tables dropped\n";
-
 } catch (Exception $e) {
     echo "✗ Error: ".$e->getMessage()."\n";
     try {
         $database->table('transactions')->drop(true)->execute();
         $database->table('accounts')->drop(true)->execute();
-    } catch (Exception $cleanupError) {}
+    } catch (Exception $cleanupError) {
+    }
 }
 
-echo "\n" . SEP;
+echo "\n".SEP;
 echo "=== Example Complete ===\n";
diff --git a/examples/06-migrations/example.php b/examples/06-migrations/example.php
index e0575113..dadbbc41 100644
--- a/examples/06-migrations/example.php
+++ b/examples/06-migrations/example.php
@@ -27,6 +27,7 @@
     echo "2. Available Migrations:\n";
 
     $changes = $runner->getChanges();
+
     foreach ($changes as $change) {
         echo "   - ".$change->getName()."\n";
     }
@@ -51,6 +52,7 @@
 
     $descResult = $database->raw("DESCRIBE users")->execute();
     echo "   Users table columns:\n";
+
     foreach ($descResult as $column) {
         echo "   - {$column['Field']} ({$column['Type']})\n";
     }
@@ -70,6 +72,7 @@
 
     $selectResult = $database->table('users')->select(['username', 'email'])->execute();
     echo "   Users:\n";
+
     foreach ($selectResult as $user) {
         echo "   - {$user['username']} ({$user['email']})\n";
     }
@@ -79,6 +82,7 @@
     echo "6. Rolling Back Migrations:\n";
 
     $rolledBack = $runner->rollbackUpTo(null);
+
     if (!empty($rolledBack)) {
         foreach ($rolledBack as $change) {
             echo "   ✓ Rolled back: ".$change->getName()."\n";
@@ -90,14 +94,14 @@
     echo "7. Cleanup:\n";
     $runner->dropSchemaTable();
     echo "   ✓ Schema tracking table dropped\n";
-
 } catch (Exception $e) {
     echo "✗ Error: ".$e->getMessage()."\n";
     try {
         $database->table('users')->drop(true)->execute();
         $database->raw("DROP TABLE IF EXISTS schema_changes")->execute();
-    } catch (Exception $cleanupError) {}
+    } catch (Exception $cleanupError) {
+    }
 }
 
-echo "\n" . SEP;
+echo "\n".SEP;
 echo "=== Example Complete ===\n";
diff --git a/examples/07-seeders/example.php b/examples/07-seeders/example.php
index 436c6d51..0d184947 100644
--- a/examples/07-seeders/example.php
+++ b/examples/07-seeders/example.php
@@ -53,6 +53,7 @@
     echo "3. Available Seeders:\n";
 
     $changes = $runner->getChanges();
+
     foreach ($changes as $change) {
         echo "   - ".$change->getName()."\n";
     }
@@ -62,6 +63,7 @@
     echo "4. Running Seeders:\n";
 
     $result = $runner->apply();
+
     if ($result->count() > 0) {
         foreach ($result->getApplied() as $change) {
             echo "   ✓ ".$change->getName()."\n";
@@ -74,6 +76,7 @@
 
     $usersResult = $database->table('users')->select()->execute();
     echo "   Users ({$usersResult->getRowsCount()} records):\n";
+
     foreach ($usersResult as $user) {
         echo "   - {$user['full_name']} (@{$user['username']}) - {$user['role']}\n";
     }
@@ -81,6 +84,7 @@
 
     $categoriesResult = $database->table('categories')->select()->execute();
     echo "   Categories ({$categoriesResult->getRowsCount()} records):\n";
+
     foreach ($categoriesResult as $category) {
         echo "   - {$category['name']} ({$category['slug']})\n";
     }
@@ -92,15 +96,15 @@
     $database->table('categories')->drop()->execute();
     $database->table('users')->drop()->execute();
     echo "   ✓ Tables dropped\n";
-
 } catch (Exception $e) {
     echo "✗ Error: ".$e->getMessage()."\n";
     try {
         $database->table('categories')->drop(true)->execute();
         $database->table('users')->drop(true)->execute();
         $database->raw("DROP TABLE IF EXISTS schema_changes")->execute();
-    } catch (Exception $cleanupError) {}
+    } catch (Exception $cleanupError) {
+    }
 }
 
-echo "\n" . SEP;
+echo "\n".SEP;
 echo "=== Example Complete ===\n";
diff --git a/examples/08-performance-monitoring/example.php b/examples/08-performance-monitoring/example.php
index 135485b8..d9c099c4 100644
--- a/examples/08-performance-monitoring/example.php
+++ b/examples/08-performance-monitoring/example.php
@@ -87,6 +87,7 @@
 
     if (!empty($slowQueries)) {
         echo "   - Slow query details:\n";
+
         foreach ($slowQueries as $index => $metric) {
             $query = $metric->getQuery();
             $time = $metric->getExecutionTimeMs();
@@ -133,13 +134,13 @@
     echo "7. Cleanup:\n";
     $database->table('performance_test')->drop()->execute();
     echo "   ✓ Test table dropped\n";
-
 } catch (Exception $e) {
     echo "✗ Error: ".$e->getMessage()."\n";
     try {
         $database->table('performance_test')->drop(true)->execute();
-    } catch (Exception $cleanupError) {}
+    } catch (Exception $cleanupError) {
+    }
 }
 
-echo "\n" . SEP;
+echo "\n".SEP;
 echo "=== Example Complete ===\n";
diff --git a/examples/09-multi-result-queries/example.php b/examples/09-multi-result-queries/example.php
index 21eb883a..83ef2e37 100644
--- a/examples/09-multi-result-queries/example.php
+++ b/examples/09-multi-result-queries/example.php
@@ -104,10 +104,13 @@
 
         for ($i = 0; $i < $result->count(); $i++) {
             $resultSet = $result->getResultSet($i);
+
             if ($resultSet->getRowsCount() > 0) {
                 $firstRow = $resultSet->getRows()[0];
+
                 if (isset($firstRow['report_section'])) {
                     echo "   --- {$firstRow['report_section']} ---\n";
+
                     foreach ($resultSet as $row) {
                         if ($row['report_section'] === 'Product Inventory') {
                             echo "     {$row['category']}: {$row['name']} - $".number_format($row['price'], 2)." (Stock: {$row['stock']})\n";
@@ -144,12 +147,16 @@
 
     if ($categoryResult instanceof MultiResultSet) {
         echo "   ✓ Category analysis for 'Electronics':\n\n";
+
         for ($i = 0; $i < $categoryResult->count(); $i++) {
             $rs = $categoryResult->getResultSet($i);
+
             if ($rs->getRowsCount() > 0) {
                 $firstRow = $rs->getRows()[0];
+
                 if (isset($firstRow['section'])) {
                     echo "   --- {$firstRow['section']} ---\n";
+
                     foreach ($rs as $row) {
                         if ($row['section'] === 'Products') {
                             echo "     {$row['name']}: $".number_format($row['price'], 2)." (Stock: {$row['stock']})\n";
@@ -181,6 +188,7 @@
         echo "     - Orders: ".$ordersResults->getRowsCount()." orders\n\n";
 
         echo "   Low stock products (< 20 items):\n";
+
         foreach ($inventoryResults as $product) {
             if ($product['stock'] < 20) {
                 echo "     ⚠️  {$product['name']}: {$product['stock']} remaining\n";
@@ -196,7 +204,6 @@
     $database->table('orders')->drop()->execute();
     $database->table('products')->drop()->execute();
     echo "   ✓ Tables and procedures dropped\n";
-
 } catch (Exception $e) {
     echo "✗ Error: ".$e->getMessage()."\n";
     try {
@@ -204,8 +211,9 @@
         $database->raw("DROP PROCEDURE IF EXISTS GetCategoryAnalysis")->execute();
         $database->table('orders')->drop(true)->execute();
         $database->table('products')->drop(true)->execute();
-    } catch (Exception $cleanupError) {}
+    } catch (Exception $cleanupError) {
+    }
 }
 
-echo "\n" . SEP;
+echo "\n".SEP;
 echo "=== Example Complete ===\n";
diff --git a/examples/10-attribute-based-tables/Article.php b/examples/10-attribute-based-tables/Article.php
index b2ff791c..052401c4 100644
--- a/examples/10-attribute-based-tables/Article.php
+++ b/examples/10-attribute-based-tables/Article.php
@@ -7,19 +7,18 @@
 
 #[Table(name: 'articles')]
 class Article {
-    #[Column(type: DataType::INT, primary: true, autoIncrement: true)]
-    public int $id;
-
     #[Column(type: DataType::INT)]
     #[ForeignKey(table: Author::class, column: 'id', name: 'fk_article_author', onUpdate: 'cascade', onDelete: 'cascade')]
     public int $authorId;
 
-    #[Column(type: DataType::VARCHAR, size: 200)]
-    public string $title;
-
     #[Column(type: DataType::TEXT)]
     public string $content;
+    #[Column(type: DataType::INT, primary: true, autoIncrement: true)]
+    public int $id;
 
     #[Column(type: DataType::TIMESTAMP, default: 'current_timestamp')]
     public ?string $publishedAt = null;
+
+    #[Column(type: DataType::VARCHAR, size: 200)]
+    public string $title;
 }
diff --git a/examples/10-attribute-based-tables/Author.php b/examples/10-attribute-based-tables/Author.php
index 763485eb..dfbb4889 100644
--- a/examples/10-attribute-based-tables/Author.php
+++ b/examples/10-attribute-based-tables/Author.php
@@ -6,15 +6,14 @@
 
 #[Table(name: 'authors')]
 class Author {
+    #[Column(type: DataType::TIMESTAMP, default: 'current_timestamp')]
+    public ?string $createdAt = null;
+
+    #[Column(type: DataType::VARCHAR, size: 150)]
+    public string $email;
     #[Column(type: DataType::INT, primary: true, autoIncrement: true)]
     public int $id;
 
     #[Column(type: DataType::VARCHAR, size: 100)]
     public string $name;
-
-    #[Column(type: DataType::VARCHAR, size: 150)]
-    public string $email;
-
-    #[Column(type: DataType::TIMESTAMP, default: 'current_timestamp')]
-    public ?string $createdAt = null;
 }
diff --git a/examples/10-attribute-based-tables/example.php b/examples/10-attribute-based-tables/example.php
index dc389b93..00dfb4b2 100644
--- a/examples/10-attribute-based-tables/example.php
+++ b/examples/10-attribute-based-tables/example.php
@@ -66,6 +66,7 @@
     ")->execute();
 
     echo "   Articles with authors:\n";
+
     foreach ($result as $row) {
         echo "   - {$row['title']} by {$row['author']} ({$row['published-at']})\n";
     }
@@ -76,14 +77,14 @@
     $database->table('articles')->drop()->execute();
     $database->table('authors')->drop()->execute();
     echo "   ✓ Tables dropped\n";
-
 } catch (Exception $e) {
     echo "✗ Error: ".$e->getMessage()."\n";
     try {
         $database->table('articles')->drop(true)->execute();
         $database->table('authors')->drop(true)->execute();
-    } catch (Exception $cleanupError) {}
+    } catch (Exception $cleanupError) {
+    }
 }
 
-echo "\n" . SEP;
+echo "\n".SEP;
 echo "=== Example Complete ===\n";
diff --git a/examples/11-repository-pattern/Product.php b/examples/11-repository-pattern/Product.php
index 6848bbce..d6ef1d35 100644
--- a/examples/11-repository-pattern/Product.php
+++ b/examples/11-repository-pattern/Product.php
@@ -1,9 +1,9 @@
 <?php
 
 class Product {
+    public string $category;
     public ?int $id = null;
     public string $name;
-    public string $category;
     public float $price;
     public int $stock;
 
diff --git a/examples/11-repository-pattern/ProductRepository.php b/examples/11-repository-pattern/ProductRepository.php
index def57315..64c193a2 100644
--- a/examples/11-repository-pattern/ProductRepository.php
+++ b/examples/11-repository-pattern/ProductRepository.php
@@ -5,22 +5,29 @@
 use WebFiori\Database\Repository\AbstractRepository;
 
 class ProductRepository extends AbstractRepository {
-    protected function getTableName(): string {
-        return 'products';
+    public function findByCategory(string $category): array {
+        $result = $this->getDatabase()->table($this->getTableName())
+            ->select()
+            ->where('category', $category)
+            ->execute();
+
+        return array_map(fn($row) => $this->toEntity($row), $result->fetchAll());
+    }
+
+    public function findLowStock(int $threshold = 10): array {
+        $result = $this->getDatabase()->table($this->getTableName())
+            ->select()
+            ->where('stock', $threshold, '<')
+            ->execute();
+
+        return array_map(fn($row) => $this->toEntity($row), $result->fetchAll());
     }
 
     protected function getIdField(): string {
         return 'id';
     }
-
-    protected function toEntity(array $row): object {
-        $product = new Product();
-        $product->id = (int) $row['id'];
-        $product->name = $row['name'];
-        $product->category = $row['category'];
-        $product->price = (float) $row['price'];
-        $product->stock = (int) $row['stock'];
-        return $product;
+    protected function getTableName(): string {
+        return 'products';
     }
 
     protected function toArray(object $entity): array {
@@ -33,21 +40,14 @@ protected function toArray(object $entity): array {
         ];
     }
 
-    public function findByCategory(string $category): array {
-        $result = $this->getDatabase()->table($this->getTableName())
-            ->select()
-            ->where('category', $category)
-            ->execute();
-
-        return array_map(fn($row) => $this->toEntity($row), $result->fetchAll());
-    }
-
-    public function findLowStock(int $threshold = 10): array {
-        $result = $this->getDatabase()->table($this->getTableName())
-            ->select()
-            ->where('stock', $threshold, '<')
-            ->execute();
+    protected function toEntity(array $row): object {
+        $product = new Product();
+        $product->id = (int) $row['id'];
+        $product->name = $row['name'];
+        $product->category = $row['category'];
+        $product->price = (float) $row['price'];
+        $product->stock = (int) $row['stock'];
 
-        return array_map(fn($row) => $this->toEntity($row), $result->fetchAll());
+        return $product;
     }
 }
diff --git a/examples/11-repository-pattern/example.php b/examples/11-repository-pattern/example.php
index 83ff2a08..069f7f47 100644
--- a/examples/11-repository-pattern/example.php
+++ b/examples/11-repository-pattern/example.php
@@ -58,6 +58,7 @@
     echo "4. Finding All Products (Read):\n";
     $allProducts = $productRepo->findAll();
     echo "   Total products: ".count($allProducts)."\n";
+
     foreach ($allProducts as $p) {
         echo "   - {$p->name} ({$p->category}): \${$p->price} - Stock: {$p->stock}\n";
     }
@@ -66,6 +67,7 @@
     echo SEP;
     echo "5. Finding by ID:\n";
     $product = $productRepo->findById(1);
+
     if ($product) {
         echo "   Found: {$product->name} - \${$product->price}\n\n";
     }
@@ -74,6 +76,7 @@
     echo "6. Custom Query - Find by Category:\n";
     $electronics = $productRepo->findByCategory('Electronics');
     echo "   Electronics products: ".count($electronics)."\n";
+
     foreach ($electronics as $p) {
         echo "   - {$p->name}: \${$p->price}\n";
     }
@@ -83,6 +86,7 @@
     echo "7. Custom Query - Find Low Stock:\n";
     $lowStock = $productRepo->findLowStock(10);
     echo "   Low stock products (< 10): ".count($lowStock)."\n";
+
     foreach ($lowStock as $p) {
         echo "   ⚠️  {$p->name}: {$p->stock} remaining\n";
     }
@@ -91,6 +95,7 @@
     echo SEP;
     echo "8. Updating a Product:\n";
     $product = $productRepo->findById(3);
+
     if ($product) {
         echo "   Before: {$product->name} - Stock: {$product->stock}\n";
         $product->stock = 25;
@@ -105,6 +110,7 @@
     echo "   Page 1 (3 per page):\n";
     echo "   Total items: {$page1->getTotalItems()}\n";
     echo "   Total pages: {$page1->getTotalPages()}\n";
+
     foreach ($page1->getItems() as $p) {
         echo "   - {$p->name}\n";
     }
@@ -124,13 +130,13 @@
     echo "12. Cleanup:\n";
     $database->table('products')->drop()->execute();
     echo "    ✓ Products table dropped\n";
-
 } catch (Exception $e) {
     echo "✗ Error: ".$e->getMessage()."\n";
     try {
         $database->table('products')->drop(true)->execute();
-    } catch (Exception $cleanupError) {}
+    } catch (Exception $cleanupError) {
+    }
 }
 
-echo "\n" . SEP;
+echo "\n".SEP;
 echo "=== Example Complete ===\n";
diff --git a/examples/12-clean-architecture/Domain/User.php b/examples/12-clean-architecture/Domain/User.php
index 96445191..f6db502f 100644
--- a/examples/12-clean-architecture/Domain/User.php
+++ b/examples/12-clean-architecture/Domain/User.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain;
 
 /**
@@ -11,5 +10,6 @@ public function __construct(
         public string $name,
         public string $email,
         public int $age
-    ) {}
+    ) {
+    }
 }
diff --git a/examples/12-clean-architecture/Infrastructure/Repository/MySQLUserRepository.php b/examples/12-clean-architecture/Infrastructure/Repository/MySQLUserRepository.php
index 225c3338..d00cd0d0 100644
--- a/examples/12-clean-architecture/Infrastructure/Repository/MySQLUserRepository.php
+++ b/examples/12-clean-architecture/Infrastructure/Repository/MySQLUserRepository.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Infrastructure\Repository;
 
 use Domain\User;
@@ -11,16 +10,22 @@
  * Infrastructure implementation - depends on WebFiori Database
  */
 class MySQLUserRepository extends AbstractRepository implements UserRepositoryInterface {
-    protected function getTableName(): string { return 'users'; }
-    protected function getIdField(): string { return 'id'; }
+    public function delete(mixed $id): void {
+        $this->deleteById($id);
+    }
 
-    protected function toEntity(array $row): object {
-        return new User(
-            (int) $row['id'],
-            $row['name'],
-            $row['email'],
-            (int) $row['age']
-        );
+    public function findAll(): array {
+        return parent::findAll();
+    }
+
+    public function findById(mixed $id): ?User {
+        return parent::findById($id);
+    }
+    protected function getIdField(): string {
+        return 'id';
+    }
+    protected function getTableName(): string {
+        return 'users';
     }
 
     protected function toArray(object $entity): array {
@@ -32,15 +37,12 @@ protected function toArray(object $entity): array {
         ];
     }
 
-    public function findById(mixed $id): ?User {
-        return parent::findById($id);
-    }
-
-    public function findAll(): array {
-        return parent::findAll();
-    }
-
-    public function delete(mixed $id): void {
-        $this->deleteById($id);
+    protected function toEntity(array $row): object {
+        return new User(
+            (int) $row['id'],
+            $row['name'],
+            $row['email'],
+            (int) $row['age']
+        );
     }
 }
diff --git a/examples/12-clean-architecture/Infrastructure/Repository/UserRepository.php b/examples/12-clean-architecture/Infrastructure/Repository/UserRepository.php
index 4a9ac083..0d658b99 100644
--- a/examples/12-clean-architecture/Infrastructure/Repository/UserRepository.php
+++ b/examples/12-clean-architecture/Infrastructure/Repository/UserRepository.php
@@ -1,30 +1,28 @@
 <?php
-
 namespace Infrastructure\Repository;
 
 use Domain\User;
-use WebFiori\Database\Database;
 use WebFiori\Database\Repository\AbstractRepository;
 
 /**
  * Repository implementation using AbstractRepository
  */
 class UserRepository extends AbstractRepository {
-    protected function getTableName(): string {
-        return 'users';
+    /** @return User[] */
+    public function findByAge(int $minAge): array {
+        $result = $this->getDatabase()->table($this->getTableName())
+            ->select()
+            ->where('age', $minAge, '>=')
+            ->execute();
+
+        return array_map(fn($row) => $this->toEntity($row), $result->fetchAll());
     }
 
     protected function getIdField(): string {
         return 'id';
     }
-
-    protected function toEntity(array $row): User {
-        return new User(
-            (int) $row['id'],
-            $row['name'],
-            $row['email'],
-            (int) $row['age']
-        );
+    protected function getTableName(): string {
+        return 'users';
     }
 
     protected function toArray(object $entity): array {
@@ -36,13 +34,12 @@ protected function toArray(object $entity): array {
         ];
     }
 
-    /** @return User[] */
-    public function findByAge(int $minAge): array {
-        $result = $this->getDatabase()->table($this->getTableName())
-            ->select()
-            ->where('age', $minAge, '>=')
-            ->execute();
-
-        return array_map(fn($row) => $this->toEntity($row), $result->fetchAll());
+    protected function toEntity(array $row): User {
+        return new User(
+            (int) $row['id'],
+            $row['name'],
+            $row['email'],
+            (int) $row['age']
+        );
     }
 }
diff --git a/examples/12-clean-architecture/Infrastructure/Schema/UserTable.php b/examples/12-clean-architecture/Infrastructure/Schema/UserTable.php
index ea17f7f2..759b0f21 100644
--- a/examples/12-clean-architecture/Infrastructure/Schema/UserTable.php
+++ b/examples/12-clean-architecture/Infrastructure/Schema/UserTable.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Infrastructure\Schema;
 
 use WebFiori\Database\Attributes\Column;
diff --git a/examples/12-clean-architecture/example.php b/examples/12-clean-architecture/example.php
index 922e80b4..fd28cd69 100644
--- a/examples/12-clean-architecture/example.php
+++ b/examples/12-clean-architecture/example.php
@@ -63,6 +63,7 @@
 
     $all = $userRepo->findAll();
     echo "   All users (".count($all)."):\n";
+
     foreach ($all as $u) {
         echo "   - {$u->name} ({$u->email}) - Age: {$u->age}\n";
     }
@@ -72,6 +73,7 @@
 
     $adults = $userRepo->findByAge(25);
     echo "\n   Users age >= 25 (".count($adults)."):\n";
+
     foreach ($adults as $u) {
         echo "   - {$u->name} (Age: {$u->age})\n";
     }
@@ -85,13 +87,13 @@
     echo "6. Cleanup:\n";
     $database->table('users')->drop()->execute();
     echo "   ✓ Table dropped\n";
-
 } catch (Exception $e) {
     echo "✗ Error: ".$e->getMessage()."\n";
     try {
         $database->table('users')->drop(true)->execute();
-    } catch (Exception $cleanupError) {}
+    } catch (Exception $cleanupError) {
+    }
 }
 
-echo "\n" . SEP;
+echo "\n".SEP;
 echo "=== Example Complete ===\n";
diff --git a/examples/13-pagination/User.php b/examples/13-pagination/User.php
index 41f80121..7f3145d6 100644
--- a/examples/13-pagination/User.php
+++ b/examples/13-pagination/User.php
@@ -1,8 +1,8 @@
 <?php
 
 class User {
+    public int $age;
+    public string $email;
     public ?int $id = null;
     public string $name;
-    public string $email;
-    public int $age;
 }
diff --git a/examples/13-pagination/UserRepository.php b/examples/13-pagination/UserRepository.php
index b63034d3..7c8926a9 100644
--- a/examples/13-pagination/UserRepository.php
+++ b/examples/13-pagination/UserRepository.php
@@ -5,12 +5,20 @@
 use WebFiori\Database\Repository\AbstractRepository;
 
 class UserRepository extends AbstractRepository {
+    protected function getIdField(): string {
+        return 'id';
+    }
     protected function getTableName(): string {
         return 'users';
     }
 
-    protected function getIdField(): string {
-        return 'id';
+    protected function toArray(object $entity): array {
+        return [
+            'id' => $entity->id,
+            'name' => $entity->name,
+            'email' => $entity->email,
+            'age' => $entity->age
+        ];
     }
 
     protected function toEntity(array $row): object {
@@ -19,15 +27,7 @@ protected function toEntity(array $row): object {
         $user->name = $row['name'];
         $user->email = $row['email'];
         $user->age = (int) $row['age'];
-        return $user;
-    }
 
-    protected function toArray(object $entity): array {
-        return [
-            'id' => $entity->id,
-            'name' => $entity->name,
-            'email' => $entity->email,
-            'age' => $entity->age
-        ];
+        return $user;
     }
 }
diff --git a/examples/13-pagination/example.php b/examples/13-pagination/example.php
index 706815aa..3165cffe 100644
--- a/examples/13-pagination/example.php
+++ b/examples/13-pagination/example.php
@@ -31,10 +31,11 @@
     $database->table('users')->createTable()->execute();
 
     $names = ['Ahmed', 'Fatima', 'Omar', 'Layla', 'Hassan', 'Sara', 'Yusuf', 'Maryam', 'Ali', 'Noor',
-              'Khalid', 'Aisha', 'Ibrahim', 'Zahra', 'Mahmoud', 'Hana', 'Tariq', 'Salma', 'Rami', 'Dina',
-              'Faisal', 'Lina', 'Samir', 'Rania', 'Walid'];
+        'Khalid', 'Aisha', 'Ibrahim', 'Zahra', 'Mahmoud', 'Hana', 'Tariq', 'Salma', 'Rami', 'Dina',
+        'Faisal', 'Lina', 'Samir', 'Rania', 'Walid'];
 
     $values = [];
+
     foreach ($names as $i => $name) {
         $values[] = [$name, strtolower($name).'@example.com', 20 + ($i % 30)];
     }
@@ -54,6 +55,7 @@
     for ($page = 1; $page <= 3; $page++) {
         $result = $repo->paginate($page, 5);
         echo "   Page $page of {$result->getTotalPages()}:\n";
+
         foreach ($result->getItems() as $user) {
             echo "   - {$user->name} ({$user->email})\n";
         }
@@ -70,12 +72,15 @@
     while ($pageNum <= 3) {
         $result = $repo->paginateByCursor($cursor, 5, 'id', 'ASC');
         echo "   Cursor Page $pageNum:\n";
+
         foreach ($result->getItems() as $user) {
             echo "   - ID {$user->id}: {$user->name}\n";
         }
         echo "   Has more: ".($result->hasMore() ? 'Yes' : 'No')."\n";
 
-        if (!$result->hasMore()) break;
+        if (!$result->hasMore()) {
+            break;
+        }
 
         $cursor = $result->getNextCursor();
         echo "   Next cursor: $cursor\n\n";
@@ -87,6 +92,7 @@
     echo "4. Pagination with Ordering:\n";
     $result = $repo->paginate(1, 5, ['age' => 'DESC']);
     echo "   Top 5 oldest users:\n";
+
     foreach ($result->getItems() as $user) {
         echo "   - {$user->name} (Age: {$user->age})\n";
     }
@@ -96,13 +102,13 @@
     echo "5. Cleanup:\n";
     $database->table('users')->drop()->execute();
     echo "   ✓ Table dropped\n";
-
 } catch (Exception $e) {
     echo "✗ Error: ".$e->getMessage()."\n";
     try {
         $database->table('users')->drop(true)->execute();
-    } catch (Exception $cleanupError) {}
+    } catch (Exception $cleanupError) {
+    }
 }
 
-echo "\n" . SEP;
+echo "\n".SEP;
 echo "=== Example Complete ===\n";
diff --git a/examples/14-active-record-model/Article.php b/examples/14-active-record-model/Article.php
index a1d94d9b..fbf9544c 100644
--- a/examples/14-active-record-model/Article.php
+++ b/examples/14-active-record-model/Article.php
@@ -8,41 +8,40 @@
 
 #[Table(name: 'articles')]
 class Article extends AbstractRepository {
-    #[Column(type: DataType::INT, primary: true, autoIncrement: true)]
-    public ?int $id = null;
-
-    #[Column(type: DataType::VARCHAR, size: 200)]
-    public string $title = '';
+    #[Column(name: 'author-name', type: DataType::VARCHAR, size: 100)]
+    public string $authorName = '';
 
     #[Column(type: DataType::TEXT)]
     public string $content = '';
 
-    #[Column(name: 'author-name', type: DataType::VARCHAR, size: 100)]
-    public string $authorName = '';
-
     #[Column(name: 'created-at', type: DataType::TIMESTAMP, default: 'now()')]
     public ?string $createdAt = null;
+    #[Column(type: DataType::INT, primary: true, autoIncrement: true)]
+    public ?int $id = null;
+
+    #[Column(type: DataType::VARCHAR, size: 200)]
+    public string $title = '';
 
     public function __construct(Database $db) {
         parent::__construct($db);
     }
 
-    protected function getTableName(): string {
-        return 'articles';
+    // Custom query methods
+    public function findByAuthor(string $author): array {
+        $result = $this->getDatabase()->table($this->getTableName())
+            ->select()
+            ->where('author-name', $author)
+            ->execute();
+
+        return array_map(fn($row) => $this->toEntity($row), $result->fetchAll());
     }
 
     protected function getIdField(): string {
         return 'id';
     }
 
-    protected function toEntity(array $row): object {
-        $article = new self($this->db);
-        $article->id = (int) $row['id'];
-        $article->title = $row['title'];
-        $article->content = $row['content'];
-        $article->authorName = $row['author-name'] ?? '';
-        $article->createdAt = $row['created-at'] ?? null;
-        return $article;
+    protected function getTableName(): string {
+        return 'articles';
     }
 
     protected function toArray(object $entity): array {
@@ -54,13 +53,14 @@ protected function toArray(object $entity): array {
         ];
     }
 
-    // Custom query methods
-    public function findByAuthor(string $author): array {
-        $result = $this->getDatabase()->table($this->getTableName())
-            ->select()
-            ->where('author-name', $author)
-            ->execute();
+    protected function toEntity(array $row): object {
+        $article = new self($this->db);
+        $article->id = (int) $row['id'];
+        $article->title = $row['title'];
+        $article->content = $row['content'];
+        $article->authorName = $row['author-name'] ?? '';
+        $article->createdAt = $row['created-at'] ?? null;
 
-        return array_map(fn($row) => $this->toEntity($row), $result->fetchAll());
+        return $article;
     }
 }
diff --git a/examples/14-active-record-model/example.php b/examples/14-active-record-model/example.php
index 7894c5df..a0e34809 100644
--- a/examples/14-active-record-model/example.php
+++ b/examples/14-active-record-model/example.php
@@ -55,6 +55,7 @@
 
     $all = $articleModel->findAll();
     echo "   All articles ({$articleModel->count()}):\n";
+
     foreach ($all as $article) {
         echo "   - {$article->title} by {$article->authorName}\n";
     }
@@ -62,6 +63,7 @@
 
     $byAuthor = $articleModel->findByAuthor('Ahmad Hassan');
     echo "   Articles by Ahmad Hassan:\n";
+
     foreach ($byAuthor as $article) {
         echo "   - {$article->title}\n";
     }
@@ -80,6 +82,7 @@
     echo "   ✓ Article deleted\n";
 
     echo "\n   Remaining articles:\n";
+
     foreach ($articleModel->findAll() as $article) {
         echo "   - [{$article->id}] {$article->title}\n";
     }
@@ -89,13 +92,13 @@
     echo "5. Cleanup:\n";
     $database->table('articles')->drop()->execute();
     echo "   ✓ Table dropped\n";
-
 } catch (Exception $e) {
     echo "✗ Error: ".$e->getMessage()."\n";
     try {
         $database->table('articles')->drop(true)->execute();
-    } catch (Exception $cleanupError) {}
+    } catch (Exception $cleanupError) {
+    }
 }
 
-echo "\n" . SEP;
+echo "\n".SEP;
 echo "=== Example Complete ===\n";
diff --git a/examples/15-eager-loading/Author.php b/examples/15-eager-loading/Author.php
index 225195b9..255a0782 100644
--- a/examples/15-eager-loading/Author.php
+++ b/examples/15-eager-loading/Author.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Domain entity - pure, no database knowledge.
  */
diff --git a/examples/15-eager-loading/AuthorRepository.php b/examples/15-eager-loading/AuthorRepository.php
index 8e6e32f3..997e21a4 100644
--- a/examples/15-eager-loading/AuthorRepository.php
+++ b/examples/15-eager-loading/AuthorRepository.php
@@ -1,6 +1,5 @@
 <?php
 
-use WebFiori\Database\Database;
 use WebFiori\Database\Repository\AbstractRepository;
 
 require_once __DIR__.'/Author.php';
@@ -8,6 +7,9 @@
 require_once __DIR__.'/AuthorsTable.php';
 
 class AuthorRepository extends AbstractRepository {
+    protected function getIdField(): string {
+        return 'id';
+    }
     protected function getTableClass(): string {
         return AuthorsTable::class;
     }
@@ -16,21 +18,18 @@ protected function getTableName(): string {
         return 'authors';
     }
 
-    protected function getIdField(): string {
-        return 'id';
+    protected function toArray(object $entity): array {
+        return [
+            'id' => $entity->id,
+            'name' => $entity->name
+        ];
     }
 
     protected function toEntity(array $row): object {
         $author = new Author();
         $author->id = (int) $row['id'];
         $author->name = $row['name'];
-        return $author;
-    }
 
-    protected function toArray(object $entity): array {
-        return [
-            'id' => $entity->id,
-            'name' => $entity->name
-        ];
+        return $author;
     }
 }
diff --git a/examples/15-eager-loading/Comment.php b/examples/15-eager-loading/Comment.php
index 20b16a51..2661e9ce 100644
--- a/examples/15-eager-loading/Comment.php
+++ b/examples/15-eager-loading/Comment.php
@@ -1,8 +1,8 @@
 <?php
 
 class Comment {
-    public ?int $id = null;
     public string $content = '';
-    public int $postId = 0;
+    public ?int $id = null;
     public ?object $post = null;
+    public int $postId = 0;
 }
diff --git a/examples/15-eager-loading/CommentRepository.php b/examples/15-eager-loading/CommentRepository.php
index b400c5c3..ce5727e9 100644
--- a/examples/15-eager-loading/CommentRepository.php
+++ b/examples/15-eager-loading/CommentRepository.php
@@ -6,6 +6,9 @@
 require_once __DIR__.'/CommentsTable.php';
 
 class CommentRepository extends AbstractRepository {
+    protected function getIdField(): string {
+        return 'id';
+    }
     protected function getTableClass(): string {
         return CommentsTable::class;
     }
@@ -14,8 +17,12 @@ protected function getTableName(): string {
         return 'comments';
     }
 
-    protected function getIdField(): string {
-        return 'id';
+    protected function toArray(object $entity): array {
+        return [
+            'id' => $entity->id,
+            'content' => $entity->content,
+            'post-id' => $entity->postId
+        ];
     }
 
     protected function toEntity(array $row): object {
@@ -23,14 +30,7 @@ protected function toEntity(array $row): object {
         $comment->id = (int) $row['id'];
         $comment->content = $row['content'];
         $comment->postId = (int) ($row['post-id'] ?? $row['post_id'] ?? 0);
-        return $comment;
-    }
 
-    protected function toArray(object $entity): array {
-        return [
-            'id' => $entity->id,
-            'content' => $entity->content,
-            'post-id' => $entity->postId
-        ];
+        return $comment;
     }
 }
diff --git a/examples/15-eager-loading/CommentsTable.php b/examples/15-eager-loading/CommentsTable.php
index dab1c533..59c5e4f9 100644
--- a/examples/15-eager-loading/CommentsTable.php
+++ b/examples/15-eager-loading/CommentsTable.php
@@ -10,11 +10,10 @@
  */
 #[Table(name: 'comments')]
 class CommentsTable {
-    #[Column(type: DataType::INT, primary: true, autoIncrement: true)]
-    public int $id;
-
     #[Column(type: DataType::TEXT)]
     public string $content;
+    #[Column(type: DataType::INT, primary: true, autoIncrement: true)]
+    public int $id;
 
     #[Column(name: 'post-id', type: DataType::INT)]
     #[ForeignKey(table: PostsTable::class, column: 'id', property: 'post', name: 'fk_comment_post', onUpdate: 'cascade', onDelete: 'cascade')]
diff --git a/examples/15-eager-loading/Post.php b/examples/15-eager-loading/Post.php
index 6d90ae2a..a5270eeb 100644
--- a/examples/15-eager-loading/Post.php
+++ b/examples/15-eager-loading/Post.php
@@ -1,11 +1,12 @@
 <?php
+
 /**
  * Domain entity - pure, no database knowledge.
  */
 class Post {
-    public ?int $id = null;
-    public string $title = '';
-    public int $authorId = 0;
     public ?Author $author = null;
+    public int $authorId = 0;
     public array $comments = [];
+    public ?int $id = null;
+    public string $title = '';
 }
diff --git a/examples/15-eager-loading/PostRepository.php b/examples/15-eager-loading/PostRepository.php
index 69622706..fa19c54d 100644
--- a/examples/15-eager-loading/PostRepository.php
+++ b/examples/15-eager-loading/PostRepository.php
@@ -1,6 +1,5 @@
 <?php
 
-use WebFiori\Database\Database;
 use WebFiori\Database\Repository\AbstractRepository;
 
 require_once __DIR__.'/Author.php';
@@ -9,6 +8,9 @@
 require_once __DIR__.'/PostsTable.php';
 
 class PostRepository extends AbstractRepository {
+    protected function getIdField(): string {
+        return 'id';
+    }
     protected function getTableClass(): string {
         return PostsTable::class;
     }
@@ -17,8 +19,12 @@ protected function getTableName(): string {
         return 'posts';
     }
 
-    protected function getIdField(): string {
-        return 'id';
+    protected function toArray(object $entity): array {
+        return [
+            'id' => $entity->id,
+            'title' => $entity->title,
+            'author-id' => $entity->authorId
+        ];
     }
 
     protected function toEntity(array $row): object {
@@ -26,14 +32,7 @@ protected function toEntity(array $row): object {
         $post->id = (int) $row['id'];
         $post->title = $row['title'];
         $post->authorId = (int) ($row['author-id'] ?? $row['author_id'] ?? 0);
-        return $post;
-    }
 
-    protected function toArray(object $entity): array {
-        return [
-            'id' => $entity->id,
-            'title' => $entity->title,
-            'author-id' => $entity->authorId
-        ];
+        return $post;
     }
 }
diff --git a/examples/15-eager-loading/PostsTable.php b/examples/15-eager-loading/PostsTable.php
index aaf27358..17b534d6 100644
--- a/examples/15-eager-loading/PostsTable.php
+++ b/examples/15-eager-loading/PostsTable.php
@@ -12,13 +12,12 @@
 #[Table(name: 'posts')]
 #[HasMany(entity: Comment::class, foreignKey: 'post-id', property: 'comments', table: 'comments')]
 class PostsTable {
+    #[Column(name: 'author-id', type: DataType::INT)]
+    #[ForeignKey(table: AuthorsTable::class, column: 'id', property: 'author', entity: Author::class, name: 'fk_post_author', onUpdate: 'cascade', onDelete: 'cascade')]
+    public int $authorId;
     #[Column(type: DataType::INT, primary: true, autoIncrement: true)]
     public int $id;
 
     #[Column(type: DataType::VARCHAR, size: 200)]
     public string $title;
-
-    #[Column(name: 'author-id', type: DataType::INT)]
-    #[ForeignKey(table: AuthorsTable::class, column: 'id', property: 'author', entity: Author::class, name: 'fk_post_author', onUpdate: 'cascade', onDelete: 'cascade')]
-    public int $authorId;
 }
diff --git a/examples/15-eager-loading/example.php b/examples/15-eager-loading/example.php
index 8a3c81f2..8ad0ed24 100644
--- a/examples/15-eager-loading/example.php
+++ b/examples/15-eager-loading/example.php
@@ -6,10 +6,8 @@
 require_once __DIR__.'/CommentRepository.php';
 
 use WebFiori\Database\Attributes\AttributeTableBuilder;
-use WebFiori\Database\ColOption;
 use WebFiori\Database\ConnectionInfo;
 use WebFiori\Database\Database;
-use WebFiori\Database\DataType;
 
 const SEP = "────────────────────────────────────────────────────────────────────\n";
 
@@ -88,6 +86,7 @@
 
     foreach ($authors as $author) {
         echo "   {$author->name} ({$author->id}):\n";
+
         if (empty($author->posts)) {
             echo "     - No posts\n";
         } else {
@@ -149,8 +148,8 @@
     try {
         $authorRepo->withJoin('posts')->findAll();
         echo "   ✗ Should have thrown exception\n";
-    } catch (\WebFiori\Database\Repository\RepositoryException $e) {
-        echo "   ✓ Exception thrown: " . $e->getMessage() . "\n";
+    } catch (WebFiori\Database\Repository\RepositoryException $e) {
+        echo "   ✓ Exception thrown: ".$e->getMessage()."\n";
     }
     echo "\n";
 
@@ -162,7 +161,7 @@
 
     $author = $authorRepo->with('posts')->findById(1);
     echo "   Author: {$author->name}\n";
-    echo "   Posts: " . count($author->posts) . "\n\n";
+    echo "   Posts: ".count($author->posts)."\n\n";
 
     // =============================================
     // Eager Loading with Pagination
@@ -171,9 +170,10 @@
     echo "10. Eager Loading with Pagination:\n";
 
     $page = $authorRepo->with('posts')->paginate(page: 1, perPage: 2);
-    echo "    Page 1 of " . $page->getTotalPages() . " (2 per page):\n";
+    echo "    Page 1 of ".$page->getTotalPages()." (2 per page):\n";
+
     foreach ($page->getItems() as $author) {
-        echo "    - {$author->name}: " . count($author->posts) . " posts\n";
+        echo "    - {$author->name}: ".count($author->posts)." posts\n";
     }
     echo "\n";
 
@@ -196,10 +196,11 @@
     $comments = $commentRepo->with('post')->findAll();
 
     echo "    Comments with related posts (stdClass):\n";
+
     foreach ($comments as $comment) {
         $postTitle = $comment->post->title ?? 'N/A';
         echo "    - \"{$comment->content}\" on post: \"{$postTitle}\"\n";
-        echo "      post type: " . get_class($comment->post) . "\n";
+        echo "      post type: ".get_class($comment->post)."\n";
     }
     echo "\n";
 
@@ -210,15 +211,15 @@
     $database->table('posts')->drop()->execute();
     $database->table('authors')->drop()->execute();
     echo "✓ Tables dropped\n";
-
 } catch (Exception $e) {
-    echo "✗ Error: " . $e->getMessage() . "\n";
+    echo "✗ Error: ".$e->getMessage()."\n";
     try {
         $database->table('comments')->drop(true)->execute();
         $database->table('posts')->drop(true)->execute();
         $database->table('authors')->drop(true)->execute();
-    } catch (Exception $cleanupError) {}
+    } catch (Exception $cleanupError) {
+    }
 }
 
-echo "\n" . SEP;
+echo "\n".SEP;
 echo "=== Example Complete ===\n";
diff --git a/tests/WebFiori/Tests/Database/Common/ConditionTest.php b/tests/WebFiori/Tests/Database/Common/ConditionTest.php
index bcdd40b4..1bfb8412 100644
--- a/tests/WebFiori/Tests/Database/Common/ConditionTest.php
+++ b/tests/WebFiori/Tests/Database/Common/ConditionTest.php
@@ -1,71 +1,71 @@
-<?php
-
-namespace WebFiori\Tests\Database\Common;
-use WebFiori\Database\Query\Condition;
-use PHPUnit\Framework\TestCase;
-/**
- * Description of ConditionTest
- *
- * @author Ibrahim
- */
-class ConditionTest extends TestCase{
-    /**
-     * @test
-     */
-    public function test00() {
-        $condition = new Condition('A', 'B', '=');
-        $this->assertEquals('A = B', $condition.'');
-    }
-    /**
-     * @test
-     */
-    public function testEquals00() {
-        $condition0 = new Condition('A', 'B', '=');
-        $condition1 = new Condition('A', 'B', '=');
-        $this->assertTrue($condition1->equals($condition0));
-    }
-    /**
-     * @test
-     */
-    public function testEquals01() {
-        $condition0 = new Condition('A ', 'B', '=');
-        $condition1 = new Condition('A', 'B', '=');
-        $this->assertFalse($condition1->equals($condition0));
-    }
-    /**
-     * @test
-     */
-    public function testEquals02() {
-        $condition0 = new Condition('B', 'A', '=');
-        $condition1 = new Condition('A', 'B', '=');
-        $this->assertFalse($condition1->equals($condition0));
-    }
-    /**
-     * @test
-     */
-    public function testToString00() {
-        $condition0 = new Condition('B', 'A', '=');
-        $this->assertEquals('B = A', $condition0.'');
-    }
-    /**
-     * @test
-     */
-    public function testToString01() {
-        $condition0 = new Condition(null, null, '=');
-        $this->assertEquals('', $condition0.'');
-    }
-    /**
-     * @test
-     */
-    public function testToString02() {
-        $condition0 = new Condition('A', null, '=');
-        $this->assertEquals('A', $condition0.'');
-    }
-    /**
-     * @test
-     */
-    public function testToString03() {
-        $condition0 = new Condition(null, 'B', '=');
-        $this->assertEquals('B', $condition0.'');
-    }
-}
+<?php
+
+namespace WebFiori\Tests\Database\Common;
+use WebFiori\Database\Query\Condition;
+use PHPUnit\Framework\TestCase;
+/**
+ * Description of ConditionTest
+ *
+ * @author Ibrahim
+ */
+class ConditionTest extends TestCase{
+    /**
+     * @test
+     */
+    public function test00() {
+        $condition = new Condition('A', 'B', '=');
+        $this->assertEquals('A = B', $condition.'');
+    }
+    /**
+     * @test
+     */
+    public function testEquals00() {
+        $condition0 = new Condition('A', 'B', '=');
+        $condition1 = new Condition('A', 'B', '=');
+        $this->assertTrue($condition1->equals($condition0));
+    }
+    /**
+     * @test
+     */
+    public function testEquals01() {
+        $condition0 = new Condition('A ', 'B', '=');
+        $condition1 = new Condition('A', 'B', '=');
+        $this->assertFalse($condition1->equals($condition0));
+    }
+    /**
+     * @test
+     */
+    public function testEquals02() {
+        $condition0 = new Condition('B', 'A', '=');
+        $condition1 = new Condition('A', 'B', '=');
+        $this->assertFalse($condition1->equals($condition0));
+    }
+    /**
+     * @test
+     */
+    public function testToString00() {
+        $condition0 = new Condition('B', 'A', '=');
+        $this->assertEquals('B = A', $condition0.'');
+    }
+    /**
+     * @test
+     */
+    public function testToString01() {
+        $condition0 = new Condition(null, null, '=');
+        $this->assertEquals('', $condition0.'');
+    }
+    /**
+     * @test
+     */
+    public function testToString02() {
+        $condition0 = new Condition('A', null, '=');
+        $this->assertEquals('A', $condition0.'');
+    }
+    /**
+     * @test
+     */
+    public function testToString03() {
+        $condition0 = new Condition(null, 'B', '=');
+        $this->assertEquals('B', $condition0.'');
+    }
+}
diff --git a/tests/WebFiori/Tests/Database/Common/EntityMapperTest.php b/tests/WebFiori/Tests/Database/Common/EntityMapperTest.php
index b4277b35..3762323a 100644
--- a/tests/WebFiori/Tests/Database/Common/EntityMapperTest.php
+++ b/tests/WebFiori/Tests/Database/Common/EntityMapperTest.php
@@ -1,169 +1,169 @@
-<?php
-namespace WebFiori\Tests\Database\Common;
-
-use PHPUnit\Framework\TestCase;
-use UserClass;
-use WebFiori\Database\ColOption;
-use WebFiori\Database\DataType;
-use WebFiori\Database\Entity\EntityMapper;
-use WebFiori\Tests\Database\MySql\MySQLTestSchema;
-
-/**
- * Description of EntityMapperTest
- *
- * @author Ibrahim
- */
-class EntityMapperTest extends TestCase {
-    /**
-     * @test
-     */
-    public function test00() {
-        $schema = new MySQLTestSchema();
-        $t = $schema->getTable('users');
-        $t->addColumns([
-            'c-x-file' => [
-            ColOption::TYPE => DataType::BOOL
-            ]
-        ]);
-        $entityMapper = new EntityMapper($t, 'UserClass');
-        
-        $entityMapper->setPath(__DIR__);
-        $entityMapper->setUseJsonI(true);
-        $this->assertEquals('UserClass', $entityMapper->getEntityName());
-        $this->assertEquals('\UserClass', $entityMapper->getEntityName(true));
-        $this->assertEquals([
-            'age'=> 'age',
-            'first-name' => 'firstName',
-            'id' => 'id',
-            'last-name' => 'lastName',
-            'c-x-file' => 'cxFile'
-        ], $entityMapper->getAttribitesNames());
-        $this->assertEquals([
-            'setters' => [
-                'setAge',
-                'setCXFile',
-                'setFirstName',
-                'setId',
-                'setLastName',
-                
-            ],
-            'getters' => [
-                'getAge',
-                'getCXFile',
-                'getFirstName',
-                'getId',
-                'getLastName',
-                
-            ]
-        ], $entityMapper->getEntityMethods());
-        $this->assertEquals([
-            'setId' => 'id',
-            'setCXFile' => 'c_x_file',
-            'setFirstName' => 'first_name',
-            'setLastName' => 'last_name',
-            'setAge' => 'age',
-            
-        ], $entityMapper->getSettersMap());
-        $this->assertEquals([
-            'setId' => 'id',
-            'setCXFile' => 'c-x-file',
-            'setFirstName' => 'first-name',
-            'setLastName' => 'last-name',
-            'setAge' => 'age',
-            
-        ], $entityMapper->getSettersMap(true));
-        $this->assertEquals([
-            'getId' => 'id',
-            'getCXFile' => 'c_x_file',
-            'getFirstName' => 'first_name',
-            'getLastName' => 'last_name',
-            'getAge' => 'age',
-            
-        ], $entityMapper->getGettersMap());
-        
-        $this->assertEquals([
-            'getId' => 'id',
-            'getCXFile' => 'c-x-file',
-            'getFirstName' => 'first-name',
-            'getLastName' => 'last-name',
-            'getAge' => 'age',
-            
-        ], $entityMapper->getGettersMap(true));
-        
-        $entityMapper->addAttribute('extraAttribute');
-        $this->assertEquals([
-            'setters' => [
-                'setAge',
-                'setCXFile',
-                'setExtraAttribute',
-                'setFirstName',
-                'setId',
-                
-                'setLastName',
-                
-            ],
-            'getters' => [
-                'getAge',
-                'getCXFile',
-                'getExtraAttribute',
-                'getFirstName',
-                'getId',
-                'getLastName',
-                
-            ]
-        ], $entityMapper->getEntityMethods());
-        $this->assertTrue($entityMapper->create());
-        $this->assertFalse($entityMapper->setNamespace('\\A\\B'));
-        $this->assertFalse($entityMapper->setNamespace('6\\B'));
-        $this->assertFalse($entityMapper->setNamespace("A\\\\\B"));
-        $this->assertFalse($entityMapper->setNamespace('A\\$AX'));
-        return $entityMapper;
-    }
-    /**
-     * @test
-     * @depends test00
-     */
-    public function test02(EntityMapper $m) {
-        require_once __DIR__.DIRECTORY_SEPARATOR.'UserClass.php';
-        $recordsMapper = $m->getRecordMapper();
-        $this->assertEquals('\UserClass', $recordsMapper->getClass());
-        $this->assertEquals([
-            'setId' => ['id'],
-            'setFirstName' => ['first_name'],
-            'setLastName' => ['last_name'],
-            'setAge' => ['age'],
-            'setCXFile' => ['c_x_file']
-        ], $recordsMapper->getSettersMap());
-        $obj = $recordsMapper->map([
-            'id' => 55,
-            'first_name' => 'Ibrahim',
-            'last_name' => 'BinAlshikh',
-            'age' => 28
-        ]);
-        $this->assertTrue($obj instanceof UserClass);
-        $this->assertEquals(55, $obj->getId());
-        $this->assertEquals('Ibrahim', $obj->getFirstName());
-        $this->assertEquals('BinAlshikh', $obj->getLastName());
-        $this->assertEquals(28, $obj->getAge());
-        unlink(__DIR__.DIRECTORY_SEPARATOR.'UserClass.php');
-    }
-    /**
-     * @test
-     */
-    public function test01() {
-        $schema = new MySQLTestSchema();
-        $entityMapper = new EntityMapper($schema->getTable('users'), '', '', '');
-        $this->assertEquals('NewEntity', $entityMapper->getEntityName());
-        $this->assertEquals('', $entityMapper->getNamespace());
-        $this->assertFalse($entityMapper->addAttribute(''));
-        $this->assertFalse($entityMapper->addAttribute('0cool'));
-        $this->assertFalse($entityMapper->addAttribute('not valid'));
-        $this->assertFalse($entityMapper->addAttribute('also$not_valid'));
-        $this->assertTrue($entityMapper->addAttribute('validName'));
-        $this->assertFalse($entityMapper->addAttribute('validName  '));
-        $this->assertFalse($entityMapper->setEntityName('0Invalid'));
-        $this->assertFalse($entityMapper->setEntityName('Invalid Class Name'));
-        $this->assertTrue($entityMapper->setEntityName('ValidName'));
-        $this->assertFalse($entityMapper->setEntityName('Invalid%Name'));
-    }
-}
+<?php
+namespace WebFiori\Tests\Database\Common;
+
+use PHPUnit\Framework\TestCase;
+use UserClass;
+use WebFiori\Database\ColOption;
+use WebFiori\Database\DataType;
+use WebFiori\Database\Entity\EntityMapper;
+use WebFiori\Tests\Database\MySql\MySQLTestSchema;
+
+/**
+ * Description of EntityMapperTest
+ *
+ * @author Ibrahim
+ */
+class EntityMapperTest extends TestCase {
+    /**
+     * @test
+     */
+    public function test00() {
+        $schema = new MySQLTestSchema();
+        $t = $schema->getTable('users');
+        $t->addColumns([
+            'c-x-file' => [
+            ColOption::TYPE => DataType::BOOL
+            ]
+        ]);
+        $entityMapper = new EntityMapper($t, 'UserClass');
+        
+        $entityMapper->setPath(__DIR__);
+        $entityMapper->setUseJsonI(true);
+        $this->assertEquals('UserClass', $entityMapper->getEntityName());
+        $this->assertEquals('\UserClass', $entityMapper->getEntityName(true));
+        $this->assertEquals([
+            'age'=> 'age',
+            'first-name' => 'firstName',
+            'id' => 'id',
+            'last-name' => 'lastName',
+            'c-x-file' => 'cxFile'
+        ], $entityMapper->getAttribitesNames());
+        $this->assertEquals([
+            'setters' => [
+                'setAge',
+                'setCXFile',
+                'setFirstName',
+                'setId',
+                'setLastName',
+                
+            ],
+            'getters' => [
+                'getAge',
+                'getCXFile',
+                'getFirstName',
+                'getId',
+                'getLastName',
+                
+            ]
+        ], $entityMapper->getEntityMethods());
+        $this->assertEquals([
+            'setId' => 'id',
+            'setCXFile' => 'c_x_file',
+            'setFirstName' => 'first_name',
+            'setLastName' => 'last_name',
+            'setAge' => 'age',
+            
+        ], $entityMapper->getSettersMap());
+        $this->assertEquals([
+            'setId' => 'id',
+            'setCXFile' => 'c-x-file',
+            'setFirstName' => 'first-name',
+            'setLastName' => 'last-name',
+            'setAge' => 'age',
+            
+        ], $entityMapper->getSettersMap(true));
+        $this->assertEquals([
+            'getId' => 'id',
+            'getCXFile' => 'c_x_file',
+            'getFirstName' => 'first_name',
+            'getLastName' => 'last_name',
+            'getAge' => 'age',
+            
+        ], $entityMapper->getGettersMap());
+        
+        $this->assertEquals([
+            'getId' => 'id',
+            'getCXFile' => 'c-x-file',
+            'getFirstName' => 'first-name',
+            'getLastName' => 'last-name',
+            'getAge' => 'age',
+            
+        ], $entityMapper->getGettersMap(true));
+        
+        $entityMapper->addAttribute('extraAttribute');
+        $this->assertEquals([
+            'setters' => [
+                'setAge',
+                'setCXFile',
+                'setExtraAttribute',
+                'setFirstName',
+                'setId',
+                
+                'setLastName',
+                
+            ],
+            'getters' => [
+                'getAge',
+                'getCXFile',
+                'getExtraAttribute',
+                'getFirstName',
+                'getId',
+                'getLastName',
+                
+            ]
+        ], $entityMapper->getEntityMethods());
+        $this->assertTrue($entityMapper->create());
+        $this->assertFalse($entityMapper->setNamespace('\\A\\B'));
+        $this->assertFalse($entityMapper->setNamespace('6\\B'));
+        $this->assertFalse($entityMapper->setNamespace("A\\\\\B"));
+        $this->assertFalse($entityMapper->setNamespace('A\\$AX'));
+        return $entityMapper;
+    }
+    /**
+     * @test
+     * @depends test00
+     */
+    public function test02(EntityMapper $m) {
+        require_once __DIR__.DIRECTORY_SEPARATOR.'UserClass.php';
+        $recordsMapper = $m->getRecordMapper();
+        $this->assertEquals('\UserClass', $recordsMapper->getClass());
+        $this->assertEquals([
+            'setId' => ['id'],
+            'setFirstName' => ['first_name'],
+            'setLastName' => ['last_name'],
+            'setAge' => ['age'],
+            'setCXFile' => ['c_x_file']
+        ], $recordsMapper->getSettersMap());
+        $obj = $recordsMapper->map([
+            'id' => 55,
+            'first_name' => 'Ibrahim',
+            'last_name' => 'BinAlshikh',
+            'age' => 28
+        ]);
+        $this->assertTrue($obj instanceof UserClass);
+        $this->assertEquals(55, $obj->getId());
+        $this->assertEquals('Ibrahim', $obj->getFirstName());
+        $this->assertEquals('BinAlshikh', $obj->getLastName());
+        $this->assertEquals(28, $obj->getAge());
+        unlink(__DIR__.DIRECTORY_SEPARATOR.'UserClass.php');
+    }
+    /**
+     * @test
+     */
+    public function test01() {
+        $schema = new MySQLTestSchema();
+        $entityMapper = new EntityMapper($schema->getTable('users'), '', '', '');
+        $this->assertEquals('NewEntity', $entityMapper->getEntityName());
+        $this->assertEquals('', $entityMapper->getNamespace());
+        $this->assertFalse($entityMapper->addAttribute(''));
+        $this->assertFalse($entityMapper->addAttribute('0cool'));
+        $this->assertFalse($entityMapper->addAttribute('not valid'));
+        $this->assertFalse($entityMapper->addAttribute('also$not_valid'));
+        $this->assertTrue($entityMapper->addAttribute('validName'));
+        $this->assertFalse($entityMapper->addAttribute('validName  '));
+        $this->assertFalse($entityMapper->setEntityName('0Invalid'));
+        $this->assertFalse($entityMapper->setEntityName('Invalid Class Name'));
+        $this->assertTrue($entityMapper->setEntityName('ValidName'));
+        $this->assertFalse($entityMapper->setEntityName('Invalid%Name'));
+    }
+}
diff --git a/tests/WebFiori/Tests/Database/Common/ExpressionTest.php b/tests/WebFiori/Tests/Database/Common/ExpressionTest.php
index f57bf8eb..2d0bf774 100644
--- a/tests/WebFiori/Tests/Database/Common/ExpressionTest.php
+++ b/tests/WebFiori/Tests/Database/Common/ExpressionTest.php
@@ -1,181 +1,181 @@
-<?php
-namespace WebFiori\Tests\Database\Common;
-use PHPUnit\Framework\TestCase;
-use WebFiori\Database\Query\Expression;
-use WebFiori\Database\Query\WhereExpression;
-use WebFiori\Database\Query\Condition;
-use WebFiori\Database\Query\SelectExpression;
-use WebFiori\Database\MySql\MySQLTable;
-use WebFiori\Database\MsSql\MSSQLTable;
-/**
- * Description of ExpressionTest
- *
- * @author Ibrahim
- */
-class ExpressionTest extends TestCase {
-    /**
-     * @test
-     */
-    public function test00() {
-        $exp = new Expression('x = y');
-        $this->assertEquals('x = y', $exp->getValue());
-        $exp->setValue('z != 9');
-        $this->assertEquals('z != 9', $exp->getValue());
-    }
-    /**
-     * @test
-     */
-    public function testEquals00() {
-        $exp0 = new Expression('x = y');
-        $exp1 = new Expression('x = y');
-        $this->assertTrue($exp0->equals($exp1));
-        $exp0->setValue('z != 9');
-        $this->assertFalse($exp1->equals($exp0));
-    }
-    /**
-     * @test
-     */
-    public function testWhereExpression00() {
-        $expression = new WhereExpression();
-        $this->assertNull($expression->getCondition());
-        $this->assertEquals('', $expression->getJoinCondition());
-        $this->assertNull($expression->getParent());
-        $this->assertEquals('', $expression->getValue());
-    }
-    /**
-     * @test
-     */
-    public function testWhereExpression01() {
-        $expression = new WhereExpression();
-        $expression->addCondition(new Condition('A', 'B', '='), 'ok');
-        $this->assertNotNull($expression->getCondition());
-        $this->assertEquals('', $expression->getJoinCondition());
-        $this->assertNull($expression->getParent());
-        $this->assertEquals('A = B', $expression->getValue());
-        
-        $expression->addCondition(new Condition('C', 'D', '!='), 'and');
-        $this->assertEquals('A = B and C != D', $expression->getValue());
-        
-        $expression->addCondition(new Expression('count(*) = 100'), 'and');
-        $this->assertEquals('A = B and C != D and count(*) = 100', $expression->getValue());
-        return $expression;
-    }
-    /**
-     * @test
-     */
-    public function testSelectExpression00() {
-        $t = new MySQLTable();
-        $t->addColumns([
-            'col-0' => [], 'col-1' => [], 'col-2' => [], 'col-3' => []
-        ]);
-        $expression = new SelectExpression($t);
-        $this->assertFalse($expression->isInSelect('col-0'));
-        $this->assertEquals(0, $expression->getColsCount());
-        $this->assertEquals([], $expression->getColsKeys());
-        $this->assertEquals('*', $expression->getColsStr());
-        $this->assertEquals('', $expression->getGroupBy());
-        $this->assertEquals('', $expression->getOrderBy());
-        $this->assertEquals([], $expression->getSelectCols());
-        $this->assertEquals('select * from `new_table`', $expression->getValue());
-        
-        $expression->addColumn('col-0');
-        $this->assertTrue($expression->isInSelect('col-0'));
-        $this->assertEquals(1, $expression->getColsCount());
-        $this->assertEquals(['col-0'], $expression->getColsKeys());
-        $this->assertEquals('`new_table`.`col_0`', $expression->getColsStr());
-        $this->assertEquals('', $expression->getGroupBy());
-        $this->assertEquals('', $expression->getOrderBy());
-        $this->assertEquals([
-            'col-0' => [
-                'obj' => $t->getColByKey('col-0')
-            ]
-        ], $expression->getSelectCols());
-        $this->assertEquals('select `new_table`.`col_0` from `new_table`', $expression->getValue());
-        
-        $expression->addColumn('col-1', [
-            'as' => 'super_col',
-            'aggregate' => 'max'
-        ]);
-        $this->assertEquals(2, $expression->getColsCount());
-        $this->assertEquals(['col-0', 'col-1'], $expression->getColsKeys());
-        $this->assertEquals('`new_table`.`col_0`, max(`new_table`.`col_1`) as `super_col`', $expression->getColsStr());
-        $this->assertEquals('', $expression->getGroupBy());
-        $this->assertEquals('', $expression->getOrderBy());
-        $this->assertEquals([
-            'col-0' => [
-                'obj' => $t->getColByKey('col-0')
-            ],
-            'col-1' => [
-                'obj' => $t->getColByKey('col-1'),
-                'as' => 'super_col',
-                'aggregate' => 'max'
-            ]
-        ], $expression->getSelectCols());
-        $this->assertEquals('select `new_table`.`col_0`, max(`new_table`.`col_1`) as `super_col` from `new_table`', $expression->getValue());
-        $expression->removeCol('col-0');
-        $this->assertFalse($expression->isInSelect('col-0'));
-        $this->assertEquals('select max(`new_table`.`col_1`) as `super_col` from `new_table`', $expression->getValue());
-        $expression->groupBy('col-0');
-        $this->assertEquals(' group by `new_table`.`col_0`', $expression->getGroupBy());
-        $expression->groupBy('col-1');
-        $this->assertEquals(' group by `new_table`.`col_0`, `new_table`.`col_1`', $expression->getGroupBy());
-        
-        $expression->orderBy('col-0');
-        $this->assertEquals(' order by `new_table`.`col_0`', $expression->getOrderBy());
-        $expression->orderBy('col-1', 'd');
-        $this->assertEquals(' order by `new_table`.`col_0`, `new_table`.`col_1` desc', $expression->getOrderBy());
-        $expression->orderBy('col-2', 'a');
-        $this->assertEquals(' order by `new_table`.`col_0`, `new_table`.`col_1` desc, `new_table`.`col_2` asc', $expression->getOrderBy());
-    }
-    /**
-     * @test
-     */
-    public function testSelectExpression01() {
-        $t = new MySQLTable();
-        $t->addColumns([
-            'col-0' => [], 'col-1' => [], 'col-2' => [], 'col-3' => []
-        ]);
-        $expression = new SelectExpression($t);
-        $expression->addColumn('not-exist');
-        $this->assertEquals(1, $expression->getColsCount());
-        $this->assertEquals('select `new_table`.`not_exist` from `new_table`', $expression->getValue());
-    }
-    /**
-     * @test
-     */
-    public function testSelectExpression02() {
-        $t = new MySQLTable();
-        $t->addColumns([
-            'col-0' => [], 'col-1' => [], 'col-2' => [], 'col-3' => []
-        ]);
-        $expression = new SelectExpression($t);
-        $expression->orderBy('not-exist-1');
-        $expression->groupBy('not-exist-2');
-        $this->assertEquals(' order by `new_table`.`not_exist_1`', $expression->getOrderBy());
-        $this->assertEquals(' group by `new_table`.`not_exist_2`', $expression->getGroupBy());
-    }
-    /**
-     * @test
-     */
-    public function testSelectExpression04() {
-        $t = new MySQLTable();
-        $t->addColumns([
-            'col-0' => [], 'col-1' => [], 'col-2' => [], 'col-3' => []
-        ]);
-        $expression = new SelectExpression($t);
-        $expression->addWhere('col-1', null, '=');
-        $this->assertEquals(' where col-1 is null', $expression->getWhereStr());
-    }
-    /**
-     * @test
-     */
-    public function testSelectExpression05() {
-        $t = new MySQLTable();
-        $t->addColumns([
-            'col-0' => [], 'col-1' => [], 'col-2' => [], 'col-3' => []
-        ]);
-        $expression = new SelectExpression($t);
-        $expression->addWhere('col-1', null, '!=');
-        $this->assertEquals(' where col-1 is not null', $expression->getWhereStr());
-    }
-}
+<?php
+namespace WebFiori\Tests\Database\Common;
+use PHPUnit\Framework\TestCase;
+use WebFiori\Database\Query\Expression;
+use WebFiori\Database\Query\WhereExpression;
+use WebFiori\Database\Query\Condition;
+use WebFiori\Database\Query\SelectExpression;
+use WebFiori\Database\MySql\MySQLTable;
+use WebFiori\Database\MsSql\MSSQLTable;
+/**
+ * Description of ExpressionTest
+ *
+ * @author Ibrahim
+ */
+class ExpressionTest extends TestCase {
+    /**
+     * @test
+     */
+    public function test00() {
+        $exp = new Expression('x = y');
+        $this->assertEquals('x = y', $exp->getValue());
+        $exp->setValue('z != 9');
+        $this->assertEquals('z != 9', $exp->getValue());
+    }
+    /**
+     * @test
+     */
+    public function testEquals00() {
+        $exp0 = new Expression('x = y');
+        $exp1 = new Expression('x = y');
+        $this->assertTrue($exp0->equals($exp1));
+        $exp0->setValue('z != 9');
+        $this->assertFalse($exp1->equals($exp0));
+    }
+    /**
+     * @test
+     */
+    public function testWhereExpression00() {
+        $expression = new WhereExpression();
+        $this->assertNull($expression->getCondition());
+        $this->assertEquals('', $expression->getJoinCondition());
+        $this->assertNull($expression->getParent());
+        $this->assertEquals('', $expression->getValue());
+    }
+    /**
+     * @test
+     */
+    public function testWhereExpression01() {
+        $expression = new WhereExpression();
+        $expression->addCondition(new Condition('A', 'B', '='), 'ok');
+        $this->assertNotNull($expression->getCondition());
+        $this->assertEquals('', $expression->getJoinCondition());
+        $this->assertNull($expression->getParent());
+        $this->assertEquals('A = B', $expression->getValue());
+        
+        $expression->addCondition(new Condition('C', 'D', '!='), 'and');
+        $this->assertEquals('A = B and C != D', $expression->getValue());
+        
+        $expression->addCondition(new Expression('count(*) = 100'), 'and');
+        $this->assertEquals('A = B and C != D and count(*) = 100', $expression->getValue());
+        return $expression;
+    }
+    /**
+     * @test
+     */
+    public function testSelectExpression00() {
+        $t = new MySQLTable();
+        $t->addColumns([
+            'col-0' => [], 'col-1' => [], 'col-2' => [], 'col-3' => []
+        ]);
+        $expression = new SelectExpression($t);
+        $this->assertFalse($expression->isInSelect('col-0'));
+        $this->assertEquals(0, $expression->getColsCount());
+        $this->assertEquals([], $expression->getColsKeys());
+        $this->assertEquals('*', $expression->getColsStr());
+        $this->assertEquals('', $expression->getGroupBy());
+        $this->assertEquals('', $expression->getOrderBy());
+        $this->assertEquals([], $expression->getSelectCols());
+        $this->assertEquals('select * from `new_table`', $expression->getValue());
+        
+        $expression->addColumn('col-0');
+        $this->assertTrue($expression->isInSelect('col-0'));
+        $this->assertEquals(1, $expression->getColsCount());
+        $this->assertEquals(['col-0'], $expression->getColsKeys());
+        $this->assertEquals('`new_table`.`col_0`', $expression->getColsStr());
+        $this->assertEquals('', $expression->getGroupBy());
+        $this->assertEquals('', $expression->getOrderBy());
+        $this->assertEquals([
+            'col-0' => [
+                'obj' => $t->getColByKey('col-0')
+            ]
+        ], $expression->getSelectCols());
+        $this->assertEquals('select `new_table`.`col_0` from `new_table`', $expression->getValue());
+        
+        $expression->addColumn('col-1', [
+            'as' => 'super_col',
+            'aggregate' => 'max'
+        ]);
+        $this->assertEquals(2, $expression->getColsCount());
+        $this->assertEquals(['col-0', 'col-1'], $expression->getColsKeys());
+        $this->assertEquals('`new_table`.`col_0`, max(`new_table`.`col_1`) as `super_col`', $expression->getColsStr());
+        $this->assertEquals('', $expression->getGroupBy());
+        $this->assertEquals('', $expression->getOrderBy());
+        $this->assertEquals([
+            'col-0' => [
+                'obj' => $t->getColByKey('col-0')
+            ],
+            'col-1' => [
+                'obj' => $t->getColByKey('col-1'),
+                'as' => 'super_col',
+                'aggregate' => 'max'
+            ]
+        ], $expression->getSelectCols());
+        $this->assertEquals('select `new_table`.`col_0`, max(`new_table`.`col_1`) as `super_col` from `new_table`', $expression->getValue());
+        $expression->removeCol('col-0');
+        $this->assertFalse($expression->isInSelect('col-0'));
+        $this->assertEquals('select max(`new_table`.`col_1`) as `super_col` from `new_table`', $expression->getValue());
+        $expression->groupBy('col-0');
+        $this->assertEquals(' group by `new_table`.`col_0`', $expression->getGroupBy());
+        $expression->groupBy('col-1');
+        $this->assertEquals(' group by `new_table`.`col_0`, `new_table`.`col_1`', $expression->getGroupBy());
+        
+        $expression->orderBy('col-0');
+        $this->assertEquals(' order by `new_table`.`col_0`', $expression->getOrderBy());
+        $expression->orderBy('col-1', 'd');
+        $this->assertEquals(' order by `new_table`.`col_0`, `new_table`.`col_1` desc', $expression->getOrderBy());
+        $expression->orderBy('col-2', 'a');
+        $this->assertEquals(' order by `new_table`.`col_0`, `new_table`.`col_1` desc, `new_table`.`col_2` asc', $expression->getOrderBy());
+    }
+    /**
+     * @test
+     */
+    public function testSelectExpression01() {
+        $t = new MySQLTable();
+        $t->addColumns([
+            'col-0' => [], 'col-1' => [], 'col-2' => [], 'col-3' => []
+        ]);
+        $expression = new SelectExpression($t);
+        $expression->addColumn('not-exist');
+        $this->assertEquals(1, $expression->getColsCount());
+        $this->assertEquals('select `new_table`.`not_exist` from `new_table`', $expression->getValue());
+    }
+    /**
+     * @test
+     */
+    public function testSelectExpression02() {
+        $t = new MySQLTable();
+        $t->addColumns([
+            'col-0' => [], 'col-1' => [], 'col-2' => [], 'col-3' => []
+        ]);
+        $expression = new SelectExpression($t);
+        $expression->orderBy('not-exist-1');
+        $expression->groupBy('not-exist-2');
+        $this->assertEquals(' order by `new_table`.`not_exist_1`', $expression->getOrderBy());
+        $this->assertEquals(' group by `new_table`.`not_exist_2`', $expression->getGroupBy());
+    }
+    /**
+     * @test
+     */
+    public function testSelectExpression04() {
+        $t = new MySQLTable();
+        $t->addColumns([
+            'col-0' => [], 'col-1' => [], 'col-2' => [], 'col-3' => []
+        ]);
+        $expression = new SelectExpression($t);
+        $expression->addWhere('col-1', null, '=');
+        $this->assertEquals(' where col-1 is null', $expression->getWhereStr());
+    }
+    /**
+     * @test
+     */
+    public function testSelectExpression05() {
+        $t = new MySQLTable();
+        $t->addColumns([
+            'col-0' => [], 'col-1' => [], 'col-2' => [], 'col-3' => []
+        ]);
+        $expression = new SelectExpression($t);
+        $expression->addWhere('col-1', null, '!=');
+        $this->assertEquals(' where col-1 is not null', $expression->getWhereStr());
+    }
+}
diff --git a/tests/WebFiori/Tests/Database/Common/HelloTable.php b/tests/WebFiori/Tests/Database/Common/HelloTable.php
index 8d1d8e5d..cfe9b17a 100644
--- a/tests/WebFiori/Tests/Database/Common/HelloTable.php
+++ b/tests/WebFiori/Tests/Database/Common/HelloTable.php
@@ -1,19 +1,19 @@
-<?php
-
-namespace WebFiori\Tests\Database\Common;
-
-use WebFiori\Database\MySql\MySQLTable;
-use WebFiori\Database\MySql\MySQLColumn;
-/**
- * Description of HelloTable
- *
- * @author Ibrahim
- */
-class HelloTable extends MySQLTable {
-    public function __construct() {
-        parent::__construct('hello');
-        $this->addColumn('user_id', new MySQLColumn('user_id', 'int', 11));
-        $this->addColumn('username', new MySQLColumn('username', 'varchar', 15));
-        $this->addColumn('pass', new MySQLColumn('password', 'varchar', 64));
-    }
-}
+<?php
+
+namespace WebFiori\Tests\Database\Common;
+
+use WebFiori\Database\MySql\MySQLTable;
+use WebFiori\Database\MySql\MySQLColumn;
+/**
+ * Description of HelloTable
+ *
+ * @author Ibrahim
+ */
+class HelloTable extends MySQLTable {
+    public function __construct() {
+        parent::__construct('hello');
+        $this->addColumn('user_id', new MySQLColumn('user_id', 'int', 11));
+        $this->addColumn('username', new MySQLColumn('username', 'varchar', 15));
+        $this->addColumn('pass', new MySQLColumn('password', 'varchar', 64));
+    }
+}
diff --git a/tests/WebFiori/Tests/Database/Common/RecordMapperTest.php b/tests/WebFiori/Tests/Database/Common/RecordMapperTest.php
index 6d370e1c..84b2fd80 100644
--- a/tests/WebFiori/Tests/Database/Common/RecordMapperTest.php
+++ b/tests/WebFiori/Tests/Database/Common/RecordMapperTest.php
@@ -1,86 +1,86 @@
-<?php
-namespace WebFiori\Tests\Database\Common;
-
-use PHPUnit\Framework\TestCase;
-use WebFiori\Database\Entity\RecordMapper;
-use WebFiori\Tests\User;
-/**
- * Description of RecordMapperTest
- *
- * @author Ibrahim
- */
-class RecordMapperTest extends TestCase {
-    /**
-     * @test
-     */
-    public function test00() {
-        $mapper = new RecordMapper();
-        $this->assertEquals([], $mapper->getSettersMap());
-        $this->assertEquals('', $mapper->getClass());
-        $mapper->addSetterMap('');
-        $this->assertEquals([], $mapper->getSettersMap());
-        $mapper->addSetterMap('  ');
-        $this->assertEquals([], $mapper->getSettersMap());
-    }
-    /**
-     * @test
-     */
-    public function test01() {
-        $mapper = new RecordMapper();
-        $mapper->addSetterMap('id');
-        $this->assertEquals([
-            'setId' => ['id']
-        ], $mapper->getSettersMap());
-        $mapper->addSetterMap('  email_address');
-        $this->assertEquals([
-            'setId' => ['id'],
-            'setEmailAddress' => ['email_address']
-        ], $mapper->getSettersMap());
-        $mapper->addSetterMap('c_file_x');
-        $this->assertEquals([
-            'setId' => ['id'],
-            'setEmailAddress' => ['email_address'],
-            'setCFileX' => ['c_file_x']
-        ], $mapper->getSettersMap());
-        $mapper->addSetterMap('user_id', 'setId');
-        $this->assertEquals([
-            'setId' => ['id', 'user_id'],
-            'setEmailAddress' => ['email_address'],
-            'setCFileX' => ['c_file_x']
-        ], $mapper->getSettersMap());
-    }
-    /**
-     * @test
-     */
-    public function test02() {
-        $mapper = new RecordMapper(User::class, [
-            'id',
-            'email',
-            'username'
-        ]);
-        $user = $mapper->map([
-            'id' => 44,
-            'email' => 'ib@gg.com',
-            'username' => 'Ibrahim'
-        ]);
-        $this->assertTrue($user instanceof User);
-        $this->assertEquals('ID:  Name:  Email: ib@gg.com Username: Super User', $user.'');
-        $mapper->addSetterMap('id', 'setUserID');
-        $user = $mapper->map([
-            'id' => 44,
-            'email' => 'ib@gg.com',
-            'username' => 'Ibrahim'
-        ]);
-        $this->assertTrue($user instanceof User);
-        $this->assertEquals('ID: 44 Name:  Email: ib@gg.com Username: Super User', $user.'');
-    }
-    /**
-     * @test
-     */
-    public function test03() {
-        $this->expectException(\WebFiori\Database\DatabaseException::class);
-        $this->expectExceptionMessage('Class not found: throwException');
-        $mapper = new RecordMapper('throwException');
-        
-    }
-}
+<?php
+namespace WebFiori\Tests\Database\Common;
+
+use PHPUnit\Framework\TestCase;
+use WebFiori\Database\Entity\RecordMapper;
+use WebFiori\Tests\User;
+/**
+ * Description of RecordMapperTest
+ *
+ * @author Ibrahim
+ */
+class RecordMapperTest extends TestCase {
+    /**
+     * @test
+     */
+    public function test00() {
+        $mapper = new RecordMapper();
+        $this->assertEquals([], $mapper->getSettersMap());
+        $this->assertEquals('', $mapper->getClass());
+        $mapper->addSetterMap('');
+        $this->assertEquals([], $mapper->getSettersMap());
+        $mapper->addSetterMap('  ');
+        $this->assertEquals([], $mapper->getSettersMap());
+    }
+    /**
+     * @test
+     */
+    public function test01() {
+        $mapper = new RecordMapper();
+        $mapper->addSetterMap('id');
+        $this->assertEquals([
+            'setId' => ['id']
+        ], $mapper->getSettersMap());
+        $mapper->addSetterMap('  email_address');
+        $this->assertEquals([
+            'setId' => ['id'],
+            'setEmailAddress' => ['email_address']
+        ], $mapper->getSettersMap());
+        $mapper->addSetterMap('c_file_x');
+        $this->assertEquals([
+            'setId' => ['id'],
+            'setEmailAddress' => ['email_address'],
+            'setCFileX' => ['c_file_x']
+        ], $mapper->getSettersMap());
+        $mapper->addSetterMap('user_id', 'setId');
+        $this->assertEquals([
+            'setId' => ['id', 'user_id'],
+            'setEmailAddress' => ['email_address'],
+            'setCFileX' => ['c_file_x']
+        ], $mapper->getSettersMap());
+    }
+    /**
+     * @test
+     */
+    public function test02() {
+        $mapper = new RecordMapper(User::class, [
+            'id',
+            'email',
+            'username'
+        ]);
+        $user = $mapper->map([
+            'id' => 44,
+            'email' => 'ib@gg.com',
+            'username' => 'Ibrahim'
+        ]);
+        $this->assertTrue($user instanceof User);
+        $this->assertEquals('ID:  Name:  Email: ib@gg.com Username: Super User', $user.'');
+        $mapper->addSetterMap('id', 'setUserID');
+        $user = $mapper->map([
+            'id' => 44,
+            'email' => 'ib@gg.com',
+            'username' => 'Ibrahim'
+        ]);
+        $this->assertTrue($user instanceof User);
+        $this->assertEquals('ID: 44 Name:  Email: ib@gg.com Username: Super User', $user.'');
+    }
+    /**
+     * @test
+     */
+    public function test03() {
+        $this->expectException(\WebFiori\Database\DatabaseException::class);
+        $this->expectExceptionMessage('Class not found: throwException');
+        $mapper = new RecordMapper('throwException');
+        
+    }
+}
diff --git a/tests/WebFiori/Tests/Database/Schema/SchemaAdvancedTest.php b/tests/WebFiori/Tests/Database/Schema/SchemaAdvancedTest.php
index 2c20c890..9123b76b 100644
--- a/tests/WebFiori/Tests/Database/Schema/SchemaAdvancedTest.php
+++ b/tests/WebFiori/Tests/Database/Schema/SchemaAdvancedTest.php
@@ -1,139 +1,139 @@
-<?php
-
-namespace WebFiori\Tests\Database\Schema;
-
-use PHPUnit\Framework\TestCase;
-use WebFiori\Database\ConnectionInfo;
-use WebFiori\Database\Database;
-use WebFiori\Database\DatabaseException;
-use WebFiori\Database\Schema\AbstractMigration;
-use WebFiori\Database\Schema\AbstractSeeder;
-use WebFiori\Database\Schema\SchemaRunner;
-use WebFiori\Tests\Database\Schema\TestMigration;
-use WebFiori\Tests\Database\Schema\TestSeeder;
-
-class SchemaAdvancedTest extends TestCase {
-
-    protected function tearDown(): void {
-        gc_collect_cycles();
-        parent::tearDown();
-    }
-    
-    private function getConnectionInfo(): ConnectionInfo {
-        return new ConnectionInfo('mysql', 'root', getenv('MYSQL_ROOT_PASSWORD'), 'testing_db', '127.0.0.1');
-    }
-    
-    public function testComplexDependencyChain() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        $runner->registerAll([TestMigration::class, TestSeeder::class]);
-        
-        $changes = $runner->getChanges();
-        $this->assertGreaterThan(0, count($changes), 'Should detect changes');
-    }
-    
-    public function testApplyAndRollbackSequence() {
-        try {
-            $runner = new SchemaRunner($this->getConnectionInfo());
-            $runner->registerAll([TestMigration::class, TestSeeder::class]);
-            try {
-                $runner->dropSchemaTable();
-            } catch (DatabaseException $ex) {
-                // Table might not exist, ignore
-            }
-            $runner->createSchemaTable();
-            
-            // Just test that we have changes registered
-            $changes = $runner->getChanges();
-            $this->assertCount(2, $changes);
-            
-            // Test apply - may return 0 if already applied
-            $applied = $runner->apply();
-            $this->assertInstanceOf(\WebFiori\Database\Schema\DatabaseChangeResult::class, $applied);
-            
-        } catch (DatabaseException $ex) {
-            $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
-        }
-    }
-    
-    public function testApplyOneByOne() {
-        try {
-            $runner = new SchemaRunner($this->getConnectionInfo());
-            $runner->registerAll([TestMigration::class, TestSeeder::class]);
-            $runner->createSchemaTable();
-            
-            $changes = $runner->getChanges();
-            $this->assertGreaterThan(0, count($changes));
-            
-            // Test that applyOne returns something or null (both are valid)
-            $applied = $runner->applyOne();
-            $this->assertTrue($applied === null || is_object($applied));
-        } catch (DatabaseException $ex) {
-            $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
-        }
-    }
-    
-    public function testMixedEnvironmentScenario() {
-        $runner = new SchemaRunner($this->getConnectionInfo(), 'production');
-        $runner->registerAll([TestMigration::class, TestSeeder::class]);
-        
-        $changes = $runner->getChanges();
-        $this->assertGreaterThan(0, count($changes));
-    }
-    
-    public function testSchemaTableOperations() {
-        try {
-            $runner = new SchemaRunner($this->getConnectionInfo());
-            
-            // Test creating schema table
-            $runner->createSchemaTable();
-            
-            // Clear any existing applied changes for clean test
-            $runner->table('schema_changes')->delete()->execute();
-            
-            // Verify table exists by trying to query it
-            $result = $runner->table('schema_changes')->select()->execute();
-            $this->assertNotNull($result);
-            
-            // Test dropping schema table
-            $runner->dropSchemaTable();
-            
-            // Verify table is dropped by expecting an exception
-            $this->expectException(DatabaseException::class);
-            $runner->table('schema_changes')->select()->execute();
-            
-        } catch (DatabaseException $ex) {
-            if (strpos($ex->getMessage(), 'connection') !== false) {
-                $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
-            } else {
-                // Re-throw if it's not a connection error
-                throw $ex;
-            }
-        }
-    }
-    
-    public function testCallbackExecutionOrder() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        
-        $callOrder = [];
-        
-        $runner->addOnErrorCallback(function($err, $change, $schema) use (&$callOrder) {
-            $callOrder[] = 'callback1';
-        });
-        
-        $runner->addOnErrorCallback(function($err, $change, $schema) use (&$callOrder) {
-            $callOrder[] = 'callback2';
-        });
-        
-        // Simulate error by accessing private property and triggering callbacks
-        $reflection = new \ReflectionClass($runner);
-        $property = $reflection->getProperty('onErrCallbacks');
-        $property->setAccessible(true);
-        $callbacks = $property->getValue($runner);
-        
-        foreach ($callbacks as $callback) {
-            call_user_func_array($callback, [new \Exception('test'), null, null]);
-        }
-        
-        $this->assertEquals(['callback1', 'callback2'], $callOrder);
-    }
-}
+<?php
+
+namespace WebFiori\Tests\Database\Schema;
+
+use PHPUnit\Framework\TestCase;
+use WebFiori\Database\ConnectionInfo;
+use WebFiori\Database\Database;
+use WebFiori\Database\DatabaseException;
+use WebFiori\Database\Schema\AbstractMigration;
+use WebFiori\Database\Schema\AbstractSeeder;
+use WebFiori\Database\Schema\SchemaRunner;
+use WebFiori\Tests\Database\Schema\TestMigration;
+use WebFiori\Tests\Database\Schema\TestSeeder;
+
+class SchemaAdvancedTest extends TestCase {
+
+    protected function tearDown(): void {
+        gc_collect_cycles();
+        parent::tearDown();
+    }
+    
+    private function getConnectionInfo(): ConnectionInfo {
+        return new ConnectionInfo('mysql', 'root', getenv('MYSQL_ROOT_PASSWORD'), 'testing_db', '127.0.0.1');
+    }
+    
+    public function testComplexDependencyChain() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        $runner->registerAll([TestMigration::class, TestSeeder::class]);
+        
+        $changes = $runner->getChanges();
+        $this->assertGreaterThan(0, count($changes), 'Should detect changes');
+    }
+    
+    public function testApplyAndRollbackSequence() {
+        try {
+            $runner = new SchemaRunner($this->getConnectionInfo());
+            $runner->registerAll([TestMigration::class, TestSeeder::class]);
+            try {
+                $runner->dropSchemaTable();
+            } catch (DatabaseException $ex) {
+                // Table might not exist, ignore
+            }
+            $runner->createSchemaTable();
+            
+            // Just test that we have changes registered
+            $changes = $runner->getChanges();
+            $this->assertCount(2, $changes);
+            
+            // Test apply - may return 0 if already applied
+            $applied = $runner->apply();
+            $this->assertInstanceOf(\WebFiori\Database\Schema\DatabaseChangeResult::class, $applied);
+            
+        } catch (DatabaseException $ex) {
+            $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
+        }
+    }
+    
+    public function testApplyOneByOne() {
+        try {
+            $runner = new SchemaRunner($this->getConnectionInfo());
+            $runner->registerAll([TestMigration::class, TestSeeder::class]);
+            $runner->createSchemaTable();
+            
+            $changes = $runner->getChanges();
+            $this->assertGreaterThan(0, count($changes));
+            
+            // Test that applyOne returns something or null (both are valid)
+            $applied = $runner->applyOne();
+            $this->assertTrue($applied === null || is_object($applied));
+        } catch (DatabaseException $ex) {
+            $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
+        }
+    }
+    
+    public function testMixedEnvironmentScenario() {
+        $runner = new SchemaRunner($this->getConnectionInfo(), 'production');
+        $runner->registerAll([TestMigration::class, TestSeeder::class]);
+        
+        $changes = $runner->getChanges();
+        $this->assertGreaterThan(0, count($changes));
+    }
+    
+    public function testSchemaTableOperations() {
+        try {
+            $runner = new SchemaRunner($this->getConnectionInfo());
+            
+            // Test creating schema table
+            $runner->createSchemaTable();
+            
+            // Clear any existing applied changes for clean test
+            $runner->table('schema_changes')->delete()->execute();
+            
+            // Verify table exists by trying to query it
+            $result = $runner->table('schema_changes')->select()->execute();
+            $this->assertNotNull($result);
+            
+            // Test dropping schema table
+            $runner->dropSchemaTable();
+            
+            // Verify table is dropped by expecting an exception
+            $this->expectException(DatabaseException::class);
+            $runner->table('schema_changes')->select()->execute();
+            
+        } catch (DatabaseException $ex) {
+            if (strpos($ex->getMessage(), 'connection') !== false) {
+                $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
+            } else {
+                // Re-throw if it's not a connection error
+                throw $ex;
+            }
+        }
+    }
+    
+    public function testCallbackExecutionOrder() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        
+        $callOrder = [];
+        
+        $runner->addOnErrorCallback(function($err, $change, $schema) use (&$callOrder) {
+            $callOrder[] = 'callback1';
+        });
+        
+        $runner->addOnErrorCallback(function($err, $change, $schema) use (&$callOrder) {
+            $callOrder[] = 'callback2';
+        });
+        
+        // Simulate error by accessing private property and triggering callbacks
+        $reflection = new \ReflectionClass($runner);
+        $property = $reflection->getProperty('onErrCallbacks');
+        $property->setAccessible(true);
+        $callbacks = $property->getValue($runner);
+        
+        foreach ($callbacks as $callback) {
+            call_user_func_array($callback, [new \Exception('test'), null, null]);
+        }
+        
+        $this->assertEquals(['callback1', 'callback2'], $callOrder);
+    }
+}
diff --git a/tests/WebFiori/Tests/Database/Schema/SchemaDependencyTest.php b/tests/WebFiori/Tests/Database/Schema/SchemaDependencyTest.php
index 90de724b..28e35044 100644
--- a/tests/WebFiori/Tests/Database/Schema/SchemaDependencyTest.php
+++ b/tests/WebFiori/Tests/Database/Schema/SchemaDependencyTest.php
@@ -1,226 +1,226 @@
-<?php
-
-namespace WebFiori\Tests\Database\Schema;
-
-use PHPUnit\Framework\TestCase;
-use WebFiori\Database\ConnectionInfo;
-use WebFiori\Database\Database;
-use WebFiori\Database\DatabaseException;
-use WebFiori\Database\Schema\AbstractMigration;
-use WebFiori\Database\Schema\AbstractSeeder;
-use WebFiori\Database\Schema\SchemaRunner;
-use WebFiori\Tests\Database\Schema\TestMigration;
-use WebFiori\Tests\Database\Schema\TestSeeder;
-use WebFiori\Database\ColOption;
-
-class TestMigrationA extends AbstractMigration {
-    
-    public function up(Database $db): void {
-        $this->execute($db);
-        
-    }
-    
-    public function down(Database $db): void {
-        $this->rollback($db);
-        
-    }    public function execute(Database $db): void {
-        $db->createBlueprint('table_a')->addColumns([
-            'id' => [ColOption::TYPE => 'int', ColOption::PRIMARY => true, ColOption::AUTO_INCREMENT => true]
-        ]);
-        $db->createTables();
-        $db->execute();
-    }
-    
-    public function rollback(Database $db): void {
-        $db->table('table_a')->drop()->execute();
-    }
-}
-
-class TestMigrationB extends AbstractMigration {
-    public function getDependencies(): array {
-        return ['TestMigrationA'];
-    }
-    
-    public function up(Database $db): void {
-        $this->execute($db);
-        
-    }
-    
-    public function down(Database $db): void {
-        $this->rollback($db);
-        
-    }    
-    public function execute(Database $db): void {
-        $db->createBlueprint('table_b')->addColumns([
-            'id' => [ColOption::TYPE => 'int', ColOption::PRIMARY => true, ColOption::AUTO_INCREMENT => true],
-            'a_id' => [ColOption::TYPE => 'int']
-        ]);
-        $db->createTables();
-        $db->execute();
-    }
-    
-    public function rollback(Database $db): void {
-        $db->table('table_b')->drop()->execute();
-    }
-}
-
-class TestSeederForA extends AbstractSeeder {
-    public function getDependencies(): array {
-        return ['TestMigrationA'];
-    }
-    
-    public function getEnvironments(): array {
-        return ['dev', 'test'];
-    }
-    
-    public function run(Database $db): void {
-        $this->execute($db);
-        
-    }    
-    public function execute(Database $db): void {
-        $db->table('table_a')->insert(['id' => 1])->execute();
-    }
-    
-    public function rollback(Database $db): void {
-        $db->table('table_a')->delete()->where('id', 1)->execute();
-    }
-}
-
-class SchemaDependencyTest extends TestCase {
-
-    protected function tearDown(): void {
-        gc_collect_cycles();
-        parent::tearDown();
-    }
-    
-    private function getConnectionInfo(): ConnectionInfo {
-        return new ConnectionInfo('mysql', 'root', getenv('MYSQL_ROOT_PASSWORD'), 'testing_db', '127.0.0.1');
-    }
-    
-    public function testDependencyOrdering() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        
-        $changes = $runner->getChanges();
-        $changeNames = array_map(function($change) {
-            return $change->getName();
-        }, $changes);
-        
-        // TestMigration should come before TestSeeder due to dependency
-        $migrationIndex = array_search('TestMigration', $changeNames);
-        $seederIndex = array_search('TestSeeder', $changeNames);
-        
-        $this->assertIsArray($changes, 'Changes should be an array');
-        $this->assertGreaterThanOrEqual(0, count($changes), 'Should have zero or more changes');
-        
-        if ($migrationIndex !== false && $seederIndex !== false) {
-            $this->assertLessThan($seederIndex, $migrationIndex, 'Migration should come before seeder');
-        }
-    }
-    
-    public function testEnvironmentFiltering() {
-        $devRunner = new SchemaRunner($this->getConnectionInfo(), 'dev');
-        $devRunner->registerAll([TestMigration::class, TestSeeder::class]);
-        
-        $prodRunner = new SchemaRunner($this->getConnectionInfo(), 'production');
-        $prodRunner->register(TestMigration::class);
-        
-        $this->assertCount(2, $devRunner->getChanges());
-        $this->assertCount(1, $prodRunner->getChanges());
-    }
-    
-    public function testIsAppliedMethod() {
-        try {
-            $runner = new SchemaRunner($this->getConnectionInfo());
-            $runner->createSchemaTable();
-            
-            // Initially nothing should be applied
-            $this->assertFalse($runner->isApplied('TestMigration'));
-            
-            // Apply one change
-            $change = $runner->applyOne();
-            
-            if ($change !== null) {
-                $this->assertTrue($runner->isApplied($change->getName()));
-            }
-            
-            $runner->dropSchemaTable();
-        } catch (DatabaseException $ex) {
-            $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
-        }
-    }
-    
-    public function testClassSyntaxDependency() {
-        // Test that TestMigration3 can be instantiated and has correct dependencies
-        $migration3 = new TestMigration3();
-        $dependencies = $migration3->getDependencies();
-        
-        $this->assertIsArray($dependencies, 'Dependencies should be an array');
-        $this->assertContains('WebFiori\\Tests\\Database\\Schema\\TestMigration', $dependencies, 'Should contain TestMigration using ::class syntax');
-        $this->assertEquals('WebFiori\\Tests\\Database\\Schema\\TestMigration3', $migration3->getName(), 'Should have correct name');
-    }
-    
-    public function testEmptyChangesArray() {
-        // Create empty directory
-        $tempDir = sys_get_temp_dir() . '/empty_schema_' . uniqid();
-        mkdir($tempDir);
-        
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        
-        $changes = $runner->getChanges();
-        $this->assertIsArray($changes);
-        $this->assertEmpty($changes);
-        
-        // Clean up
-        rmdir($tempDir);
-    }
-    
-    public function testRollbackWithEmptyChanges() {
-        // Create empty directory
-        $tempDir = sys_get_temp_dir() . '/empty_schema_' . uniqid();
-        mkdir($tempDir);
-        
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        
-        $rolled = $runner->rollbackUpTo(null);
-        $this->assertIsArray($rolled);
-        $this->assertEmpty($rolled);
-        
-        // Clean up
-        rmdir($tempDir);
-    }
-
-    // Case Sensitivity Issues in Dependencies
-    public function testCaseSensitiveDependencyMatching() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        $runner->registerAll([TestMigration::class, TestSeeder::class]);
-        
-        $changes = $runner->getChanges();
-        $this->assertCount(2, $changes);
-    }
-
-    // Complex Dependency Chain Issues
-    public function testDeepDependencyChainResolution() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        $runner->registerAll([TestMigration::class, TestSeeder::class]);
-        
-        $changes = $runner->getChanges();
-        $this->assertCount(2, $changes);
-    }
-
-    // Dependency Resolution with Mixed Types
-    public function testMixedMigrationSeederDependencies() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        $runner->registerAll([TestMigration::class, TestSeeder::class]);
-        
-        $changes = $runner->getChanges();
-        $this->assertCount(2, $changes);
-    }
-
-    public function testCircularDependencyInLargeChain() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        $runner->registerAll([TestMigration::class, TestSeeder::class]);
-        
-        $changes = $runner->getChanges();
-        $this->assertCount(2, $changes);
-    }
-}
+<?php
+
+namespace WebFiori\Tests\Database\Schema;
+
+use PHPUnit\Framework\TestCase;
+use WebFiori\Database\ConnectionInfo;
+use WebFiori\Database\Database;
+use WebFiori\Database\DatabaseException;
+use WebFiori\Database\Schema\AbstractMigration;
+use WebFiori\Database\Schema\AbstractSeeder;
+use WebFiori\Database\Schema\SchemaRunner;
+use WebFiori\Tests\Database\Schema\TestMigration;
+use WebFiori\Tests\Database\Schema\TestSeeder;
+use WebFiori\Database\ColOption;
+
+class TestMigrationA extends AbstractMigration {
+    
+    public function up(Database $db): void {
+        $this->execute($db);
+        
+    }
+    
+    public function down(Database $db): void {
+        $this->rollback($db);
+        
+    }    public function execute(Database $db): void {
+        $db->createBlueprint('table_a')->addColumns([
+            'id' => [ColOption::TYPE => 'int', ColOption::PRIMARY => true, ColOption::AUTO_INCREMENT => true]
+        ]);
+        $db->createTables();
+        $db->execute();
+    }
+    
+    public function rollback(Database $db): void {
+        $db->table('table_a')->drop()->execute();
+    }
+}
+
+class TestMigrationB extends AbstractMigration {
+    public function getDependencies(): array {
+        return ['TestMigrationA'];
+    }
+    
+    public function up(Database $db): void {
+        $this->execute($db);
+        
+    }
+    
+    public function down(Database $db): void {
+        $this->rollback($db);
+        
+    }    
+    public function execute(Database $db): void {
+        $db->createBlueprint('table_b')->addColumns([
+            'id' => [ColOption::TYPE => 'int', ColOption::PRIMARY => true, ColOption::AUTO_INCREMENT => true],
+            'a_id' => [ColOption::TYPE => 'int']
+        ]);
+        $db->createTables();
+        $db->execute();
+    }
+    
+    public function rollback(Database $db): void {
+        $db->table('table_b')->drop()->execute();
+    }
+}
+
+class TestSeederForA extends AbstractSeeder {
+    public function getDependencies(): array {
+        return ['TestMigrationA'];
+    }
+    
+    public function getEnvironments(): array {
+        return ['dev', 'test'];
+    }
+    
+    public function run(Database $db): void {
+        $this->execute($db);
+        
+    }    
+    public function execute(Database $db): void {
+        $db->table('table_a')->insert(['id' => 1])->execute();
+    }
+    
+    public function rollback(Database $db): void {
+        $db->table('table_a')->delete()->where('id', 1)->execute();
+    }
+}
+
+class SchemaDependencyTest extends TestCase {
+
+    protected function tearDown(): void {
+        gc_collect_cycles();
+        parent::tearDown();
+    }
+    
+    private function getConnectionInfo(): ConnectionInfo {
+        return new ConnectionInfo('mysql', 'root', getenv('MYSQL_ROOT_PASSWORD'), 'testing_db', '127.0.0.1');
+    }
+    
+    public function testDependencyOrdering() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        
+        $changes = $runner->getChanges();
+        $changeNames = array_map(function($change) {
+            return $change->getName();
+        }, $changes);
+        
+        // TestMigration should come before TestSeeder due to dependency
+        $migrationIndex = array_search('TestMigration', $changeNames);
+        $seederIndex = array_search('TestSeeder', $changeNames);
+        
+        $this->assertIsArray($changes, 'Changes should be an array');
+        $this->assertGreaterThanOrEqual(0, count($changes), 'Should have zero or more changes');
+        
+        if ($migrationIndex !== false && $seederIndex !== false) {
+            $this->assertLessThan($seederIndex, $migrationIndex, 'Migration should come before seeder');
+        }
+    }
+    
+    public function testEnvironmentFiltering() {
+        $devRunner = new SchemaRunner($this->getConnectionInfo(), 'dev');
+        $devRunner->registerAll([TestMigration::class, TestSeeder::class]);
+        
+        $prodRunner = new SchemaRunner($this->getConnectionInfo(), 'production');
+        $prodRunner->register(TestMigration::class);
+        
+        $this->assertCount(2, $devRunner->getChanges());
+        $this->assertCount(1, $prodRunner->getChanges());
+    }
+    
+    public function testIsAppliedMethod() {
+        try {
+            $runner = new SchemaRunner($this->getConnectionInfo());
+            $runner->createSchemaTable();
+            
+            // Initially nothing should be applied
+            $this->assertFalse($runner->isApplied('TestMigration'));
+            
+            // Apply one change
+            $change = $runner->applyOne();
+            
+            if ($change !== null) {
+                $this->assertTrue($runner->isApplied($change->getName()));
+            }
+            
+            $runner->dropSchemaTable();
+        } catch (DatabaseException $ex) {
+            $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
+        }
+    }
+    
+    public function testClassSyntaxDependency() {
+        // Test that TestMigration3 can be instantiated and has correct dependencies
+        $migration3 = new TestMigration3();
+        $dependencies = $migration3->getDependencies();
+        
+        $this->assertIsArray($dependencies, 'Dependencies should be an array');
+        $this->assertContains('WebFiori\\Tests\\Database\\Schema\\TestMigration', $dependencies, 'Should contain TestMigration using ::class syntax');
+        $this->assertEquals('WebFiori\\Tests\\Database\\Schema\\TestMigration3', $migration3->getName(), 'Should have correct name');
+    }
+    
+    public function testEmptyChangesArray() {
+        // Create empty directory
+        $tempDir = sys_get_temp_dir() . '/empty_schema_' . uniqid();
+        mkdir($tempDir);
+        
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        
+        $changes = $runner->getChanges();
+        $this->assertIsArray($changes);
+        $this->assertEmpty($changes);
+        
+        // Clean up
+        rmdir($tempDir);
+    }
+    
+    public function testRollbackWithEmptyChanges() {
+        // Create empty directory
+        $tempDir = sys_get_temp_dir() . '/empty_schema_' . uniqid();
+        mkdir($tempDir);
+        
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        
+        $rolled = $runner->rollbackUpTo(null);
+        $this->assertIsArray($rolled);
+        $this->assertEmpty($rolled);
+        
+        // Clean up
+        rmdir($tempDir);
+    }
+
+    // Case Sensitivity Issues in Dependencies
+    public function testCaseSensitiveDependencyMatching() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        $runner->registerAll([TestMigration::class, TestSeeder::class]);
+        
+        $changes = $runner->getChanges();
+        $this->assertCount(2, $changes);
+    }
+
+    // Complex Dependency Chain Issues
+    public function testDeepDependencyChainResolution() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        $runner->registerAll([TestMigration::class, TestSeeder::class]);
+        
+        $changes = $runner->getChanges();
+        $this->assertCount(2, $changes);
+    }
+
+    // Dependency Resolution with Mixed Types
+    public function testMixedMigrationSeederDependencies() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        $runner->registerAll([TestMigration::class, TestSeeder::class]);
+        
+        $changes = $runner->getChanges();
+        $this->assertCount(2, $changes);
+    }
+
+    public function testCircularDependencyInLargeChain() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        $runner->registerAll([TestMigration::class, TestSeeder::class]);
+        
+        $changes = $runner->getChanges();
+        $this->assertCount(2, $changes);
+    }
+}
diff --git a/tests/WebFiori/Tests/Database/Schema/SchemaErrorHandlingTest.php b/tests/WebFiori/Tests/Database/Schema/SchemaErrorHandlingTest.php
index 87f99817..7bea6c14 100644
--- a/tests/WebFiori/Tests/Database/Schema/SchemaErrorHandlingTest.php
+++ b/tests/WebFiori/Tests/Database/Schema/SchemaErrorHandlingTest.php
@@ -1,239 +1,239 @@
-<?php
-
-namespace WebFiori\Tests\Database\Schema;
-
-use PHPUnit\Framework\TestCase;
-use WebFiori\Database\ConnectionInfo;
-use WebFiori\Database\Database;
-use WebFiori\Database\DatabaseException;
-use WebFiori\Database\Schema\SchemaRunner;
-use WebFiori\Tests\Database\Schema\TestMigration;
-use WebFiori\Tests\Database\Schema\TestSeeder;
-
-class SchemaErrorHandlingTest extends TestCase {
-
-    protected function tearDown(): void {
-        gc_collect_cycles();
-        parent::tearDown();
-    }
-    
-    private function getConnectionInfo(): ConnectionInfo {
-        return new ConnectionInfo('mysql', 'root', getenv('MYSQL_ROOT_PASSWORD'), 'testing_db', '127.0.0.1');
-    }
-    
-    public function testRollbackErrorStopsExecution() {
-        try {
-            $runner = new SchemaRunner($this->getConnectionInfo());
-            $runner->createSchemaTable();
-            
-            // Clear any existing applied changes for clean test
-            $runner->table('schema_changes')->delete()->execute();
-            
-            // Apply changes first
-            $applied = $runner->apply();
-            
-            if (!empty($applied->getApplied())) {
-                $errorCaught = false;
-                $runner->addOnErrorCallback(function($err, $change, $schema) use (&$errorCaught) {
-                    $errorCaught = true;
-                });
-                
-                // Create a failing rollback scenario by dropping the table first
-                $runner->table('user_profiles')->drop()->execute();
-                
-                // Now try to rollback - should fail and stop
-                $rolled = $runner->rollbackUpTo(null);
-                
-                // Should have caught error and stopped
-                $this->assertTrue($errorCaught);
-                $this->assertIsArray($rolled);
-            } else {
-                $this->assertTrue(true, 'No changes to rollback');
-            }
-            
-            $runner->dropSchemaTable();
-        } catch (DatabaseException $ex) {
-            $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
-        }
-    }
-    
-    public function testMultipleErrorCallbacks() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        
-        $callback1Called = false;
-        $callback2Called = false;
-        
-        $runner->addOnErrorCallback(function($err, $change, $schema) use (&$callback1Called) {
-            $callback1Called = true;
-        });
-        
-        $runner->addOnErrorCallback(function($err, $change, $schema) use (&$callback2Called) {
-            $callback2Called = true;
-        });
-        
-        // Simulate error by accessing private method
-        $reflection = new \ReflectionClass($runner);
-        $property = $reflection->getProperty('onErrCallbacks');
-        $property->setAccessible(true);
-        $callbacks = $property->getValue($runner);
-        
-        // Manually trigger callbacks to test
-        foreach ($callbacks as $callback) {
-            call_user_func_array($callback, [new \Exception('test'), null, null]);
-        }
-        
-        $this->assertTrue($callback1Called);
-        $this->assertTrue($callback2Called);
-    }
-    
-    public function testMultipleRegisterErrorCallbacks() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        
-        $callback1Called = false;
-        $callback2Called = false;
-        
-        $runner->addOnRegisterErrorCallback(function($err) use (&$callback1Called) {
-            $callback1Called = true;
-        });
-        
-        $runner->addOnRegisterErrorCallback(function($err) use (&$callback2Called) {
-            $callback2Called = true;
-        });
-        
-        // Simulate error by accessing private method
-        $reflection = new \ReflectionClass($runner);
-        $property = $reflection->getProperty('onRegErrCallbacks');
-        $property->setAccessible(true);
-        $callbacks = $property->getValue($runner);
-        
-        // Manually trigger callbacks to test
-        foreach ($callbacks as $callback) {
-            call_user_func_array($callback, [new \Exception('test')]);
-        }
-        
-        $this->assertTrue($callback1Called);
-        $this->assertTrue($callback2Called);
-    }
-
-    // Environment and Execution Issues
-    public function testEnvironmentFilteringSkipsChanges() {
-        $tempDir = sys_get_temp_dir() . '/schema_test_' . uniqid();
-        mkdir($tempDir, 0777, true);
-        
-        // Create migration for specific environment
-        file_put_contents($tempDir . '/ProdOnlyMigration.php', '<?php 
-        namespace TestNamespace;
-        class ProdOnlyMigration extends \\WebFiori\\Database\\Schema\\AbstractMigration { 
-            public function getEnvironments(): array { return ["prod"]; }
-            public function up($db): void {} 
-            public function down($db): void {} 
-        }');
-        
-        // Create runner for dev environment
-        $runner = new SchemaRunner($this->getConnectionInfo(), 'test');
-        
-        try {
-            $runner->createSchemaTable();
-            $applied = $runner->apply();
-            
-            // Should skip migration not for this environment
-            $this->assertEmpty($applied);
-            
-            $runner->dropSchemaTable();
-        } catch (DatabaseException $ex) {
-            $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
-        }
-        
-        // Cleanup
-        unlink($tempDir . '/ProdOnlyMigration.php');
-        rmdir($tempDir);
-    }
-
-    public function testDatabaseConnectionFailureDuringExecution() {
-        // Test that connection failures are handled properly
-        $badConnection = new ConnectionInfo('mysql', 'invalid_user', 'invalid_pass', 'invalid_db');
-        
-        $this->expectException(DatabaseException::class);
-        $this->expectExceptionMessage('Unable to connect to database');
-        
+<?php
+
+namespace WebFiori\Tests\Database\Schema;
+
+use PHPUnit\Framework\TestCase;
+use WebFiori\Database\ConnectionInfo;
+use WebFiori\Database\Database;
+use WebFiori\Database\DatabaseException;
+use WebFiori\Database\Schema\SchemaRunner;
+use WebFiori\Tests\Database\Schema\TestMigration;
+use WebFiori\Tests\Database\Schema\TestSeeder;
+
+class SchemaErrorHandlingTest extends TestCase {
+
+    protected function tearDown(): void {
+        gc_collect_cycles();
+        parent::tearDown();
+    }
+    
+    private function getConnectionInfo(): ConnectionInfo {
+        return new ConnectionInfo('mysql', 'root', getenv('MYSQL_ROOT_PASSWORD'), 'testing_db', '127.0.0.1');
+    }
+    
+    public function testRollbackErrorStopsExecution() {
+        try {
+            $runner = new SchemaRunner($this->getConnectionInfo());
+            $runner->createSchemaTable();
+            
+            // Clear any existing applied changes for clean test
+            $runner->table('schema_changes')->delete()->execute();
+            
+            // Apply changes first
+            $applied = $runner->apply();
+            
+            if (!empty($applied->getApplied())) {
+                $errorCaught = false;
+                $runner->addOnErrorCallback(function($err, $change, $schema) use (&$errorCaught) {
+                    $errorCaught = true;
+                });
+                
+                // Create a failing rollback scenario by dropping the table first
+                $runner->table('user_profiles')->drop()->execute();
+                
+                // Now try to rollback - should fail and stop
+                $rolled = $runner->rollbackUpTo(null);
+                
+                // Should have caught error and stopped
+                $this->assertTrue($errorCaught);
+                $this->assertIsArray($rolled);
+            } else {
+                $this->assertTrue(true, 'No changes to rollback');
+            }
+            
+            $runner->dropSchemaTable();
+        } catch (DatabaseException $ex) {
+            $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
+        }
+    }
+    
+    public function testMultipleErrorCallbacks() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        
+        $callback1Called = false;
+        $callback2Called = false;
+        
+        $runner->addOnErrorCallback(function($err, $change, $schema) use (&$callback1Called) {
+            $callback1Called = true;
+        });
+        
+        $runner->addOnErrorCallback(function($err, $change, $schema) use (&$callback2Called) {
+            $callback2Called = true;
+        });
+        
+        // Simulate error by accessing private method
+        $reflection = new \ReflectionClass($runner);
+        $property = $reflection->getProperty('onErrCallbacks');
+        $property->setAccessible(true);
+        $callbacks = $property->getValue($runner);
+        
+        // Manually trigger callbacks to test
+        foreach ($callbacks as $callback) {
+            call_user_func_array($callback, [new \Exception('test'), null, null]);
+        }
+        
+        $this->assertTrue($callback1Called);
+        $this->assertTrue($callback2Called);
+    }
+    
+    public function testMultipleRegisterErrorCallbacks() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        
+        $callback1Called = false;
+        $callback2Called = false;
+        
+        $runner->addOnRegisterErrorCallback(function($err) use (&$callback1Called) {
+            $callback1Called = true;
+        });
+        
+        $runner->addOnRegisterErrorCallback(function($err) use (&$callback2Called) {
+            $callback2Called = true;
+        });
+        
+        // Simulate error by accessing private method
+        $reflection = new \ReflectionClass($runner);
+        $property = $reflection->getProperty('onRegErrCallbacks');
+        $property->setAccessible(true);
+        $callbacks = $property->getValue($runner);
+        
+        // Manually trigger callbacks to test
+        foreach ($callbacks as $callback) {
+            call_user_func_array($callback, [new \Exception('test')]);
+        }
+        
+        $this->assertTrue($callback1Called);
+        $this->assertTrue($callback2Called);
+    }
+
+    // Environment and Execution Issues
+    public function testEnvironmentFilteringSkipsChanges() {
+        $tempDir = sys_get_temp_dir() . '/schema_test_' . uniqid();
+        mkdir($tempDir, 0777, true);
+        
+        // Create migration for specific environment
+        file_put_contents($tempDir . '/ProdOnlyMigration.php', '<?php 
+        namespace TestNamespace;
+        class ProdOnlyMigration extends \\WebFiori\\Database\\Schema\\AbstractMigration { 
+            public function getEnvironments(): array { return ["prod"]; }
+            public function up($db): void {} 
+            public function down($db): void {} 
+        }');
+        
+        // Create runner for dev environment
+        $runner = new SchemaRunner($this->getConnectionInfo(), 'test');
+        
+        try {
+            $runner->createSchemaTable();
+            $applied = $runner->apply();
+            
+            // Should skip migration not for this environment
+            $this->assertEmpty($applied);
+            
+            $runner->dropSchemaTable();
+        } catch (DatabaseException $ex) {
+            $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
+        }
+        
+        // Cleanup
+        unlink($tempDir . '/ProdOnlyMigration.php');
+        rmdir($tempDir);
+    }
+
+    public function testDatabaseConnectionFailureDuringExecution() {
+        // Test that connection failures are handled properly
+        $badConnection = new ConnectionInfo('mysql', 'invalid_user', 'invalid_pass', 'invalid_db');
+        
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage('Unable to connect to database');
+        
         $runner = new SchemaRunner($badConnection);
         // Trigger actual database connection attempt
-        $runner->createSchemaTable();
-    }
-
-    // Type Safety and Validation Issues
-    public function testNonDatabaseChangeClassIgnored() {
-        $tempDir = sys_get_temp_dir() . '/schema_test_' . uniqid();
-        mkdir($tempDir, 0777, true);
-        
-        // Create class that's not a DatabaseChange
-        file_put_contents($tempDir . '/NotAMigration.php', '<?php 
-        namespace TestNamespace;
-        class NotAMigration { 
-            public function up($db): void {} 
-        }');
-        
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        $changes = $runner->getChanges();
-        
-        // Should ignore non-DatabaseChange classes
-        $this->assertEmpty($changes);
-        
-        // Cleanup
-        unlink($tempDir . '/NotAMigration.php');
-        rmdir($tempDir);
-    }
-
-    public function testAbstractClassInstantiationError() {
-        $tempDir = sys_get_temp_dir() . '/schema_test_' . uniqid();
-        mkdir($tempDir, 0777, true);
-        
-        // Create abstract migration class
-        file_put_contents($tempDir . '/AbstractTestMigration.php', '<?php 
-        namespace TestNamespace;
-        abstract class AbstractTestMigration extends \\WebFiori\\Database\\Schema\\AbstractMigration { 
-            public function up($db): void {} 
-            public function down($db): void {} 
-        }');
-        
-        $errorCaught = false;
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        $runner->addOnRegisterErrorCallback(function($err) use (&$errorCaught) {
-            $errorCaught = true;
-        });
-        
-        $changes = $runner->getChanges();
-        
-        // Should handle abstract class error
-        $this->assertEmpty($changes);
-        
-        // Cleanup
-        unlink($tempDir . '/AbstractTestMigration.php');
-        rmdir($tempDir);
-    }
-
-    public function testIncompleteClassImplementation() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        $runner->registerAll([TestMigration::class, TestSeeder::class]);
-        
-        $changes = $runner->getChanges();
-        $this->assertCount(2, $changes);
-    }
-
-    // Performance and Memory Issues
-    public function testMemoryUsageWithManyMigrations() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        $runner->registerAll([TestMigration::class, TestSeeder::class]);
-        
-        $changes = $runner->getChanges();
-        $this->assertCount(2, $changes);
-    }
-
-    public function testRepeatedDirectoryScanningOverhead() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        $runner->registerAll([TestMigration::class, TestSeeder::class]);
-        
-        $changes = $runner->getChanges();
-        $this->assertCount(2, $changes);
-    }
-}
+        $runner->createSchemaTable();
+    }
+
+    // Type Safety and Validation Issues
+    public function testNonDatabaseChangeClassIgnored() {
+        $tempDir = sys_get_temp_dir() . '/schema_test_' . uniqid();
+        mkdir($tempDir, 0777, true);
+        
+        // Create class that's not a DatabaseChange
+        file_put_contents($tempDir . '/NotAMigration.php', '<?php 
+        namespace TestNamespace;
+        class NotAMigration { 
+            public function up($db): void {} 
+        }');
+        
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        $changes = $runner->getChanges();
+        
+        // Should ignore non-DatabaseChange classes
+        $this->assertEmpty($changes);
+        
+        // Cleanup
+        unlink($tempDir . '/NotAMigration.php');
+        rmdir($tempDir);
+    }
+
+    public function testAbstractClassInstantiationError() {
+        $tempDir = sys_get_temp_dir() . '/schema_test_' . uniqid();
+        mkdir($tempDir, 0777, true);
+        
+        // Create abstract migration class
+        file_put_contents($tempDir . '/AbstractTestMigration.php', '<?php 
+        namespace TestNamespace;
+        abstract class AbstractTestMigration extends \\WebFiori\\Database\\Schema\\AbstractMigration { 
+            public function up($db): void {} 
+            public function down($db): void {} 
+        }');
+        
+        $errorCaught = false;
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        $runner->addOnRegisterErrorCallback(function($err) use (&$errorCaught) {
+            $errorCaught = true;
+        });
+        
+        $changes = $runner->getChanges();
+        
+        // Should handle abstract class error
+        $this->assertEmpty($changes);
+        
+        // Cleanup
+        unlink($tempDir . '/AbstractTestMigration.php');
+        rmdir($tempDir);
+    }
+
+    public function testIncompleteClassImplementation() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        $runner->registerAll([TestMigration::class, TestSeeder::class]);
+        
+        $changes = $runner->getChanges();
+        $this->assertCount(2, $changes);
+    }
+
+    // Performance and Memory Issues
+    public function testMemoryUsageWithManyMigrations() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        $runner->registerAll([TestMigration::class, TestSeeder::class]);
+        
+        $changes = $runner->getChanges();
+        $this->assertCount(2, $changes);
+    }
+
+    public function testRepeatedDirectoryScanningOverhead() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        $runner->registerAll([TestMigration::class, TestSeeder::class]);
+        
+        $changes = $runner->getChanges();
+        $this->assertCount(2, $changes);
+    }
+}
diff --git a/tests/WebFiori/Tests/Database/Schema/SchemaIntegrationTest.php b/tests/WebFiori/Tests/Database/Schema/SchemaIntegrationTest.php
index 70e90d52..33d188fb 100644
--- a/tests/WebFiori/Tests/Database/Schema/SchemaIntegrationTest.php
+++ b/tests/WebFiori/Tests/Database/Schema/SchemaIntegrationTest.php
@@ -1,58 +1,58 @@
-<?php
-
-namespace WebFiori\Tests\Database\Schema;
-
-use PHPUnit\Framework\TestCase;
-use WebFiori\Database\ConnectionInfo;
-use WebFiori\Database\Database;
-use WebFiori\Database\DatabaseException;
-use WebFiori\Database\Schema\AbstractMigration;
-use WebFiori\Database\Schema\AbstractSeeder;
-use WebFiori\Database\Schema\SchemaRunner;
-use WebFiori\Tests\Database\Schema\TestMigration;
-use WebFiori\Tests\Database\Schema\TestSeeder;
-
-class SchemaIntegrationTest extends TestCase {
-
-    protected function tearDown(): void {
-        gc_collect_cycles();
-        parent::tearDown();
-    }
-    
-    private function getConnectionInfo(): ConnectionInfo {
-        return new ConnectionInfo('mysql', 'root', getenv('MYSQL_ROOT_PASSWORD'), 'testing_db', '127.0.0.1');
-    }
-    
-    /**
-     * @test
-     */
-    public function testSchemaRunnerWithoutConnection() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        $runner->registerAll([TestMigration::class, TestSeeder::class]);
-        
-        $changes = $runner->getChanges();
-        $this->assertCount(2, $changes);
-    }
-    
-    /**
-     * @test
-     */
-    public function testFullSchemaWorkflow() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        $runner->registerAll([TestMigration::class, TestSeeder::class]);
-        
-        $changes = $runner->getChanges();
-        $this->assertCount(2, $changes);
-    }
-    
-    /**
-     * @test
-     */
-    public function testEnvironmentFiltering() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        $runner->registerAll([TestMigration::class, TestSeeder::class]);
-        
-        $changes = $runner->getChanges();
-        $this->assertCount(2, $changes);
-    }
-}
+<?php
+
+namespace WebFiori\Tests\Database\Schema;
+
+use PHPUnit\Framework\TestCase;
+use WebFiori\Database\ConnectionInfo;
+use WebFiori\Database\Database;
+use WebFiori\Database\DatabaseException;
+use WebFiori\Database\Schema\AbstractMigration;
+use WebFiori\Database\Schema\AbstractSeeder;
+use WebFiori\Database\Schema\SchemaRunner;
+use WebFiori\Tests\Database\Schema\TestMigration;
+use WebFiori\Tests\Database\Schema\TestSeeder;
+
+class SchemaIntegrationTest extends TestCase {
+
+    protected function tearDown(): void {
+        gc_collect_cycles();
+        parent::tearDown();
+    }
+    
+    private function getConnectionInfo(): ConnectionInfo {
+        return new ConnectionInfo('mysql', 'root', getenv('MYSQL_ROOT_PASSWORD'), 'testing_db', '127.0.0.1');
+    }
+    
+    /**
+     * @test
+     */
+    public function testSchemaRunnerWithoutConnection() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        $runner->registerAll([TestMigration::class, TestSeeder::class]);
+        
+        $changes = $runner->getChanges();
+        $this->assertCount(2, $changes);
+    }
+    
+    /**
+     * @test
+     */
+    public function testFullSchemaWorkflow() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        $runner->registerAll([TestMigration::class, TestSeeder::class]);
+        
+        $changes = $runner->getChanges();
+        $this->assertCount(2, $changes);
+    }
+    
+    /**
+     * @test
+     */
+    public function testEnvironmentFiltering() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        $runner->registerAll([TestMigration::class, TestSeeder::class]);
+        
+        $changes = $runner->getChanges();
+        $this->assertCount(2, $changes);
+    }
+}
diff --git a/tests/WebFiori/Tests/Database/Schema/SchemaTrackingTest.php b/tests/WebFiori/Tests/Database/Schema/SchemaTrackingTest.php
index cfe995c3..c8a2de7d 100644
--- a/tests/WebFiori/Tests/Database/Schema/SchemaTrackingTest.php
+++ b/tests/WebFiori/Tests/Database/Schema/SchemaTrackingTest.php
@@ -1,118 +1,118 @@
-<?php
-
-namespace WebFiori\Tests\Database\Schema;
-
-use PHPUnit\Framework\TestCase;
-use WebFiori\Database\ConnectionInfo;
-use WebFiori\Database\DatabaseException;
-use WebFiori\Database\Schema\SchemaRunner;
-use WebFiori\Tests\Database\Schema\TestMigration;
-use WebFiori\Tests\Database\Schema\TestSeeder;
-
-class SchemaTrackingTest extends TestCase {
-
-    protected function tearDown(): void {
-        gc_collect_cycles();
-        parent::tearDown();
-    }
-    
-    private function getConnectionInfo(): ConnectionInfo {
-        return new ConnectionInfo('mysql', 'root', getenv('MYSQL_ROOT_PASSWORD'), 'testing_db', '127.0.0.1');
-    }
-    
-    // Schema Table Existence Issues
-    public function testSchemaTableNotExistsHandling() {
-        try {
-            $runner = new SchemaRunner($this->getConnectionInfo());
-            $runner->createSchemaTable(); // Ensure table exists
-            $runner->register(TestMigration::class);
-            
-            $this->assertCount(1, $runner->getChanges());
-        } catch (DatabaseException $ex) {
-            $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
-        }
-    }
-
-    public function testCorruptedSchemaTableHandling() {
-        try {
-            $runner = new SchemaRunner($this->getConnectionInfo());
-            $runner->createSchemaTable();
-            
-            // Corrupt the schema table by dropping a column
-            $runner->setQuery("ALTER TABLE schema_changes DROP COLUMN change_name")->execute();
-            
-            // Should handle corrupted table gracefully
-            $errorCaught = false;
-            try {
-                $runner->isApplied('TestMigration');
-            } catch (DatabaseException $ex) {
-                $errorCaught = true;
-            }
-            
-            $this->assertTrue($errorCaught, 'Should catch error from corrupted schema table');
-            
-            $runner->dropSchemaTable();
-        } catch (DatabaseException $ex) {
-            $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
-        }
-    }
-
-    // Duplicate Detection Issues
-    public function testDuplicateChangeTracking() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        $runner->registerAll([TestMigration::class, TestSeeder::class]);
-        
-        $changes = $runner->getChanges();
-        $this->assertCount(2, $changes);
-    }
-
-    public function testManualSchemaTableCorruption() {
-        try {
-            $runner = new SchemaRunner($this->getConnectionInfo());
-            $runner->createSchemaTable(); // Ensure table exists
-            $runner->register(TestMigration::class);
-            
-            $this->assertCount(1, $runner->getChanges());
-        } catch (DatabaseException $ex) {
-            $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
-        }
-    }
-
-    // Name Collision Issues
-    public function testSimilarNameHandling() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        $runner->registerAll([TestMigration::class, TestSeeder::class]);
-        
-        $changes = $runner->getChanges();
-        $this->assertCount(2, $changes);
-    }
-
-    public function testPartialNameMatching() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        $runner->registerAll([TestMigration::class, TestSeeder::class]);
-        
-        $changes = $runner->getChanges();
-        $this->assertCount(2, $changes);
-    }
-
-    // Transaction and Consistency Issues
-    public function testInconsistentTrackingAfterFailure() {
-        $runner = new SchemaRunner($this->getConnectionInfo());
-        $runner->registerAll([TestMigration::class, TestSeeder::class]);
-        
-        $changes = $runner->getChanges();
-        $this->assertCount(2, $changes);
-    }
-
-    public function testSchemaTableRecreationAfterDrop() {
-        try {
-            $runner = new SchemaRunner($this->getConnectionInfo());
-            $runner->createSchemaTable(); // Ensure table exists
-            $runner->register(TestMigration::class);
-            
-            $this->assertCount(1, $runner->getChanges());
-        } catch (DatabaseException $ex) {
-            $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
-        }
-    }
-}
+<?php
+
+namespace WebFiori\Tests\Database\Schema;
+
+use PHPUnit\Framework\TestCase;
+use WebFiori\Database\ConnectionInfo;
+use WebFiori\Database\DatabaseException;
+use WebFiori\Database\Schema\SchemaRunner;
+use WebFiori\Tests\Database\Schema\TestMigration;
+use WebFiori\Tests\Database\Schema\TestSeeder;
+
+class SchemaTrackingTest extends TestCase {
+
+    protected function tearDown(): void {
+        gc_collect_cycles();
+        parent::tearDown();
+    }
+    
+    private function getConnectionInfo(): ConnectionInfo {
+        return new ConnectionInfo('mysql', 'root', getenv('MYSQL_ROOT_PASSWORD'), 'testing_db', '127.0.0.1');
+    }
+    
+    // Schema Table Existence Issues
+    public function testSchemaTableNotExistsHandling() {
+        try {
+            $runner = new SchemaRunner($this->getConnectionInfo());
+            $runner->createSchemaTable(); // Ensure table exists
+            $runner->register(TestMigration::class);
+            
+            $this->assertCount(1, $runner->getChanges());
+        } catch (DatabaseException $ex) {
+            $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
+        }
+    }
+
+    public function testCorruptedSchemaTableHandling() {
+        try {
+            $runner = new SchemaRunner($this->getConnectionInfo());
+            $runner->createSchemaTable();
+            
+            // Corrupt the schema table by dropping a column
+            $runner->setQuery("ALTER TABLE schema_changes DROP COLUMN change_name")->execute();
+            
+            // Should handle corrupted table gracefully
+            $errorCaught = false;
+            try {
+                $runner->isApplied('TestMigration');
+            } catch (DatabaseException $ex) {
+                $errorCaught = true;
+            }
+            
+            $this->assertTrue($errorCaught, 'Should catch error from corrupted schema table');
+            
+            $runner->dropSchemaTable();
+        } catch (DatabaseException $ex) {
+            $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
+        }
+    }
+
+    // Duplicate Detection Issues
+    public function testDuplicateChangeTracking() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        $runner->registerAll([TestMigration::class, TestSeeder::class]);
+        
+        $changes = $runner->getChanges();
+        $this->assertCount(2, $changes);
+    }
+
+    public function testManualSchemaTableCorruption() {
+        try {
+            $runner = new SchemaRunner($this->getConnectionInfo());
+            $runner->createSchemaTable(); // Ensure table exists
+            $runner->register(TestMigration::class);
+            
+            $this->assertCount(1, $runner->getChanges());
+        } catch (DatabaseException $ex) {
+            $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
+        }
+    }
+
+    // Name Collision Issues
+    public function testSimilarNameHandling() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        $runner->registerAll([TestMigration::class, TestSeeder::class]);
+        
+        $changes = $runner->getChanges();
+        $this->assertCount(2, $changes);
+    }
+
+    public function testPartialNameMatching() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        $runner->registerAll([TestMigration::class, TestSeeder::class]);
+        
+        $changes = $runner->getChanges();
+        $this->assertCount(2, $changes);
+    }
+
+    // Transaction and Consistency Issues
+    public function testInconsistentTrackingAfterFailure() {
+        $runner = new SchemaRunner($this->getConnectionInfo());
+        $runner->registerAll([TestMigration::class, TestSeeder::class]);
+        
+        $changes = $runner->getChanges();
+        $this->assertCount(2, $changes);
+    }
+
+    public function testSchemaTableRecreationAfterDrop() {
+        try {
+            $runner = new SchemaRunner($this->getConnectionInfo());
+            $runner->createSchemaTable(); // Ensure table exists
+            $runner->register(TestMigration::class);
+            
+            $this->assertCount(1, $runner->getChanges());
+        } catch (DatabaseException $ex) {
+            $this->markTestSkipped('Database connection failed: ' . $ex->getMessage());
+        }
+    }
+}
diff --git a/tests/WebFiori/Tests/Database/Schema/TestMigration2.php b/tests/WebFiori/Tests/Database/Schema/TestMigration2.php
index fa42f468..c193c3bc 100644
--- a/tests/WebFiori/Tests/Database/Schema/TestMigration2.php
+++ b/tests/WebFiori/Tests/Database/Schema/TestMigration2.php
@@ -1,35 +1,35 @@
-<?php
-
-namespace WebFiori\Tests\Database\Schema;
-
-use WebFiori\Database\Database;
-use WebFiori\Database\Schema\AbstractMigration;
-use WebFiori\Database\ColOption;
-
-class TestMigration2 extends AbstractMigration {
-    
-    public function getDependencies(): array {
-        return ['TestMigration'];
-    }
-    
-    public function up(Database $db): void {
-        $this->execute($db);
-    }
-    
-    public function down(Database $db): void {
-        $this->rollback($db);
-    }
-    
-    public function execute(Database $db): void {
-        $db->table('user_profiles')->addColumn('email', [
-            ColOption::TYPE => 'varchar',
-            ColOption::SIZE => 255
-        ]);
-        $db->execute();
-    }
-    
-    public function rollback(Database $db): void {
-        $db->table('user_profiles')->dropColumn('email');
-        $db->execute();
-    }
-}
+<?php
+
+namespace WebFiori\Tests\Database\Schema;
+
+use WebFiori\Database\Database;
+use WebFiori\Database\Schema\AbstractMigration;
+use WebFiori\Database\ColOption;
+
+class TestMigration2 extends AbstractMigration {
+    
+    public function getDependencies(): array {
+        return ['TestMigration'];
+    }
+    
+    public function up(Database $db): void {
+        $this->execute($db);
+    }
+    
+    public function down(Database $db): void {
+        $this->rollback($db);
+    }
+    
+    public function execute(Database $db): void {
+        $db->table('user_profiles')->addColumn('email', [
+            ColOption::TYPE => 'varchar',
+            ColOption::SIZE => 255
+        ]);
+        $db->execute();
+    }
+    
+    public function rollback(Database $db): void {
+        $db->table('user_profiles')->dropColumn('email');
+        $db->execute();
+    }
+}
diff --git a/tests/WebFiori/Tests/Database/Schema/TestMigration3.php b/tests/WebFiori/Tests/Database/Schema/TestMigration3.php
index fbc22ebc..68e9c582 100644
--- a/tests/WebFiori/Tests/Database/Schema/TestMigration3.php
+++ b/tests/WebFiori/Tests/Database/Schema/TestMigration3.php
@@ -1,23 +1,23 @@
-<?php
-
-namespace WebFiori\Tests\Database\Schema;
-
-use WebFiori\Database\Database;
-use WebFiori\Database\Schema\AbstractMigration;
-
-class TestMigration3 extends AbstractMigration {
-    
-    public function getDependencies(): array {
-        return ['WebFiori\Tests\Database\Schema\TestMigration'];
-    }
-    
-    public function up(Database $db): void {
-        $db->table('user_profiles')->addCol('status', 'varchar', 50)->execute();
-        
-    }
-    
-    public function down(Database $db): void {
-                $db->table('user_profiles')->dropColumn('status');
-        $db->execute();
-    }
-}
+<?php
+
+namespace WebFiori\Tests\Database\Schema;
+
+use WebFiori\Database\Database;
+use WebFiori\Database\Schema\AbstractMigration;
+
+class TestMigration3 extends AbstractMigration {
+    
+    public function getDependencies(): array {
+        return ['WebFiori\Tests\Database\Schema\TestMigration'];
+    }
+    
+    public function up(Database $db): void {
+        $db->table('user_profiles')->addCol('status', 'varchar', 50)->execute();
+        
+    }
+    
+    public function down(Database $db): void {
+                $db->table('user_profiles')->dropColumn('status');
+        $db->execute();
+    }
+}
diff --git a/tests/WebFiori/Tests/Database/Schema/TestSeeder.php b/tests/WebFiori/Tests/Database/Schema/TestSeeder.php
index 8d10904f..5a2d00ca 100644
--- a/tests/WebFiori/Tests/Database/Schema/TestSeeder.php
+++ b/tests/WebFiori/Tests/Database/Schema/TestSeeder.php
@@ -1,34 +1,34 @@
-<?php
-
-namespace WebFiori\Tests\Database\Schema;
-
-use WebFiori\Database\Database;
-use WebFiori\Database\Schema\AbstractSeeder;
-
-class TestSeeder extends AbstractSeeder {
-    
-    public function getDependencies(): array {
-        return ['WebFiori\Tests\Database\Schema\TestMigration'];
-    }
-    
-    public function getEnvironments(): array {
-        return ['dev', 'test'];
-    }
-    
-    public function run(Database $db): void {
-        // Insert test data
-        $db->table('user_profiles')->insert([
-            'name' => 'Test User 1'
-        ])->execute();
-        
-        $db->table('user_profiles')->insert([
-            'name' => 'Test User 2'
-        ])->execute();
-    }
-    
-    public function rollback(Database $db): void {
-        // Delete test data
-        $db->table('user_profiles')->delete()->where('name', 'Test User 1')->execute();
-        $db->table('user_profiles')->delete()->where('name', 'Test User 2')->execute();
-    }
-}
+<?php
+
+namespace WebFiori\Tests\Database\Schema;
+
+use WebFiori\Database\Database;
+use WebFiori\Database\Schema\AbstractSeeder;
+
+class TestSeeder extends AbstractSeeder {
+    
+    public function getDependencies(): array {
+        return ['WebFiori\Tests\Database\Schema\TestMigration'];
+    }
+    
+    public function getEnvironments(): array {
+        return ['dev', 'test'];
+    }
+    
+    public function run(Database $db): void {
+        // Insert test data
+        $db->table('user_profiles')->insert([
+            'name' => 'Test User 1'
+        ])->execute();
+        
+        $db->table('user_profiles')->insert([
+            'name' => 'Test User 2'
+        ])->execute();
+    }
+    
+    public function rollback(Database $db): void {
+        // Delete test data
+        $db->table('user_profiles')->delete()->where('name', 'Test User 1')->execute();
+        $db->table('user_profiles')->delete()->where('name', 'Test User 2')->execute();
+    }
+}