- Fixed conflicts

src/Common/EntityField.php

@@ -50,9 +50,9 @@ class EntityField implements WhereRawParameter
         return false;
     }
 
-    public static function generateCreateColumn($field) : string
+    public static function generateCreateColumn(AdapterInterface $adapter, $field) : string
     {
-        $definition = new FieldDefinition($field);
+        $definition = new FieldDefinition($adapter, $field);
 
         return implode(" ", [
             $definition->getSqlName(),

src/Common/EntityResolver.php

@@ -164,7 +164,7 @@ class EntityResolver {
 
     public function databaseName() : ? string
     {
-        return $this->tableAnnotation(false)->database ?? $this->databaseAdapter()->adapter()->database ?? null;
+        return $this->tableAnnotation(false)->database ?? $this->databaseAdapter()->adapter()->databaseName() ?? null;
     }
 
     public function sqlAdapter() : \Ulmus\ConnectionAdapter