- Fixed conflicts

src/Adapter/MySQL.php

@@ -2,12 +2,19 @@
 
 namespace Ulmus\Adapter;
 
+use Ulmus\Entity\InformationSchema\Table;
+use Ulmus\QueryBuilder;
+use Ulmus\Repository;
 use Ulmus\Common\PdoObject;
 
 use Ulmus\Exception\AdapterConfigurationException;
 use Ulmus\Ulmus;
+use Ulmus\Migration\FieldDefinition;
 
 class MySQL implements AdapterInterface {
+    use DefaultAdapterTrait;
+
+    const DSN_PREFIX = "mysql";
 
     public string $hostname;
     
@@ -18,7 +25,7 @@ class MySQL implements AdapterInterface {
     public string $password;
     
     public string $charset = "utf8mb4";
-    
+
     public ? string $socket;
     
     public int $port = 3306;
@@ -69,6 +76,9 @@ class MySQL implements AdapterInterface {
         catch(PDOException $ex){
             throw $ex;
         }
+        finally {
+            $this->password = str_repeat('*', strlen($this->password));
+        }
 
         return $pdo;
     }
@@ -92,7 +102,7 @@ class MySQL implements AdapterInterface {
             $parts[] = "charset={$this->charset}";
         }
 
-        return "mysql:" . implode(';', $parts);
+        return static::DSN_PREFIX . ":" . implode(';', $parts);
     }
     
     public function setup(array $configuration) : void