- Fixed conflicts

This commit is contained in:
Dave Mc Nicoll committed 2022-04-13 03:38:57 +00:00
commit 325704260b
31 files changed
+632 -127

No files matched your search

+8 -1
View File
@@ -5,9 +5,16 @@ namespace Ulmus\Adapter;
use Ulmus\Common\PdoObject;
use Ulmus\Exception\AdapterConfigurationException;
use Ulmus\Ulmus;
use Ulmus\Migration\FieldDefinition;
use Ulmus\{Entity\InformationSchema\Table, Repository, QueryBuilder};
class MsSQL implements AdapterInterface {
use DefaultAdapterTrait;
const DSN_PREFIX = "sqlsrv";
public int $port;
@@ -130,7 +137,7 @@ class MsSQL implements AdapterInterface {
$parts[] = "WSID={$this->wsid}";
}
return "sqlsrv:" . implode(';', $parts);
return static::DSN_PREFIX . ":" . implode(';', $parts);
}
public function setup(array $configuration) : void